texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo update (Sun Jul 1 14:53:01 EDT 2007)


From: Karl Berry
Subject: texinfo update (Sun Jul 1 14:53:01 EDT 2007)
Date: Sun, 01 Jul 2007 14:53:07 -0400

Index: COPYING
===================================================================
RCS file: /sources/texinfo/texinfo/COPYING,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- COPYING     17 Jun 2006 14:07:30 -0000      1.5
+++ COPYING     1 Jul 2007 18:46:20 -0000       1.6
@@ -1,281 +1,622 @@
                    GNU GENERAL PUBLIC LICENSE
-                      Version 2, June 1991
+                      Version 3, 29 June 2007
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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 Lesser 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.
-
-  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.
+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 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
+                      TERMS AND CONDITIONS
+
+  0. Definitions.
 
-  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
+  "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.
+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.
 
-  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
+  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
 
@@ -287,15 +628,15 @@
 
   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,
@@ -303,37 +644,31 @@
     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.
+    You should have received a copy of the GNU General Public License
+    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 Lesser 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>.
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.717
retrieving revision 1.718
diff -u -r1.717 -r1.718
--- ChangeLog   1 Jul 2007 18:20:43 -0000       1.717
+++ ChangeLog   1 Jul 2007 18:31:41 -0000       1.718
@@ -14,6 +14,7 @@
        * lib/Makefile.am (libtxi_A_SOURCES): system.h at top level now.
        
        * makeinfo/tests/copying.txi: test with nonempty copying text.
+       * makeinfo/insertion.c (cm_insert_copying): call output_head.
 
 2007-06-29  Karl Berry  <address@hidden>
 
Index: Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/Makefile.am,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- Makefile.am 1 Jul 2007 18:06:22 -0000       1.20
+++ Makefile.am 1 Jul 2007 18:44:23 -0000       1.21
@@ -1,5 +1,5 @@
 # Makefile.am for texinfo.
-# $Id: Makefile.am,v 1.20 2007/07/01 18:06:22 karl Exp $
+# $Id: Makefile.am,v 1.21 2007/07/01 18:44:23 karl 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
@@ -17,7 +17,7 @@
 ACLOCAL_AMFLAGS = -I gnulib/m4
 
 # Additional files to distribute.
-EXTRA_DIST = ChangeLog.46 INSTALL.generic INTRODUCTION README.dev \
+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
Index: NEWS
===================================================================
RCS file: /sources/texinfo/texinfo/NEWS,v
retrieving revision 1.144
retrieving revision 1.145
diff -u -r1.144 -r1.145
--- NEWS        1 Jul 2007 16:54:01 -0000       1.144
+++ NEWS        1 Jul 2007 18:44:36 -0000       1.145
@@ -1,4 +1,4 @@
-$Id: NEWS,v 1.144 2007/07/01 16:54:01 karl Exp $
+$Id: NEWS,v 1.145 2007/07/01 18:44:36 karl Exp $
 This NEWS file records noteworthy changes, very tersely.
 See the manual for detailed information.
 
@@ -59,10 +59,10 @@
 * install-info:
   . new options --section-regex, --remove-exactly, --debug, --test.
 * Distribution:
-  . autoconf 2.60, automake 1.10, gettext 0.16.
+  . autoconf 2.60, automake 1.10, gettext 0.16.1.
   . gettext support now [external].
   . new translations: hu (Hungarian), rw (Kinyarwandan), vi (Vietnamese).
-  . most common functionality imported from gnulib.
+  . most common sources imported from gnulib.
 
 
 4.9 (29 June 2007)
Index: system.h
===================================================================
RCS file: /sources/texinfo/texinfo/system.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- system.h    29 Apr 2007 22:21:51 -0000      1.4
+++ system.h    1 Jul 2007 18:46:20 -0000       1.5
@@ -1,12 +1,12 @@
 /* system.h: system-dependent declarations; include this first.
-   $Id: system.h,v 1.4 2007/04/29 22:21:51 karl Exp $
+   $Id: system.h,v 1.5 2007/07/01 18:46:20 karl Exp $
 
    Copyright (C) 1997, 1998, 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: doc/txi-de.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/txi-de.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- doc/txi-de.tex      15 May 2005 00:00:06 -0000      1.4
+++ doc/txi-de.tex      1 Jul 2007 18:46:20 -0000       1.5
@@ -1,11 +1,11 @@
 % txi-de.tex -- adaptation to German for texinfo.tex.
-% $Id: txi-de.tex,v 1.4 2005/05/15 00:00:06 karl Exp $
+% $Id: txi-de.tex,v 1.5 2007/07/01 18:46:20 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
 % it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2, or (at your option)
+% 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,
Index: doc/txi-es.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/txi-es.tex,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- doc/txi-es.tex      23 Nov 2003 00:35:38 -0000      1.2
+++ doc/txi-es.tex      1 Jul 2007 18:46:20 -0000       1.3
@@ -1,10 +1,10 @@
 % 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
+% published by the Free Software Foundation; either version 3, or (at
 % your option) any later version.
 %
 % This txi-es.tex file is distributed in the hope that it will be
Index: doc/txi-pt.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/txi-pt.tex,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- doc/txi-pt.tex      15 May 2005 00:00:06 -0000      1.3
+++ doc/txi-pt.tex      1 Jul 2007 18:46:20 -0000       1.4
@@ -1,10 +1,10 @@
 % 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)
+% 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,
Index: doc/txi-tr.tex
===================================================================
RCS file: /sources/texinfo/texinfo/doc/txi-tr.tex,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- doc/txi-tr.tex      15 May 2005 00:00:06 -0000      1.4
+++ doc/txi-tr.tex      1 Jul 2007 18:46:21 -0000       1.5
@@ -1,11 +1,11 @@
-% txi-en.tex -- adaptation to Turkish for texinfo.tex.
-% $Id: txi-tr.tex,v 1.4 2005/05/15 00:00:06 karl Exp $
+% txi-tr.tex -- adaptation to Turkish for texinfo.tex.
+% $Id: txi-tr.tex,v 1.5 2007/07/01 18:46:21 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)
+% 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,
Index: info/dir.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/dir.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/dir.c  15 May 2005 00:00:06 -0000      1.5
+++ info/dir.c  1 Jul 2007 18:46:21 -0000       1.6
@@ -1,11 +1,11 @@
 /* dir.c -- how to build a special "dir" node from "localdir" files.
-   $Id: dir.c,v 1.5 2005/05/15 00:00:06 karl Exp $
+   $Id: dir.c,v 1.6 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/display.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/display.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- info/display.c      9 Jan 2006 01:49:25 -0000       1.9
+++ info/display.c      1 Jul 2007 18:46:21 -0000       1.10
@@ -1,11 +1,11 @@
 /* display.c -- How to display Info windows.
-   $Id: display.c,v 1.9 2006/01/09 01:49:25 karl Exp $
+   $Id: display.c,v 1.10 2007/07/01 18:46:21 karl Exp $
 
-   Copyright (C) 1993, 1997, 2003, 2004, 2006 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/display.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/display.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/display.h      15 May 2005 00:00:06 -0000      1.4
+++ info/display.h      1 Jul 2007 18:46:21 -0000       1.5
@@ -1,14 +1,14 @@
 /* display.h -- How the display in Info is done.
-   $Id: display.h,v 1.4 2005/05/15 00:00:06 karl Exp $
+   $Id: display.h,v 1.5 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/doc.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/doc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/doc.h  15 May 2005 00:00:06 -0000      1.4
+++ info/doc.h  1 Jul 2007 18:46:21 -0000       1.5
@@ -1,11 +1,11 @@
 /* doc.h -- Structures associating function pointers with documentation.
-   $Id: doc.h,v 1.4 2005/05/15 00:00:06 karl Exp $
+   $Id: doc.h,v 1.5 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/dribble.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/dribble.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/dribble.c      15 May 2005 00:00:06 -0000      1.4
+++ info/dribble.c      1 Jul 2007 18:46:21 -0000       1.5
@@ -1,11 +1,11 @@
 /* dribble.c -- dribble files for Info.
-   $Id: dribble.c,v 1.4 2005/05/15 00:00:06 karl Exp $
+   $Id: dribble.c,v 1.5 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/dribble.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/dribble.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/dribble.h      15 May 2005 00:00:06 -0000      1.4
+++ info/dribble.h      1 Jul 2007 18:46:21 -0000       1.5
@@ -3,11 +3,11 @@
 /* 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/echo-area.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/echo-area.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- info/echo-area.c    15 May 2005 00:00:06 -0000      1.8
+++ info/echo-area.c    1 Jul 2007 18:46:21 -0000       1.9
@@ -1,12 +1,12 @@
 /* echo-area.c -- how to read a line in the echo area.
-   $Id: echo-area.c,v 1.8 2005/05/15 00:00:06 karl Exp $
+   $Id: echo-area.c,v 1.9 2007/07/01 18:46:21 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/echo-area.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/echo-area.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/echo-area.h    15 May 2005 00:00:07 -0000      1.5
+++ info/echo-area.h    1 Jul 2007 18:46:21 -0000       1.6
@@ -1,14 +1,14 @@
 /* echo-area.h -- Functions used in reading information from the echo area.
-   $Id: echo-area.h,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: echo-area.h,v 1.6 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/filesys.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/filesys.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- info/filesys.c      15 May 2005 00:00:07 -0000      1.7
+++ info/filesys.c      1 Jul 2007 18:46:21 -0000       1.8
@@ -1,12 +1,12 @@
 /* filesys.c -- filesystem specific functions.
-   $Id: filesys.c,v 1.7 2005/05/15 00:00:07 karl Exp $
+   $Id: filesys.c,v 1.8 2007/07/01 18:46:21 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2000, 2002, 2003, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/filesys.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/filesys.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/filesys.h      15 May 2005 00:00:07 -0000      1.5
+++ info/filesys.h      1 Jul 2007 18:46:21 -0000       1.6
@@ -1,12 +1,12 @@
 /* filesys.h -- external declarations for filesys.c.
-   $Id: filesys.h,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: filesys.h,v 1.6 2007/07/01 18:46:21 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2004, 2005 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/footnotes.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/footnotes.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/footnotes.c    15 May 2005 00:00:07 -0000      1.5
+++ info/footnotes.c    1 Jul 2007 18:46:21 -0000       1.6
@@ -1,12 +1,12 @@
 /* footnotes.c -- Some functions for manipulating footnotes.
-   $Id: footnotes.c,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: footnotes.c,v 1.6 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/footnotes.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/footnotes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/footnotes.h    15 May 2005 00:00:07 -0000      1.4
+++ info/footnotes.h    1 Jul 2007 18:46:21 -0000       1.5
@@ -1,11 +1,11 @@
 /* footnotes.h -- Some functions for manipulating footnotes.
-   $Id: footnotes.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: footnotes.h,v 1.5 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/gc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/gc.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/gc.c   15 May 2005 00:00:07 -0000      1.4
+++ info/gc.c   1 Jul 2007 18:46:21 -0000       1.5
@@ -1,11 +1,11 @@
 /* gc.c -- Functions to remember and garbage collect unused node contents.
-   $Id: gc.c,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: gc.c,v 1.5 2007/07/01 18:46:21 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)
+   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,
Index: info/gc.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/gc.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/gc.h   15 May 2005 00:00:07 -0000      1.4
+++ info/gc.h   1 Jul 2007 18:46:21 -0000       1.5
@@ -1,14 +1,14 @@
 /* gc.h -- Functions for garbage collecting unused node contents.
-   $Id: gc.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: gc.h,v 1.5 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/indices.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/indices.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/indices.c      15 May 2005 00:00:07 -0000      1.6
+++ info/indices.c      1 Jul 2007 18:46:21 -0000       1.7
@@ -1,12 +1,12 @@
 /* indices.c -- deal with an Info file index.
-   $Id: indices.c,v 1.6 2005/05/15 00:00:07 karl Exp $
+   $Id: indices.c,v 1.7 2007/07/01 18:46:21 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2002, 2003, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/indices.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/indices.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/indices.h      15 May 2005 00:00:07 -0000      1.4
+++ info/indices.h      1 Jul 2007 18:46:21 -0000       1.5
@@ -1,14 +1,14 @@
 /* indices.h -- Functions defined in indices.c.
-   $Id: indices.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: indices.h,v 1.5 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/info-utils.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info-utils.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/info-utils.c   15 May 2005 00:00:07 -0000      1.5
+++ info/info-utils.c   1 Jul 2007 18:46:21 -0000       1.6
@@ -1,11 +1,11 @@
 /* info-utils.c -- miscellanous.
-   $Id: info-utils.c,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: info-utils.c,v 1.6 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/info-utils.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/info-utils.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/info-utils.h   15 May 2005 00:00:07 -0000      1.5
+++ info/info-utils.h   1 Jul 2007 18:46:21 -0000       1.6
@@ -1,12 +1,12 @@
 /* info-utils.h -- Exported functions and variables from info-utils.c.
-   $Id: info-utils.h,v 1.5 2005/05/15 00:00:07 karl Exp $   
+   $Id: info-utils.h,v 1.6 2007/07/01 18:46:21 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/info.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- info/info.c 1 Jul 2007 15:35:46 -0000       1.17
+++ info/info.c 1 Jul 2007 18:46:21 -0000       1.18
@@ -1,12 +1,12 @@
 /* info.c -- Display nodes of Info files in multiple windows.
-   $Id: info.c,v 1.17 2007/07/01 15:35:46 karl Exp $
+   $Id: info.c,v 1.18 2007/07/01 18:46:21 karl Exp $
 
    Copyright (C) 1993, 1996, 1997, 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/info.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/info.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/info.h 15 May 2005 00:00:07 -0000      1.5
+++ info/info.h 1 Jul 2007 18:46:22 -0000       1.6
@@ -1,12 +1,12 @@
 /* info.h -- Header file which includes all of the other headers.
-   $Id: info.h,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: info.h,v 1.6 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/infodoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infodoc.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- info/infodoc.c      15 Jan 2006 23:20:11 -0000      1.10
+++ info/infodoc.c      1 Jul 2007 18:46:22 -0000       1.11
@@ -1,12 +1,12 @@
 /* infodoc.c -- functions which build documentation nodes.
-   $Id: infodoc.c,v 1.10 2006/01/15 23:20:11 karl Exp $
+   $Id: infodoc.c,v 1.11 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006 Free 
Software
+   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 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 2, or (at your option)
+   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,
Index: info/infokey.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infokey.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- info/infokey.c      1 Jul 2007 15:35:46 -0000       1.13
+++ info/infokey.c      1 Jul 2007 18:46:22 -0000       1.14
@@ -1,12 +1,12 @@
 /* infokey.c -- compile ~/.infokey to ~/.info.
-   $Id: infokey.c,v 1.13 2007/07/01 15:35:46 karl Exp $
+   $Id: infokey.c,v 1.14 2007/07/01 18:46:22 karl Exp $
 
    Copyright (C) 1999, 2001, 2002, 2003, 2004, 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 2, or (at your option)
+   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,
Index: info/infokey.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/infokey.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- info/infokey.h      15 May 2005 00:00:07 -0000      1.3
+++ info/infokey.h      1 Jul 2007 18:46:22 -0000       1.4
@@ -1,11 +1,11 @@
 /* infokey.h -- Custom keystroke definition support.
-   $Id: infokey.h,v 1.3 2005/05/15 00:00:07 karl Exp $
+   $Id: infokey.h,v 1.4 2007/07/01 18:46:22 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/infomap.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infomap.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- info/infomap.c      15 May 2005 00:00:07 -0000      1.11
+++ info/infomap.c      1 Jul 2007 18:46:22 -0000       1.12
@@ -1,12 +1,12 @@
 /* infomap.c -- keymaps for Info.
-   $Id: infomap.c,v 1.11 2005/05/15 00:00:07 karl Exp $
+   $Id: infomap.c,v 1.12 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/infomap.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/infomap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/infomap.h      15 May 2005 00:00:07 -0000      1.4
+++ info/infomap.h      1 Jul 2007 18:46:22 -0000       1.5
@@ -1,11 +1,11 @@
 /* infomap.h -- description of a keymap in Info and related functions.
-   $Id: infomap.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: infomap.h,v 1.5 2007/07/01 18:46:22 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/key.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/key.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- info/key.h  15 May 2005 00:00:07 -0000      1.2
+++ info/key.h  1 Jul 2007 18:46:22 -0000       1.3
@@ -3,11 +3,11 @@
 /* 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/m-x.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/m-x.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/m-x.c  15 May 2005 00:00:07 -0000      1.4
+++ info/m-x.c  1 Jul 2007 18:46:22 -0000       1.5
@@ -1,12 +1,12 @@
 /* m-x.c -- Meta-x minibuffer reader.
-   $Id: m-x.c,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: m-x.c,v 1.5 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/makedoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/makedoc.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/makedoc.c      22 Feb 2007 00:24:20 -0000      1.6
+++ info/makedoc.c      1 Jul 2007 18:46:22 -0000       1.7
@@ -1,12 +1,12 @@
 /* makedoc.c -- make doc.c and funs.h from input files.
-   $Id: makedoc.c,v 1.6 2007/02/22 00:24:20 karl Exp $
+   $Id: makedoc.c,v 1.7 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/man.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/man.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- info/man.c  13 Aug 2006 23:36:22 -0000      1.7
+++ info/man.c  1 Jul 2007 18:46:22 -0000       1.8
@@ -1,12 +1,12 @@
 /*  man.c: How to read and format man files.
-    $Id: man.c,v 1.7 2006/08/13 23:36:22 karl Exp $
+    $Id: man.c,v 1.8 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1995, 1997, 1998, 1999, 2000, 2002, 2003, 2004, 2005
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/man.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/man.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/man.h  15 May 2005 00:00:07 -0000      1.4
+++ info/man.h  1 Jul 2007 18:46:22 -0000       1.5
@@ -1,14 +1,14 @@
 /* man.h: Defines and external function declarations for man.c.
-   $Id: man.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: man.h,v 1.5 2007/07/01 18:46:22 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/nodemenu.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/nodemenu.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- info/nodemenu.c     15 May 2005 00:00:07 -0000      1.6
+++ info/nodemenu.c     1 Jul 2007 18:46:22 -0000       1.7
@@ -1,12 +1,12 @@
 /* nodemenu.c -- produce a menu of all visited nodes.
-   $Id: nodemenu.c,v 1.6 2005/05/15 00:00:07 karl Exp $
+   $Id: nodemenu.c,v 1.7 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2002, 2003, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/nodes.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/nodes.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- info/nodes.c        25 Feb 2006 23:08:01 -0000      1.7
+++ info/nodes.c        1 Jul 2007 18:46:22 -0000       1.8
@@ -1,12 +1,12 @@
 /* nodes.c -- how to get an Info file and node.
-   $Id: nodes.c,v 1.7 2006/02/25 23:08:01 karl Exp $
+   $Id: nodes.c,v 1.8 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1998, 1999, 2000, 2002, 2003, 2004, 2006 Free
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/nodes.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/nodes.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/nodes.h        15 May 2005 00:00:07 -0000      1.4
+++ info/nodes.h        1 Jul 2007 18:46:22 -0000       1.5
@@ -1,11 +1,11 @@
 /* nodes.h -- How we represent nodes internally.
-   $Id: nodes.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: nodes.h,v 1.5 2007/07/01 18:46:22 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/pcterm.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/pcterm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/pcterm.c       15 May 2005 00:00:07 -0000      1.5
+++ info/pcterm.c       1 Jul 2007 18:46:22 -0000       1.6
@@ -1,11 +1,11 @@
 /* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
-   $Id: pcterm.c,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: pcterm.c,v 1.6 2007/07/01 18:46:22 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/search.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/search.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/search.c       15 May 2005 00:00:07 -0000      1.4
+++ info/search.c       1 Jul 2007 18:46:22 -0000       1.5
@@ -1,11 +1,11 @@
 /* search.c -- searching large bodies of text.
-   $Id: search.c,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: search.c,v 1.5 2007/07/01 18:46:22 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/search.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/search.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/search.h       15 May 2005 00:00:07 -0000      1.4
+++ info/search.h       1 Jul 2007 18:46:22 -0000       1.5
@@ -1,11 +1,11 @@
 /* search.h -- Structure used to search large bodies of text, with bounds.
-   $Id: search.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: search.h,v 1.5 2007/07/01 18:46:22 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/session.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- info/session.c      15 May 2005 00:00:07 -0000      1.17
+++ info/session.c      1 Jul 2007 18:46:22 -0000       1.18
@@ -1,12 +1,12 @@
 /* session.c -- user windowing interface to Info.
-   $Id: session.c,v 1.17 2005/05/15 00:00:07 karl Exp $
+   $Id: session.c,v 1.18 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
+   Copyright (C) 1993, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 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)
+   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,
Index: info/session.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/session.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/session.h      15 May 2005 00:00:07 -0000      1.4
+++ info/session.h      1 Jul 2007 18:46:22 -0000       1.5
@@ -1,12 +1,12 @@
 /* session.h -- Functions found in session.c.
-   $Id: session.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: session.h,v 1.5 2007/07/01 18:46:22 karl Exp $
 
-   Copyright (C) 1993, 1998, 1999, 2001, 2002, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/signals.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/signals.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- info/signals.c      15 May 2005 00:00:07 -0000      1.8
+++ info/signals.c      1 Jul 2007 18:46:23 -0000       1.9
@@ -1,12 +1,12 @@
 /* signals.c -- install and maintain signal handlers.
-   $Id: signals.c,v 1.8 2005/05/15 00:00:07 karl Exp $
+   $Id: signals.c,v 1.9 2007/07/01 18:46:23 karl Exp $
 
-   Copyright (C) 1993, 1994, 1995, 1998, 2002, 2003, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/signals.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/signals.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- info/signals.h      15 May 2005 00:00:07 -0000      1.3
+++ info/signals.h      1 Jul 2007 18:46:23 -0000       1.4
@@ -1,11 +1,11 @@
 /* signals.h -- header to include system dependent signal definitions.
-   $Id: signals.h,v 1.3 2005/05/15 00:00:07 karl Exp $
+   $Id: signals.h,v 1.4 2007/07/01 18:46:23 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/termdep.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/termdep.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- info/termdep.h      15 May 2005 00:00:07 -0000      1.3
+++ info/termdep.h      1 Jul 2007 18:46:23 -0000       1.4
@@ -1,12 +1,12 @@
 /* termdep.h -- system things that terminal.c depends on.
-   $Id: termdep.h,v 1.3 2005/05/15 00:00:07 karl Exp $
+   $Id: termdep.h,v 1.4 2007/07/01 18:46:23 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 1998, 2001, 2002 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/terminal.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/terminal.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/terminal.c     15 May 2005 00:00:07 -0000      1.4
+++ info/terminal.c     1 Jul 2007 18:46:23 -0000       1.5
@@ -1,12 +1,12 @@
 /* terminal.c -- how to handle the physical terminal for Info.
-   $Id: terminal.c,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: terminal.c,v 1.5 2007/07/01 18:46:23 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/terminal.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/terminal.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/terminal.h     15 May 2005 00:00:07 -0000      1.4
+++ info/terminal.h     1 Jul 2007 18:46:23 -0000       1.5
@@ -1,12 +1,12 @@
 /* terminal.h -- The external interface to terminal I/O.
-   $Id: terminal.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: terminal.h,v 1.5 2007/07/01 18:46:23 karl Exp $
 
-   Copyright (C) 1993, 1996, 1997, 2001, 2002, 2004 Free Software
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/tilde.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/tilde.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/tilde.c        18 Jun 2006 23:39:43 -0000      1.5
+++ info/tilde.c        1 Jul 2007 18:46:23 -0000       1.6
@@ -1,12 +1,12 @@
 /* tilde.c -- tilde expansion code (~/foo := $HOME/foo).
-   $Id: tilde.c,v 1.5 2006/06/18 23:39:43 karl Exp $
+   $Id: tilde.c,v 1.6 2007/07/01 18:46:23 karl Exp $
 
    Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1996, 1998, 1999,
-   2002, 2004, 2006 Free Software Foundation, Inc.
+   2002, 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 2, or (at your option)
+   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,
Index: info/tilde.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/tilde.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/tilde.h        15 May 2005 00:00:07 -0000      1.4
+++ info/tilde.h        1 Jul 2007 18:46:23 -0000       1.5
@@ -1,15 +1,15 @@
 /* tilde.h: Externally available variables and function in libtilde.a.
-   $Id: tilde.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: tilde.h,v 1.5 2007/07/01 18:46:23 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
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/variables.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/variables.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/variables.c    15 May 2005 00:00:07 -0000      1.4
+++ info/variables.c    1 Jul 2007 18:46:23 -0000       1.5
@@ -1,11 +1,11 @@
 /* variables.c -- how to manipulate user visible variables in Info.
-   $Id: variables.c,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: variables.c,v 1.5 2007/07/01 18:46:23 karl 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/variables.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/variables.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/variables.h    15 May 2005 00:00:07 -0000      1.4
+++ info/variables.h    1 Jul 2007 18:46:23 -0000       1.5
@@ -1,14 +1,14 @@
 /* variables.h -- Description of user visible variables in Info.
-   $Id: variables.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: variables.h,v 1.5 2007/07/01 18:46:23 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: info/window.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/window.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- info/window.c       15 May 2005 00:00:07 -0000      1.5
+++ info/window.c       1 Jul 2007 18:46:23 -0000       1.6
@@ -1,12 +1,12 @@
 /* window.c -- windows in Info.
-   $Id: window.c,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: window.c,v 1.6 2007/07/01 18:46:23 karl Exp $
 
-   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 2004 Free Software
+   Copyright (C) 1993, 1997, 1998, 2001, 2002, 2003, 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)
+   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,
Index: info/window.h
===================================================================
RCS file: /sources/texinfo/texinfo/info/window.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- info/window.h       15 May 2005 00:00:07 -0000      1.4
+++ info/window.h       1 Jul 2007 18:46:23 -0000       1.5
@@ -1,14 +1,14 @@
 /* window.h -- Structure and flags used in manipulating Info windows.
-   $Id: window.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: window.h,v 1.5 2007/07/01 18:46:23 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: lib/substring.c
===================================================================
RCS file: /sources/texinfo/texinfo/lib/substring.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- lib/substring.c     15 May 2005 00:00:07 -0000      1.3
+++ lib/substring.c     1 Jul 2007 18:46:23 -0000       1.4
@@ -1,11 +1,11 @@
 /* substring.c -- extract substring.
-   $Id: substring.c,v 1.3 2005/05/15 00:00:07 karl Exp $
+   $Id: substring.c,v 1.4 2007/07/01 18:46:23 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: lib/xexit.c
===================================================================
RCS file: /sources/texinfo/texinfo/lib/xexit.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- lib/xexit.c 15 May 2005 00:00:07 -0000      1.6
+++ lib/xexit.c 1 Jul 2007 18:46:23 -0000       1.7
@@ -1,11 +1,11 @@
 /* xexit.c -- exit with attention to return values and closing stdout.
-   $Id: xexit.c,v 1.6 2005/05/15 00:00:07 karl Exp $
+   $Id: xexit.c,v 1.7 2007/07/01 18:46:23 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/cmds.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -r1.71 -r1.72
--- makeinfo/cmds.c     20 Jun 2007 20:05:42 -0000      1.71
+++ makeinfo/cmds.c     1 Jul 2007 18:31:41 -0000       1.72
@@ -1,12 +1,12 @@
 /* cmds.c -- Texinfo commands.
-   $Id: cmds.c,v 1.71 2007/06/20 20:05:42 karl Exp $
+   $Id: cmds.c,v 1.72 2007/07/01 18:31:41 karl Exp $
 
    Copyright (C) 1998, 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
@@ -1451,9 +1451,6 @@
           /* 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");
 
Index: makeinfo/cmds.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/cmds.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- makeinfo/cmds.h     15 May 2005 00:00:07 -0000      1.10
+++ makeinfo/cmds.h     1 Jul 2007 18:31:41 -0000       1.11
@@ -1,12 +1,12 @@
 /* cmds.h -- declarations for cmds.c.
-   $Id: cmds.h,v 1.10 2005/05/15 00:00:07 karl Exp $
+   $Id: cmds.h,v 1.11 2007/07/01 18:31:41 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
+   Copyright (C) 1998, 1999, 2002, 2003, 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)
+   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,
Index: makeinfo/defun.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/defun.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- makeinfo/defun.c    30 May 2006 00:51:28 -0000      1.15
+++ makeinfo/defun.c    1 Jul 2007 18:31:41 -0000       1.16
@@ -1,12 +1,12 @@
 /* defun.c -- @defun and friends.
-   $Id: defun.c,v 1.15 2006/05/30 00:51:28 karl Exp $
+   $Id: defun.c,v 1.16 2007/07/01 18:31:41 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
+   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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/defun.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/defun.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makeinfo/defun.h    15 May 2005 00:00:07 -0000      1.4
+++ makeinfo/defun.h    1 Jul 2007 18:31:41 -0000       1.5
@@ -1,11 +1,11 @@
 /* defun.h -- declaration for defuns.
-   $Id: defun.h,v 1.4 2005/05/15 00:00:07 karl Exp $
+   $Id: defun.h,v 1.5 2007/07/01 18:31:41 karl Exp $
 
-   Copyright (C) 1999, 2005 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/files.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/files.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- makeinfo/files.c    15 May 2005 00:00:07 -0000      1.6
+++ makeinfo/files.c    1 Jul 2007 18:31:42 -0000       1.7
@@ -1,12 +1,12 @@
 /* files.c -- file-related functions for makeinfo.
-   $Id: files.c,v 1.6 2005/05/15 00:00:07 karl Exp $
+   $Id: files.c,v 1.7 2007/07/01 18:31:42 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
@@ -656,7 +656,7 @@
   /* 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 ();
 
Index: makeinfo/files.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/files.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- makeinfo/files.h    15 May 2005 00:00:07 -0000      1.5
+++ makeinfo/files.h    1 Jul 2007 18:31:42 -0000       1.6
@@ -1,11 +1,11 @@
 /* files.h -- declarations for files.c.
-   $Id: files.h,v 1.5 2005/05/15 00:00:07 karl Exp $
+   $Id: files.h,v 1.6 2007/07/01 18:31:42 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/float.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/float.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- makeinfo/float.c    26 Jan 2007 00:03:56 -0000      1.10
+++ makeinfo/float.c    1 Jul 2007 18:31:42 -0000       1.11
@@ -1,11 +1,11 @@
 /* float.c -- float environment functions.
-   $Id: float.c,v 1.10 2007/01/26 00:03:56 karl Exp $
+   $Id: float.c,v 1.11 2007/07/01 18:31:42 karl Exp $
 
    Copyright (C) 2003, 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)
+   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,
Index: makeinfo/float.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/float.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- makeinfo/float.h    15 May 2005 00:00:07 -0000      1.6
+++ makeinfo/float.h    1 Jul 2007 18:31:42 -0000       1.7
@@ -1,11 +1,11 @@
 /* float.h -- declarations for the float environment.
-   $Id: float.h,v 1.6 2005/05/15 00:00:07 karl Exp $
+   $Id: float.h,v 1.7 2007/07/01 18:31:42 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/footnote.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/footnote.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- makeinfo/footnote.c 7 Jun 2006 21:52:25 -0000       1.9
+++ makeinfo/footnote.c 1 Jul 2007 18:31:42 -0000       1.10
@@ -1,11 +1,11 @@
 /* footnote.c -- footnotes for Texinfo.
-   $Id: footnote.c,v 1.9 2006/06/07 21:52:25 karl Exp $
+   $Id: footnote.c,v 1.10 2007/07/01 18:31:42 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/footnote.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/footnote.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makeinfo/footnote.h 15 May 2005 00:00:07 -0000      1.3
+++ makeinfo/footnote.h 1 Jul 2007 18:31:42 -0000       1.4
@@ -1,12 +1,12 @@
 /* footnote.h -- declarations for footnote.c.
-   $Id: footnote.h,v 1.3 2005/05/15 00:00:07 karl Exp $
+   $Id: footnote.h,v 1.4 2007/07/01 18:31:42 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/html.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- makeinfo/html.c     20 Jun 2007 20:05:42 -0000      1.37
+++ makeinfo/html.c     1 Jul 2007 18:31:42 -0000       1.38
@@ -1,12 +1,12 @@
 /* html.c -- html-related utilities.
-   $Id: html.c,v 1.37 2007/06/20 20:05:42 karl Exp $
+   $Id: html.c,v 1.38 2007/07/01 18:31:42 karl Exp $
 
    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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/html.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/html.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- makeinfo/html.h     20 Jun 2007 20:05:42 -0000      1.8
+++ makeinfo/html.h     1 Jul 2007 18:31:42 -0000       1.9
@@ -1,11 +1,11 @@
 /* html.h -- declarations for html-related utilities.
-   $Id: html.h,v 1.8 2007/06/20 20:05:42 karl Exp $
+   $Id: html.h,v 1.9 2007/07/01 18:31:42 karl Exp $
 
    Copyright (C) 1999, 2000, 2002, 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)
+   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,
Index: makeinfo/index.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/index.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- makeinfo/index.c    7 Feb 2007 17:00:38 -0000       1.22
+++ makeinfo/index.c    1 Jul 2007 18:31:42 -0000       1.23
@@ -1,12 +1,12 @@
 /* index.c -- indexing for Texinfo.
-   $Id: index.c,v 1.22 2007/02/07 17:00:38 karl Exp $
+   $Id: index.c,v 1.23 2007/07/01 18:31:42 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2004 Free Software Foundation,
+   Copyright (C) 1998, 1999, 2002, 2003, 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)
+   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,
Index: makeinfo/index.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/index.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makeinfo/index.h    15 May 2005 00:00:07 -0000      1.3
+++ makeinfo/index.h    1 Jul 2007 18:31:42 -0000       1.4
@@ -1,11 +1,11 @@
 /* index.h -- declarations for index.c.
-   $Id: index.h,v 1.3 2005/05/15 00:00:07 karl Exp $
+   $Id: index.h,v 1.4 2007/07/01 18:31:42 karl Exp $
 
-   Copyright (C) 1998, 99 Free Software Foundation, Inc.
+   Copyright (C) 1998, 99, 07 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)
+   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,
Index: makeinfo/insertion.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.c,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- makeinfo/insertion.c        11 Dec 2006 14:59:59 -0000      1.62
+++ makeinfo/insertion.c        1 Jul 2007 18:31:42 -0000       1.63
@@ -1,12 +1,12 @@
 /* insertion.c -- insertions for Texinfo.
-   $Id: insertion.c,v 1.62 2006/12/11 14:59:59 karl Exp $
+   $Id: insertion.c,v 1.63 2007/07/01 18:31:42 karl Exp $
 
-   Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006
+   Copyright (C) 1998, 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
@@ -627,7 +627,7 @@
           if (!(*insertion_stack->item_function))
             {
               free (insertion_stack->item_function);
-              insertion_stack->item_function = default_item_function;
+              insertion_stack->item_function = (char *) default_item_function;
             }
         }
 
@@ -1472,6 +1472,12 @@
       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)
Index: makeinfo/insertion.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/insertion.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- makeinfo/insertion.h        15 Aug 2005 13:05:24 -0000      1.12
+++ makeinfo/insertion.h        1 Jul 2007 18:31:43 -0000       1.13
@@ -1,11 +1,11 @@
 /* insertion.h -- declarations for insertion.c.
-   $Id: insertion.h,v 1.12 2005/08/15 13:05:24 karl Exp $
+   $Id: insertion.h,v 1.13 2007/07/01 18:31:43 karl Exp $
 
-   Copyright (C) 1998, 1999, 2001, 2002, 2003 Free Software Foundation, Inc.
+   Copyright (C) 1998, 1999, 2001, 2002, 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)
+   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,
Index: makeinfo/lang.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- makeinfo/lang.c     20 Jun 2007 20:05:42 -0000      1.25
+++ makeinfo/lang.c     1 Jul 2007 18:31:43 -0000       1.26
@@ -1,12 +1,12 @@
 /* lang.c -- language-dependent support.
-   $Id: lang.c,v 1.25 2007/06/20 20:05:42 karl Exp $
+   $Id: lang.c,v 1.26 2007/07/01 18:31:43 karl Exp $
 
    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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/lang.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/lang.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- makeinfo/lang.h     17 Jun 2007 23:12:00 -0000      1.11
+++ makeinfo/lang.h     1 Jul 2007 18:31:43 -0000       1.12
@@ -1,12 +1,12 @@
 /* lang.h -- declarations for language codes etc.
-   $Id: lang.h,v 1.11 2007/06/17 23:12:00 karl Exp $
+   $Id: lang.h,v 1.12 2007/07/01 18:31:43 karl Exp $
 
    Copyright (C) 1999, 2001, 2002, 2003, 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 2, or (at your option)
+   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,
Index: makeinfo/macro.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/macro.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- makeinfo/macro.c    11 Dec 2006 14:59:59 -0000      1.10
+++ makeinfo/macro.c    1 Jul 2007 18:31:43 -0000       1.11
@@ -1,11 +1,11 @@
 /* macro.c -- user-defined macros for Texinfo.
-   $Id: macro.c,v 1.10 2006/12/11 14:59:59 karl Exp $
+   $Id: macro.c,v 1.11 2007/07/01 18:31:43 karl Exp $
 
-   Copyright (C) 1998, 1999, 2002, 2003, 2005 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/macro.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/macro.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- makeinfo/macro.h    5 Jul 2006 13:39:05 -0000       1.4
+++ makeinfo/macro.h    1 Jul 2007 18:31:43 -0000       1.5
@@ -1,11 +1,11 @@
 /* macro.h -- declarations for macro.c.
-   $Id: macro.h,v 1.4 2006/07/05 13:39:05 karl Exp $
+   $Id: macro.h,v 1.5 2007/07/01 18:31:43 karl Exp $
 
-   Copyright (C) 1998, 99 Free Software Foundation, Inc.
+   Copyright (C) 1998, 99, 07 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)
+   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,
Index: makeinfo/makeinfo.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.c,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- makeinfo/makeinfo.c 1 Jul 2007 15:35:46 -0000       1.100
+++ makeinfo/makeinfo.c 1 Jul 2007 18:31:43 -0000       1.101
@@ -1,5 +1,5 @@
 /* makeinfo -- convert Texinfo source into other formats.
-   $Id: makeinfo.c,v 1.100 2007/07/01 15:35:46 karl Exp $
+   $Id: makeinfo.c,v 1.101 2007/07/01 18:31:43 karl Exp $
 
    Copyright (C) 1987, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
@@ -7,7 +7,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, or (at your option)
+   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,
Index: makeinfo/makeinfo.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/makeinfo.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- makeinfo/makeinfo.h 20 Jun 2007 20:05:42 -0000      1.25
+++ makeinfo/makeinfo.h 1 Jul 2007 18:31:43 -0000       1.26
@@ -1,12 +1,12 @@
 /* makeinfo.h -- declarations for Makeinfo.
-   $Id: makeinfo.h,v 1.25 2007/06/20 20:05:42 karl Exp $
+   $Id: makeinfo.h,v 1.26 2007/07/01 18:31:43 karl Exp $
 
    Copyright (C) 1996, 1997, 1998, 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/multi.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/multi.c,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- makeinfo/multi.c    22 May 2007 00:54:44 -0000      1.16
+++ makeinfo/multi.c    1 Jul 2007 18:31:44 -0000       1.17
@@ -1,12 +1,12 @@
 /* multi.c -- multiple-column tables (@multitable) for makeinfo.
-   $Id: multi.c,v 1.16 2007/05/22 00:54:44 karl Exp $
+   $Id: multi.c,v 1.17 2007/07/01 18:31:44 karl Exp $
 
    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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/multi.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/multi.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- makeinfo/multi.h    15 May 2005 00:00:08 -0000      1.2
+++ makeinfo/multi.h    1 Jul 2007 18:31:44 -0000       1.3
@@ -1,11 +1,11 @@
 /* multi.h -- declarations for multi.c.
-   $Id: multi.h,v 1.2 2005/05/15 00:00:08 karl Exp $
+   $Id: multi.h,v 1.3 2007/07/01 18:31:44 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/node.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/node.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- makeinfo/node.c     20 Jun 2007 20:05:42 -0000      1.34
+++ makeinfo/node.c     1 Jul 2007 18:31:44 -0000       1.35
@@ -1,12 +1,12 @@
 /* node.c -- nodes for Texinfo.
-   $Id: node.c,v 1.34 2007/06/20 20:05:42 karl Exp $
+   $Id: node.c,v 1.35 2007/07/01 18:31:44 karl Exp $
 
    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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
@@ -1129,7 +1129,7 @@
       if (!paragraph_is_open)
        {
          if (!executing_string && html)
-           html_output_head ();
+           output_head ();
          start_paragraph ();
          if (!in_fixed_width_font || in_menu || in_detailmenu)
            {
Index: makeinfo/node.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/node.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makeinfo/node.h     15 May 2005 00:00:08 -0000      1.3
+++ makeinfo/node.h     1 Jul 2007 18:31:44 -0000       1.4
@@ -1,11 +1,11 @@
 /* node.h -- declarations for Node.
-   $Id: node.h,v 1.3 2005/05/15 00:00:08 karl Exp $
+   $Id: node.h,v 1.4 2007/07/01 18:31:44 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/sectioning.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/sectioning.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- makeinfo/sectioning.c       14 Mar 2006 00:29:07 -0000      1.27
+++ makeinfo/sectioning.c       1 Jul 2007 18:31:44 -0000       1.28
@@ -1,11 +1,11 @@
 /* sectioning.c -- for @chapter, @section, ..., @contents ...
-   $Id: sectioning.c,v 1.27 2006/03/14 00:29:07 karl Exp $
+   $Id: sectioning.c,v 1.28 2007/07/01 18:31:44 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/sectioning.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/sectioning.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- makeinfo/sectioning.h       15 May 2005 00:00:08 -0000      1.6
+++ makeinfo/sectioning.h       1 Jul 2007 18:31:44 -0000       1.7
@@ -1,11 +1,11 @@
 /* sectioning.h -- all related stuff @chapter, @section... @contents
-   $Id: sectioning.h,v 1.6 2005/05/15 00:00:08 karl Exp $
+   $Id: sectioning.h,v 1.7 2007/07/01 18:31:44 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/toc.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/toc.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- makeinfo/toc.c      30 May 2006 00:51:28 -0000      1.8
+++ makeinfo/toc.c      1 Jul 2007 18:31:44 -0000       1.9
@@ -1,11 +1,11 @@
 /* toc.c -- table of contents handling.
-   $Id: toc.c,v 1.8 2006/05/30 00:51:28 karl Exp $
+   $Id: toc.c,v 1.9 2007/07/01 18:31:44 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/toc.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/toc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- makeinfo/toc.h      15 May 2005 00:00:08 -0000      1.3
+++ makeinfo/toc.h      1 Jul 2007 18:31:44 -0000       1.4
@@ -1,11 +1,11 @@
 /* toc.h -- table of contents handling.
-   $Id: toc.h,v 1.3 2005/05/15 00:00:08 karl Exp $
+   $Id: toc.h,v 1.4 2007/07/01 18:31:44 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/xml.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xml.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- makeinfo/xml.c      20 Jun 2007 20:05:42 -0000      1.70
+++ makeinfo/xml.c      1 Jul 2007 18:31:44 -0000       1.71
@@ -1,12 +1,12 @@
 /* xml.c -- xml output, both TexinfoML and Docbook.
-   $Id: xml.c,v 1.70 2007/06/20 20:05:42 karl Exp $
+   $Id: xml.c,v 1.71 2007/07/01 18:31:44 karl Exp $
 
    Copyright (C) 2001, 2002, 2003, 2004, 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 2, or (at your option)
+   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,
Index: makeinfo/xml.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xml.h,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- makeinfo/xml.h      20 Jun 2007 20:05:42 -0000      1.28
+++ makeinfo/xml.h      1 Jul 2007 18:31:45 -0000       1.29
@@ -1,12 +1,12 @@
 /* xml.h -- xml (including Docbook) output declarations.
-   $Id: xml.h,v 1.28 2007/06/20 20:05:42 karl Exp $
+   $Id: xml.h,v 1.29 2007/07/01 18:31:45 karl Exp $
 
    Copyright (C) 2001, 2002, 2003, 2004, 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 2, or (at your option)
+   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,
Index: makeinfo/xref.c
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xref.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- makeinfo/xref.c     30 May 2006 00:51:28 -0000      1.10
+++ makeinfo/xref.c     1 Jul 2007 18:31:45 -0000       1.11
@@ -1,11 +1,11 @@
 /* xref.c -- cross references for Texinfo.
-   $Id: xref.c,v 1.10 2006/05/30 00:51:28 karl Exp $
+   $Id: xref.c,v 1.11 2007/07/01 18:31:45 karl Exp $
 
-   Copyright (C) 2004, 2005 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/xref.h
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/xref.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- makeinfo/xref.h     15 May 2005 00:00:08 -0000      1.2
+++ makeinfo/xref.h     1 Jul 2007 18:31:45 -0000       1.3
@@ -1,11 +1,11 @@
 /* xref.h -- declarations for the cross references.
-   $Id: xref.h,v 1.2 2005/05/15 00:00:08 karl Exp $
+   $Id: xref.h,v 1.3 2007/07/01 18:31:45 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
Index: makeinfo/tests/copying
===================================================================
RCS file: /sources/texinfo/texinfo/makeinfo/tests/copying,v
retrieving revision 1.2
retrieving revision 1.4
diff -u -r1.2 -r1.4
--- makeinfo/tests/copying      20 Apr 2004 13:26:00 -0000      1.2
+++ makeinfo/tests/copying      1 Jul 2007 18:38:52 -0000       1.4
@@ -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.
 
Index: po/cs.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/cs.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- po/cs.po    8 Jun 2006 22:42:22 -0000       1.29
+++ po/cs.po    1 Jul 2007 18:43:35 -0000       1.30
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.0\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2000-10-31 15:17+01:00\n"
 "Last-Translator: Vladimir Michl <address@hidden>\n"
 "Language-Team: Czech <address@hidden>\n"
@@ -16,6 +16,72 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: neznámý pøepínaè `--%s'\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: neznámý pøepínaè `%c%s'\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: neznámý pøepínaè -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: neznámý pøepínaè -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: pøepínaè vy¾aduje argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, 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:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "virtuální pamì» vyèerpána"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Posun na následující znak"
@@ -228,39 +294,32 @@
 "\n"
 "* Menu: Uzly jejich¾ rejstøíky obsahují \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, 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:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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:501
+#: info/info.c:503
 #, 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:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -297,6 +356,7 @@
 "  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"
@@ -342,8 +402,8 @@
 "obecné otázky smìøujte na <address@hidden>. Pøipomínky k pøekladu\n"
 "zasílejte na adresu <address@hidden> (èesky).\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 #, fuzzy
 msgid ""
 "\n"
@@ -357,72 +417,72 @@
 "obecné otázky smìøujte na <address@hidden>. Pøipomínky k pøekladu\n"
 "zasílejte na <address@hidden> (èesky).\n"
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Uzel `%s' nelze nalézt."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Uzel `(%s)%s' nelze nalézt."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Nelze nalézt okno!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Bod se nevyskutuje v oknì tohoto uzlu!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Poslední okno nelze smazat."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "V tomto uzlu není menu."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "V tomto nejsou poznámky pod èarou."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "V tomto uzlu není køí¾ový odkaz."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Pro tento uzel není `%s' ukazatel."
 
-#: info/info.c:681
+#: info/info.c:684
 #, 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:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "Ji¾ jste na poslední stránce tohoto uzlu."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "Ji¾ jste na první stránce tohoto uzlu."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Pouze jedno okno."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Výsledné okno by bylo pøíli¹ malé."
 
-#: info/info.c:687
+#: info/info.c:690
 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."
 
@@ -853,93 +913,93 @@
 msgid "There is no function named `%s'"
 msgstr "Funkce `%s' není známa"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr ""
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, fuzzy, c-format
 msgid "cannot open input file `%s'"
 msgstr "Rouru do `%s' nelze otevøít."
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, fuzzy, c-format
 msgid "cannot create output file `%s'"
 msgstr "Výstupní soubor `%s' nelze vytvoøit."
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr ""
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, fuzzy, c-format
 msgid "error closing output file `%s'"
 msgstr "Výstupní soubor `%s' nelze vytvoøit."
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr ""
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr ""
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr ""
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr ""
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 #, fuzzy
 msgid "missing action name"
 msgstr "%c%s chybìjící uzavírací závorka"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr ""
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, fuzzy, c-format
 msgid "unknown action `%s'"
 msgstr "Neznámý pøíkaz `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr ""
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr ""
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 #, fuzzy
 msgid "missing variable name"
 msgstr "%s: chybí argument jména souboru.\n"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr ""
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr ""
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr ""
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr ""
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1029,7 +1089,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Vý¹ka obrazovky (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1038,7 +1098,7 @@
 "Pøi zpracování zdrojového souboru jsou vkládány tyto soubory:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Se souborem %s nelze pracovat.\n"
@@ -1105,7 +1165,7 @@
 msgid "Move to the start of the line"
 msgstr "Pøesun na zaèátek øádku"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Dal¹í"
 
@@ -1591,7 +1651,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Vnitønì u¾íváno funkcí \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Nedostatek virtuální pamìti!\n"
@@ -1684,186 +1744,139 @@
 msgid " Subfile: %s"
 msgstr " Podsoubor: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: pøepínaè `%s' není jednoznaèný\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, 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"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, 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"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: pøepínaè `%s' vy¾aduje argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: neznámý pøepínaè `--%s'\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: neznámý pøepínaè `%c%s'\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: neznámý pøepínaè -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: neznámý pøepínaè -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: pøepínaè vy¾aduje argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, 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"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "©patný argument pro %c%s"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Leden"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "Únor"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "Bøezen"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "Duben"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "Kvìten"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "Èerven"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "Èervenec"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "Srpen"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "Záøí"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "Øíjen"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "Listopad"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "Prosinec"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "nepravdìpodobný znak %c ve @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc argument je celý velkými písmeny, zbyteènì"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, fuzzy, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "address@hidden' vy¾aduje `%s', ale vidí `%s'"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, fuzzy, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "address@hidden' vy¾aduje `%s', ale vidí `%s'"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "Pøíkaz %c%s je zastaralý"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp vy¾aduje kladný èíselný argument a ne `%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "©patný argument pro %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "©patný argument pro %c%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr ""
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "©patný argument pro %c%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1901,12 +1914,12 @@
 msgstr "Metoda"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "z"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr ""
 
@@ -1939,8 +1952,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Viz"
@@ -1964,7 +1977,7 @@
 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:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Poznámky pod èarou"
 
@@ -1973,64 +1986,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Neoznaèeno"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, 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:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Neznámý rejstøík `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Rejstøík `%s' ji¾ existuje"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Neznámý rejstøík `%s' v @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, 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:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(mimo v¹echny uzly)"
 
@@ -2134,37 +2147,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx není myslitelný uvnitø `%s' bloku"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s nalezen mimo vkládaný blok"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "%s: neznámý pøepínaè `--%s'\n"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2179,62 +2197,66 @@
 msgid "here is the previous definition of `%s'"
 msgstr "zde je pøedchozí definice `%s'"
 
-#: makeinfo/macro.c:356
+#: 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"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makro nebylo nalezeno"
 
-#: makeinfo/macro.c:625
-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:661
+#: 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 "pomíchané @end %s s @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Pøíli¹ mnoho chyb!  Konec.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: varování: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "©patnì umístìný znak %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, 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:344
+#: makeinfo/makeinfo.c:348
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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:351
+#: makeinfo/makeinfo.c:355
 #, c-format
 msgid ""
 "General options:\n"
@@ -2251,7 +2273,7 @@
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2261,7 +2283,7 @@
 "      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE     output macro-expanded source to FILE.\n"
@@ -2279,7 +2301,7 @@
 "  -o, --output=FILE           output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2300,7 +2322,7 @@
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2310,7 +2332,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2320,7 +2342,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2330,7 +2352,7 @@
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2350,7 +2372,7 @@
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2359,7 +2381,7 @@
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2397,84 +2419,77 @@
 "obecné otázky smìøujte na <address@hidden>. Pøipomínky k pøekladu\n"
 "zasílejte na <address@hidden> (èesky)."
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: chybí argument jména souboru.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Oèekáváno `%s'"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Soubor `%s' nenalezen v `%s'"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Vytváøím %s soubor `%s' ze souboru `%s'.\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2482,114 +2497,121 @@
 "%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:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Neznámý pøíkaz `%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s oèekáváno `{...}'"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Nepárová }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "Funkce neexistuje!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s chybìjící uzavírací závorka"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, 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:3364
+#: makeinfo/makeinfo.c:3449
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "Soubor `%s' nenalezen v `%s'"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, 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:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "pøíkaz @image postrádá jméno souboru"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Pro `%s' není hodnota}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s po¾aduje jméno"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Vstupní soubor skonèil a pøíkaz address@hidden %s' nebyl nalezen"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Chybìjící } v @multitable vzoru"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignoruji zbloudilý text `%s' po pøíkazu @multitable"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, 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:556
+#: makeinfo/multi.c:564
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "sloupec #%d v multitabulce nelze vybrat"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "pøíkaz address@hidden' ignorován, je mimo multitabulku"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Vícesloupcový výstup z posledního øádku:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* sloupec #%d: výstup = %s\n"
@@ -2614,7 +2636,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Pøíkazu `%c%s' nebyl zadán název uzlu"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
@@ -2623,7 +2645,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
@@ -2644,84 +2666,84 @@
 msgid "Up:"
 msgstr "Nahoru:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menu"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Odkaz"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Tento uzel (%s) má chybný odkaz na pøedchozí uzel"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Pøedchozí"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Pøedchozí uzel uzlu `%s' neukazuje na tento"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, 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:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Nahoru"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "na uzel `%s' se bylo odkazováno %d krát"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Výstupní soubor `%s' nelze vytvoøit."
@@ -2761,20 +2783,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2816,30 +2830,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: varování: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " pro %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
+#: util/install-info.c:453
 #, 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"
+"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"
@@ -2860,11 +2874,18 @@
 "                     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"
@@ -2903,7 +2924,7 @@
 "obecné otázky smìøujte na <address@hidden>. Pøipomínky\n"
 "k pøekladu zasílejte na <address@hidden> (èesky).\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2941,100 +2962,102 @@
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: prázdný soubor"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Info soubor zadejte pouze jednou.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "nadbyteèný argument `%s' v pøíkazovém øádku"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 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."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 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"
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "v Info adresáøi `%s' není ¾ádná polo¾ka"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "polo¾ka menu `%s' ji¾ pro soubor `%s' existuje"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "pro `%s' nebyly nalezeny ¾ádné polo¾ky"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "vypí¹e tuto nápovìdu a skonèí"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "zanechá doèasné soubory po ukonèení"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "nezanechá doèasné soubory po ukonèení"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "zapí¹e výstup do SOUBORu"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "vypí¹e oznaèení verze a skonèí"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3043,27 +3066,57 @@
 "\n"
 "Pøepínaèe:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: není texinfovský rejstøík"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "soubor %s nepovedlo se znovu otevøít"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: není texinfovský rejstøík"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Na %s není èíslo stránky"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, 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 ""
+#~ "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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
@@ -3112,9 +3165,6 @@
 #~ 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'"
Index: po/da.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/da.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- po/da.po    8 Jun 2006 22:42:22 -0000       1.32
+++ po/da.po    1 Jul 2007 18:43:35 -0000       1.33
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.2e\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2002-11-08 09:13GMT\n"
 "Last-Translator: Claus Hindsgaul <address@hidden>\n"
 "Language-Team: Danish <address@hidden>\n"
@@ -15,6 +15,72 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 0.9.6\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: tilvalg '%s' er flertydig\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: tilvalg '%s' kræver en parameter\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukendt tilvalg '--%s'\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukendt tilvalg '%c%s'\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ugyldigt tilvalg -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldigt tilvalg -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: tilvalg kræver en parameter -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: tilvalg '-W %s' er flertydigt\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "virtuel hukommelse opbrugt"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Gå et tegn frem"
@@ -223,36 +289,32 @@
 "\n"
 "* Menu: Emner, hvis indeks indeholder \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Prøv --help for mere information.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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"
-"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"
 
-#: info/info.c:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ingen indeksindgange blev fundet for '%s'\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr " -b, --speech-friendly        vær talesyntese-venlig.\n"
 
-#: info/info.c:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -289,6 +351,7 @@
 "  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"
@@ -327,8 +390,8 @@
 "tilvalg\n"
 "  info -f ./xxx.info         vis filen ./xxx.info uden at søge i katalog\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -341,72 +404,72 @@
 "oversættelsesfejl til address@hidden"
 "Texinfos hjemmeside: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan ikke finde emnet '%s'."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan ikke finde emnet '(%s)%s'."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Kan ikke finde et vindue!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Punktet optræder ikke i dette vindues emne!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Kan ikke slette det sidste vindue."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Ingen menu i dette emne."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Ingen fodnoter i dette emne."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Ingen krydsreferencer i dette emne."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Ingen '%s'-peger mod dette emne."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Ukendt Info kommando '%c'; prøv '?' for hjælp."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "Du er i forvejen ved emnets sidste side."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "Du er i forvejen ved emnets første side."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Kun ét vindue."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Det resulterende vindue ville være for lille."
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Ikke nok plads til et hjælpevindue. Fjern venligst et vindue."
 
@@ -839,91 +902,91 @@
 msgid "There is no function named `%s'"
 msgstr "Der er ingen funktion kaldet '%s'"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "ugyldigt antal parametre"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "can ikke åbne inddata-filen '%s'."
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "kan ikke oprette uddatafil '%s'"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "fejl under skrivning til '%s'"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "fejl under lukning af uddatafilen '%s'"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "nøglesekvens for lang"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "manglende nøglesekvens"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL-tegn (\\000) ikke tilladt"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL-tegn (^%c) ikke tilladt"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "mangler handlingsnavn"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "for langt afsnit"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "ukendt handling '%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "for langt handlingsnavn"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "ekstra tegn følger handlingen '%s'"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "manglende variabelnavn"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "mangler '=' umiddelbart efter variabelnavn"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "for langt variabelnavn"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "for lang værdi"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", linje %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1033,7 +1096,7 @@
 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:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1042,7 +1105,7 @@
 "   Kildetekster gennemtrævlet for at inkludere filen;\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunne ikke bearbejde filen %s.\n"
@@ -1109,7 +1172,7 @@
 msgid "Move to the start of the line"
 msgstr "Gå til linjestart"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Næste"
 
@@ -1590,7 +1653,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Bruges internt af \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Virtuel hukommelse opbrugt!\n"
@@ -1683,186 +1746,139 @@
 msgid " Subfile: %s"
 msgstr " Underfil: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tilvalg '%s' er flertydig\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: tilvalg '--%s' tillader ikke en parameter\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: tilvalg '%c%s' tillader ikke en parameter\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: tilvalg '%s' kræver en parameter\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukendt tilvalg '--%s'\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukendt tilvalg '%c%s'\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ugyldigt tilvalg -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldigt tilvalg -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: tilvalg kræver en parameter -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: tilvalg '-W %s' er flertydigt\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: tilvalg '-W %s' tillader ikke en parameter\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "januar"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "februar"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "marts"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "maj"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "august"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "december"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "usandsynligt tegn %c i @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc parameter er kun versaler, derfor ingen virkning"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "'{' forventedes, men fandt '%c'"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "filslutning inden i en verb-blok"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "'}' forventedes, men fandt '%c'"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s er forældet"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp kræver et positivt tal, ikke '%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr ""
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Ugyldigt argument til %c%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1900,12 +1916,12 @@
 msgstr "Metode"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "for"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "på"
 
@@ -1938,8 +1954,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Se "
@@ -1962,7 +1978,7 @@
 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:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Fodnoter"
 
@@ -1971,64 +1987,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Uden titel"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[uventet] ingen html-mærker at \"pop\"'e"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[uventet] ugyldigt emnenavn: '%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Ukendt indeks '%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indeks '%s' eksisterer allerede"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Ukendt indeks '%s' i @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Indgang til indeks '%s' udenfor et emne"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(udenfor et emne)"
 
@@ -2131,37 +2147,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx giver ingen mening i en '%s'-blok"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s fundet udenfor en indsætningsblok"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s er ikke en gyldig ISO 639 sprogkode"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "ukendt indkodningsnavn '%s'"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "beklager, indkodningen '%s' understøttes ikke"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ugyldig indkodet tegn '%s'"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2176,56 +2197,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "her er den forrige definition af '%s'"
 
-#: makeinfo/macro.c:356
+#: 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"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makro ikke fundet"
 
-#: makeinfo/macro.c:625
-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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "uparret @end %s med @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "For mange fejl! Gav op.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: advarsel: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Fejlplaceret %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv '%s --help' for mere information.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Brug: %s [TILVALG]... TEXINFO-FIL...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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,7 +2260,7 @@
 "Info-filer, der er lavet til at blive læst på skærmen med Emacs eller GNU "
 "Info.\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2262,7 +2287,7 @@
 "  -v, --verbose               forklar, hvad der sker.\n"
 "      --version               vis versionsoplysninger og afslut.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2276,7 +2301,7 @@
 "      --html                lav HTML i stedet for Info.\n"
 "      --xml                 lav Texinfo XML i stedet for Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2305,7 +2330,7 @@
 "      --number-sections     lav afsnits- og sektionsnumre.\n"
 "  -o, --output=FILE         send til FIL (katalog i tilfældet opdelt HTML),\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2345,7 +2370,7 @@
 "      --split-size=ANTAL      opdel Info-filer ved størrelsen ANTAL "
 "(standard %d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2355,7 +2380,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2365,7 +2390,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2383,7 +2408,7 @@
 "søgestien.\n"
 "  -U VAR                         afdefinér variablen VAR som med @clear.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2415,7 +2440,7 @@
 "  --no-iftex        behandl ikke @iftex og @tex-tekst.\n"
 "  --no-ifxml        behandl ikke @ifxml og @xml-tekst.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2431,7 +2456,7 @@
 "  hvis der laves ren tekst er --ifplaintext aktiveret og de andre "
 "deaktiverede.\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2457,194 +2482,194 @@
 "  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:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filparameter.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Forventede '%s'"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan ikke oprette kataloget '%s': %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Ingen '%s' fundet i '%s'"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Producerer %s file '%s' ud fra '%s'.\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, 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:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Ukendt kommando '%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s forventede '{...}'"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Uparret }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "INTET_NAVN!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s mangler højre parentes"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-fil '%s' (for HTML) er ulæselig: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "Ingen '%s' fundet i '%s'"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-fil '%s' (for tekst) er ulæselig: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image mangler filnavnsparameter"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Ingen værdi for '%s'}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s kræver et navn"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Nåede filslutning før samhørende @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' er for langt til ekspansion; blev ikke ekspanderet"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Manglende } i @multitable skabelon"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignorerer vildfaren tekst '%s' efter @multitable"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "For mange søjler i 'multitable' element (maks %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[uventet] Kan ikke vælge kolonne %d i 'multitable'"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerer @tab udenfor 'multitable'"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Flerkolonne uddata fra sidste række:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolonne %d: uddata = %s\n"
@@ -2669,7 +2694,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Intet emnenavn angivet for '%c%s'-kommandoen"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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"
@@ -2678,7 +2703,7 @@
 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:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Omdøb dette mål eller brug tilvalget '--no-split'"
 
@@ -2699,83 +2724,83 @@
 msgid "Up:"
 msgstr "Op:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor-kommandoen ignoreres. Referencer til den vil ikke fungere"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s reference til ikke-eksisterende emne '%s'"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menu"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Kryds"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Dette emne (%s) har den ugyldige 'Forrige'"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Forrige"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Feltet 'Forrige' i emne '%s' bliver ikke peget på"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Dette emne (%s) har den ugyldige 'Næste'-felt"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Op"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "emne '%s' blev refereret %d gange"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ikke-refereret emne '%s'"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kan ikke oprette kataloget '%s': %s"
@@ -2815,20 +2840,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-fil '%s' er ulæselig: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2870,30 +2887,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "Første parameter i @inforef må ikke være tom"
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: advarsel: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " for %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\tPrøv '%s --help' for en komplet tilvalgsliste.\n"
 
-#: util/install-info.c:434
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2914,11 +2931,18 @@
 "                     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"
@@ -2953,7 +2977,7 @@
 "                     informationerne i selve Info-filen.\n"
 " --version         vis denne versions-information og afslut.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2989,98 +3013,100 @@
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: tom fil"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Angiv kun Info-filen én gang.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "overskydende kommandolinjeparameter '%s'"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Ingen inddatafil angivet; prøv --help for mere information."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "Intet katalog angivet; prøv --help for mere information."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "ingen infokatalog-indgang i '%s'"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menupunkt '%s' eksisterer allerede i filen '%s'"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "ingen indgange fundet for '%s'; intet slettet"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "viser denne hjælp og afslutter"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "efterlad midlertidige filer"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "efterlad ikke midlertidige filer (standard)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "send uddata til FIL"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "vis versions-information og afslut"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Brug: %s [TILVALG]... FIL...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3089,27 +3115,54 @@
 "\n"
 "Tilvalg:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ikke en texinfo indeksfil"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "kunne ikke åbne %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ikke en texinfo indeksfil"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Intet sidenummer i %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "indgang %s følger en indgang med et sekundært navn"
 
+#, 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
@@ -3157,9 +3210,6 @@
 #~ 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"
 
Index: po/de.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/de.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- po/de.po    8 Jun 2006 22:42:22 -0000       1.40
+++ po/de.po    1 Jul 2007 18:43:36 -0000       1.41
@@ -61,7 +61,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2005-12-07 13:57+0100\n"
 "Last-Translator: Michael Piefel <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -69,6 +69,73 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: Option „%s“ ist nicht eindeutig\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: Option „--%s“ erlaubt kein Argument\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Option „%s“ benötigt ein Argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nicht erkannte Option „--%s“\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nicht erkannte Option „%c%s“\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ungültige Option -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Option benötigt ein Argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Option „-W %s“ ist nicht eindeutig\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: Option „-W %s“ erlaubt kein Argument\n"
+
+# checkit
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "kein Speicher mehr"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Ein Zeichen vorgehen"
@@ -284,40 +351,34 @@
 "\n"
 "* Menü: Knoten, deren Indizes „%s“ enthalten:\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "„--help“ gibt weitere Informationen.\n"
 
-# Hier de-Standard-Formulierung einsetzen!
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
-"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"
+"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "Keine Indexeinträge für „%s“ gefunden\n"
 
-#: info/info.c:593
+#: info/info.c:595
 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:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -353,6 +414,7 @@
 "  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 ""
 "Aufruf: %s [OPTION]... [INFO-DATEI [MENU-EINTRAG...]]\n"
@@ -401,8 +463,8 @@
 "                               beginnen\n"
 "  info -f ./foo.info         datei ./foo.info anzeigen\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -415,72 +477,72 @@
 "schicken, allgemeine Fragen und Gedankenaustausch an address@hidden"
 "Texinfos Homepage: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Knoten „%s“ nicht gefunden."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Knoten „(%s)%s“ nicht gefunden."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Kein Fenster gefunden!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Momentane Position erscheint nicht in dem Knoten dieses Fensters!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Kann das letzte Fenster nicht löschen!"
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Kein Menü in diesem Knoten."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Keine Fußnoten in diesem Knoten."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Keine Querverweise in diesem Knoten."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Kein „%s“-Verweis für diesem Knoten."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Unbekannter Info-Befehl „%c“. „?“ eingeben, um Hilfe zu 
bekommen."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "Sie sind bereits auf der letzten Seite dieses Knotens."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "Sie sind bereits auf der ersten Seite dieses Knotens."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Nur ein Fenster."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Das entstehende Fenster wäre zu klein."
 
-#: info/info.c:687
+#: info/info.c:690
 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."
 
@@ -929,91 +991,91 @@
 msgid "There is no function named `%s'"
 msgstr "Es gibt keine Funktion mit Namen „%s“"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "falsche Anzahl von Argumenten"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "Eingabedatei „%s“ kann nicht geöffnet werden."
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "Ausgabedatei „%s“ kann nicht angelegt werden."
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "Fehler beim Schreiben von „%s“."
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "Fehler beim Schließen der Ausgabedatei „%s“."
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "Tastenkombination zu lang."
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "Fehlende Tastenkombination."
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL-Zeichen (\\000) nicht erlaubt."
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL-Zeichen (^%c) nicht erlaubt."
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "Fehlender Befehlsname."
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "Abschnitt zu lang."
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "Unbekannter Befehl „%s“."
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "Befehlsname zu lang."
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "Extrazeichen folgen Befehl „%s“."
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "Dateiname fehlt."
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "Fehlendes „=“ direkt hinter Variablenname."
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "Variablenname zu lang"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "Wert zu lang"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "„%s“, Zeile %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1121,7 +1183,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Setze Bildschirm-Höhe auf (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1130,7 +1192,7 @@
 "   Quelldateien durchsucht, damit diese Datei enthält:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Datei „%s“ ist nicht veränderbar.\n"
@@ -1200,7 +1262,7 @@
 msgid "Move to the start of the line"
 msgstr "Zum Anfang der Zeile bewegen"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "nächstes"
 
@@ -1693,7 +1755,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Intern verwendet von \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Kein Speicher mehr!\n"
@@ -1789,138 +1851,91 @@
 msgid " Subfile: %s"
 msgstr " Unterdatei: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: Option „%s“ ist nicht eindeutig\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Option „--%s“ erlaubt kein Argument\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Option „%c%s“ erlaubt kein Argument\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option „%s“ benötigt ein Argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nicht erkannte Option „--%s“\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nicht erkannte Option „%c%s“\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ungültige Option -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Option benötigt ein Argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option „-W %s“ ist nicht eindeutig\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: Option „-W %s“ erlaubt kein Argument\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "Argumente zu @%s ignoriert"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Januar"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "Februar"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "März"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "April"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "Mai"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "Juni"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "Juli"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "August"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "September"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "Oktober"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "November"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "Dezember"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "wahrscheinlich falsches Zeichen „%c“ in @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "Argument von @sc besteht nur aus Großbuchstaben, somit keine Wirkung"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "„{“ erwartet, jedoch „%c“ bekommen"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "Dateiende innerhalb eines @verb-Blocks"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "„}“ erwartet, jedoch „%c“ bekommen"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1928,49 +1943,49 @@
 "@strong{Bemerkung...} erzeugt einen Pseudo-Querverweis in Info; "
 "umformulieren, um das zu vermeiden"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ist obsolet"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp erfordert ein positives numerisches Argument, nicht „%s“"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Fehlerhaftes Argument zu %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "genau"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "kein"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Fehlerhafte Argumente zu @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "Einfügen"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Fehlerhafte Argumente zu @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -2011,12 +2026,12 @@
 msgstr "Methode"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "aus"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "ein"
 
@@ -2049,8 +2064,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Siehe "
@@ -2074,7 +2089,7 @@
 msgstr "Fußnoten innerhalb von Fußnoten sind nicht erlaubt"
 
 # HTML
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Fu&szlig;noten"
 
@@ -2083,64 +2098,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: CSS-Datei endete inmitten eines Kommentars"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Ohne Titel"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[unerwartet] kein HTML-Tag für Pop-Operation"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[unerwartet] ungültiger Knotenname: „%s“"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Unbekannter Index „%s“"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Index „%s“ existiert bereits"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr "(Zeile )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(Zeile %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Unbekannter Index „%s“ in @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Eintrag für Index „%s“ außerhalb jeglichen Knotens"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(außerhalb jeglichen Knotens)"
 
@@ -2251,37 +2266,42 @@
 msgstr "@itemx nicht sinnvoll innerhalb eines „%s“-Blocks"
 
 # checkit
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s außerhalb eines Einfügungsblocks gefunden"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nicht erkannter Kodierungsname „%s“"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "Kodierung „%s“ wird leider nicht unterstützt."
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "Ungültiges kodiertes Zeichen: „%s“"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2296,57 +2316,61 @@
 msgid "here is the previous definition of `%s'"
 msgstr "hier ist die frühere Definition von „%s“"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 "Dem \\ in der Makro-Erweiterung folgt „%s“ anstelle eines Parameternamens"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Makro „%s“ in Zeile %d mit zuvielen Argumenten aufgerufen"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend Makro nicht gefunden"
 
-#: makeinfo/macro.c:625
-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 ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s stimmt nicht mit @%s überein"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Zu viele Fehler! Abbruch.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: Warnung: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Fehlplazierte %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "„%s --help“ gibt weitere Informationen.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2355,7 +2379,7 @@
 "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:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2383,7 +2407,7 @@
 "  -v, --verbose               ausführlich die Bearbeitungschritte anzeigen\n"
 "      --version               Programmversion anzeigen und beenden\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2398,7 +2422,7 @@
 "      --xml                   Texinfo XML anstelle von Info ausgeben\n"
 "      --plaintext             einfachen Text anstelle von Info ausgeben\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2432,7 +2456,7 @@
 "  -o, --output=DATEI        Ausgabe nach DATEI (bzw. Verzeichnis wenn\n"
 "                            aufgeteiltes HTML)\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2472,7 +2496,7 @@
 "      --split-size=GRÖSSE     in GRÖSSE große Dateien splitten (Standard %"
 "d)\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2486,7 +2510,7 @@
 "      --css-include=DATEI       DATEI in HTML-<style>-Ausgabe einfügen;\n"
 "                                  aus Standardeingabe, wenn DATEI „-“ 
ist\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2501,7 +2525,7 @@
 "wird\n"
 "                                  ignorierbarer Leerraum weggelassen.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2518,7 +2542,7 @@
 "voranstellen\n"
 "  -U VAR                         eine Variable aufheben (wie mit @clear)\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2558,7 +2582,7 @@
 "   Außerdem werden bei den --no-ifFORMAT-Optionen auch die entsprechenden\n"
 "   @ifnoFORMAT-Abschnitte bearbeitet.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2574,7 +2598,7 @@
 "  wird XML erzeugt, ist --ifxml an und die anderen sind aus.\n"
 
 # Die "." am Zeilenende habe ich entfernt. -ke-
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2607,84 +2631,79 @@
 "  makeinfo --no-split foo.texi           nur eine Info-Datei (kann groß "
 "sein)\n"
 
-#: makeinfo/makeinfo.c:615
+#: 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:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: Datei-Angabe fehlt.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Mehrzeilen-Befehl %c%s inkorrekt verwendet"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Habe „%s“ erwartet"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kann Verzeichnis „%s“ nicht anlegen: %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Kein „%s“ in „%s“ gefunden"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "%s-Datei „%s“ von „%s“ wird erzeugt.\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2692,118 +2711,123 @@
 "%s: Entferne Makro-Ausgabe-Datei „%s“ wegen Fehler; --force benutzen, um "
 "Datei beizubehalten.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Unbekannter Befehl „%s“"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 "Geschweifte Klammern verwenden, um einen Befehl als Argument an 
address@hidden zu "
 "geben"
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s erwartete geschweifte Klammern"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Nicht übereinstimmende }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "Kein_NAME!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s fehlende schließende Klammer"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-Datei „%s“ (für HTML) nicht lesbar: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Kein Datei namens „%s“"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-Datei „%s“ (für Text) nicht lesbar: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image fehlt als Argument ein Dateiname"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "undefiniertes Flag: %s"
 
 # checkit
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Kein Wert für „%s“}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s erfordert einen Namen"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Dateiende vor erforderlichem address@hidden %s“ erreicht"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "„%.40s...“ ist zum Expandieren zu lang; nicht expandiert"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Fehlende „}“ bei @multitable-Template"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "nicht interpretierbarer Text „%s“ nach @multitable wird ignoriert"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Zu viele Spalten im address@hidden (maximal %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[unerwartet] Spalte %d kann in „multitable“ nicht ausgewählt 
werden"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "@tab außerhalb einer „multitable“ wird ignoriert"
 
 # checkit
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Mehrspalten-Ausgabe von der letzten Zeile:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* Spalte %d: Ausgabe = %s\n"
@@ -2828,7 +2852,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Kein Knotenname für den Befehl „%c%s“ angegeben"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Anker „%s“ und Knoten „%s“ zeigen auf gleichen Dateinamen."
@@ -2838,7 +2862,7 @@
 msgstr ""
 "Dieser @anchor-Befehl wird ignoriert, da Verweise auf ihn nicht funktionieren"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Entweder diesen Anker umbenennen oder Option „--no-split“ 
verwenden"
 
@@ -2861,93 +2885,93 @@
 msgid "Up:"
 msgstr "aufw&auml;rts:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 "@anchor-Befehl wird ignoriert, da Referenzen auf ihn nicht funktionieren"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menü"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Quer"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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:1451
+#: makeinfo/node.c:1464
 #, 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:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "voriges"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, 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:1510
+#: makeinfo/node.c:1523
 #, 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:1522
+#: makeinfo/node.c:1535
 #, 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:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "aufwärts"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "Knoten „%s“ wurde %d mal referenziert"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "Nicht referenzierter Knoten „%s“"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "Entferne %s\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kann Datei „%s“ nicht entfernen: %s"
@@ -2987,20 +3011,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-Datei „%s“ nicht lesbar: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -3044,31 +3060,31 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "Erstes Argument für @inforef darf nicht leer sein."
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: Warnung: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " für %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -3089,11 +3105,18 @@
 "                     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 ""
 "Aufruf: %s [OPTION]... [INFO-DATEI [VERZ-DATEI]]\n"
@@ -3133,7 +3156,7 @@
 "                     entnommen.\n"
 " --version         Programmversion anzeigen\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3168,98 +3191,100 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: leere Datei"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY ohne START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: Verzeichnisdatei schon vorhanden: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Info-Datei nur einmal angeben.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "überflüssiges Kommandozeilen-Argument „%s“ wird übergangen"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Keine Eingabe-Datei angegeben; „--help“ gibt weitere 
Informationen."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "Keine dir-Datei angegeben; „--help“ gibt weitere Informationen."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "Kein Info-Verzeichnis-Eintrag in „%s“"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "Menüeintrag „%s“ bereits vorhanden, und zwar für Datei „%s“"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "keine Einträge für „%s“ gefunden; nichts entfernt"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "diese Hilfe anzeigen"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "temporäre Dateien nach Programmende nicht entfernen"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "temporäre Dateien nach Programmende entfernen (Standard)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "Ausgabe nach DATEI schicken"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "Programmversion anzeigen"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Aufruf: %s [OPTION]... DATEI...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3268,27 +3293,56 @@
 "\n"
 "Optionen:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: keine Texinfo-Indexdatei"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "Fehler beim Wiederöffnen von „%s“"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: keine Texinfo-Indexdatei"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Keine Seitenzahl in %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "Eintrag „%s“ direkt nach einem Untereintrag"
 
+# Hier de-Standard-Formulierung einsetzen!
+#, 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"
+#~ "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"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-Argument nur sinnvoll, wenn das Makro nur ein Argument hat"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Inhaltsverzeichnis"
+
+#~ msgid "Short Contents"
+#~ msgstr "Inhalt in Kurzform"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "temporäre Dateien nach Programmende nicht entfernen"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "temporäre Dateien nach Programmende entfernen (Standard)"
+
 #~ msgid ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
@@ -3334,10 +3388,6 @@
 #~ 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."
 
Index: po/de_AT.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/de_AT.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- po/de_AT.po 8 Jun 2006 22:42:22 -0000       1.29
+++ po/de_AT.po 1 Jul 2007 18:43:36 -0000       1.30
@@ -9,7 +9,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 3.12d\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 1999-02-16 21:14+01:00\n"
 "Last-Translator: Karl Eichwalder <address@hidden>\n"
 "Language-Team: German <address@hidden>\n"
@@ -17,6 +17,71 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr ""
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr ""
+
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr ""
@@ -222,32 +287,32 @@
 "* Menu: Nodes whose indices contain `%s':\n"
 msgstr ""
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr ""
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
 #, c-format
 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"
+"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr ""
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:600
+#: info/info.c:602
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -284,11 +349,12 @@
 "  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 ""
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -296,72 +362,72 @@
 "Texinfo home page: http://www.gnu.org/software/texinfo/";
 msgstr ""
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr ""
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr ""
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr ""
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr ""
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr ""
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr ""
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr ""
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr ""
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr ""
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ""
 
-#: info/info.c:682
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr ""
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr ""
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr ""
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr ""
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 
@@ -751,91 +817,91 @@
 msgid "There is no function named `%s'"
 msgstr ""
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr ""
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr ""
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr ""
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr ""
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr ""
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr ""
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr ""
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr ""
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr ""
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr ""
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr ""
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr ""
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr ""
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr ""
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr ""
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr ""
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr ""
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr ""
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr ""
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -925,14 +991,14 @@
 msgid "Set screen height to (%d): "
 msgstr ""
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr ""
@@ -991,7 +1057,7 @@
 msgid "Move to the start of the line"
 msgstr ""
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr ""
 
@@ -1470,7 +1536,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr ""
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr ""
@@ -1560,186 +1626,139 @@
 msgid " Subfile: %s"
 msgstr ""
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr ""
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr ""
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr ""
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr ""
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
 msgstr ""
 
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
 msgstr ""
 
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr ""
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr ""
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr ""
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr ""
-
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr ""
-
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Jänner"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr ""
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr ""
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr ""
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr ""
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr ""
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr ""
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, c-format
 msgid "Bad argument to @%s: %s"
 msgstr ""
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1777,12 +1796,12 @@
 msgstr ""
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr ""
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr ""
 
@@ -1815,8 +1834,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr ""
@@ -1839,7 +1858,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr ""
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr ""
 
@@ -1848,64 +1867,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr ""
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr ""
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr ""
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr ""
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr ""
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr ""
 
@@ -2008,37 +2027,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr ""
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr ""
@@ -2053,62 +2077,66 @@
 msgid "here is the previous definition of `%s'"
 msgstr ""
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr ""
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:625
-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:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
 msgstr ""
 
-#: makeinfo/macro.c:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr ""
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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:351
+#: makeinfo/makeinfo.c:355
 #, c-format
 msgid ""
 "General options:\n"
@@ -2125,7 +2153,7 @@
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2135,7 +2163,7 @@
 "      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE     output macro-expanded source to FILE.\n"
@@ -2153,7 +2181,7 @@
 "  -o, --output=FILE           output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2174,7 +2202,7 @@
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2184,7 +2212,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2194,7 +2222,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2204,7 +2232,7 @@
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2224,7 +2252,7 @@
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2233,7 +2261,7 @@
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -2249,189 +2277,189 @@
 "  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:681
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:728
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:753
+#: makeinfo/makeinfo.c:757
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1697
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr ""
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr ""
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr ""
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr ""
@@ -2456,7 +2484,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
@@ -2465,7 +2493,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
@@ -2486,82 +2514,82 @@
 msgid "Up:"
 msgstr ""
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr ""
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr ""
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr ""
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr ""
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr ""
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr ""
@@ -2601,20 +2629,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr ""
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2655,30 +2675,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr ""
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: util/install-info.c:434
+#: util/install-info.c:453
 #, 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"
+"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"
@@ -2699,15 +2719,22 @@
 "                     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 ""
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2727,121 +2754,122 @@
 "%s\n"
 msgstr ""
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr ""
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr ""
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:948
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr ""
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr ""
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr ""
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr ""
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr ""
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr ""
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr ""
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr ""
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr ""
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr ""
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 
-#: util/texindex.c:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
+#: util/texindex.c:744
 #, c-format
-msgid "%s: not a texinfo index file"
+msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:980
+#: util/texindex.c:759 util/texindex.c:787
 #, c-format
-msgid "failure reopening %s"
+msgid "%s: not a texinfo index file"
 msgstr ""
 
-#: util/texindex.c:1230
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
Index: po/eo.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/eo.po,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- po/eo.po    11 Dec 2006 15:01:00 -0000      1.36
+++ po/eo.po    1 Jul 2007 18:43:36 -0000       1.37
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2004-12-21 16:20-0800\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2006-11-25 23:35+0600\n"
 "Last-Translator: Sergio Pokrovskij <address@hidden>\n"
 "Language-Team: Esperanto <address@hidden>\n"
@@ -14,6 +14,71 @@
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcio «%s» estas ambigua\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opcio „--%s‟ ne toleras argumenton\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcio «%s» bezonas argumenton\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nekonata opcio „--%s‟\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nekonata opcio „%c%s‟\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: misa opcio -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: nevalida opcio -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcio bezonas argumenton -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcio „-W %s‟ estas ambigua\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Unu signon antaÅ­en"
@@ -164,8 +229,10 @@
 msgstr "Indeksa artikolo: "
 
 #: info/indices.c:325
-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]‟"
+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]‟"
 
 #: info/indices.c:335
 msgid "No previous index search string."
@@ -220,41 +287,41 @@
 "\n"
 "* Menu: Nodoj kies indeksoj entenas «%s»:\n"
 
-#: info/info.c:275 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\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
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
 #, 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 ""
-"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"
 
-#: info/info.c:498
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "por «%s» ne troviĝis indeksa artikolo\n"
 
-#: info/info.c:590
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr "  -b, --speech-friendly        estu afabla al la parolsinteziloj.\n"
 
-#: info/info.c:597
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 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"
+"      --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"
@@ -282,6 +349,7 @@
 "  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"
@@ -294,7 +362,8 @@
 "    --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"
+"    --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"
@@ -319,8 +388,8 @@
 " 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"
 
-#: info/info.c:635 info/infokey.c:918 makeinfo/makeinfo.c:465
-#: util/install-info.c:466 util/texindex.c:292
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -334,72 +403,72 @@
 "Por la diskutoj pri Esperanto-traduko uzu la dissendoliston\n"
 "<address@hidden>."
 
-#: info/info.c:669
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "La nodo «%s» ne troveblas."
 
-#: info/info.c:670
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "La nodo „(%s)%s‟ ne troveblas."
 
-#: info/info.c:671
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Maleblas trovi fenestron!"
 
-#: info/info.c:672
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "La muskursoro ne estas en ĉi-fenestra nodo!"
 
-#: info/info.c:673
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Maleblas forigi la lastan fenestron"
 
-#: info/info.c:674
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "En ĉi tiu nodo malestas menuo."
 
-#: info/info.c:675
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Ne estas piednotoj en ĉi tiu nodo."
 
-#: info/info.c:676
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Neniu referenco en ĉi tiu nodo."
 
-#: info/info.c:677
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Mankas ligilo «%s» por ĉi tiu nodo."
 
-#: info/info.c:678
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Nekonata Info-komando „%c‟; tajpu „?‟ por helpo."
 
-#: info/info.c:679
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "La terminaloj de tipo «%s» ne estas sufiĉe inteligentaj por Info."
 
-#: info/info.c:680
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "Tiu paĝo jam estas la lasta en ĉi tiu nodo"
 
-#: info/info.c:681
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "Tio jam estas la unua paĝo de ĉi tiu nodo"
 
-#: info/info.c:682
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Nur unu fenestro."
 
-#: info/info.c:683
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "La fenestro rezultos tro malgranda."
 
-#: info/info.c:684
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Mankas spaco por helpa fenestro, bv forigi iun fenestron."
 
@@ -437,7 +506,8 @@
 
 #: info/infodoc.c:56
 msgid "\\%-10[prev-node]  Move to the \"previous\" node of this node.\n"
-msgstr "\\%-10[prev-node]  Iru al la ĵusantaŭa („Previous‟) nodo de ĉi 
tiu nodo.\n"
+msgstr ""
+"\\%-10[prev-node]  Iru al la ĵusantaŭa („Previous‟) nodo de ĉi tiu 
nodo.\n"
 
 #: info/infodoc.c:57
 msgid "\\%-10[up-node]  Move \"up\" from this node.\n"
@@ -452,31 +522,47 @@
 "      Elekto de menuero kaÅ­zas transiron en alian nodon.\n"
 
 #: info/infodoc.c:60
-msgid "\\%-10[xref-item]  Follow a cross reference.  Reads name of 
reference.\n"
-msgstr "\\%-10[xref-item]  Sekvu referencon  (legante la nomon de la 
referenco).\n"
+msgid ""
+"\\%-10[xref-item]  Follow a cross reference.  Reads name of reference.\n"
+msgstr ""
+"\\%-10[xref-item]  Sekvu referencon  (legante la nomon de la referenco).\n"
 
 #: info/infodoc.c:61
 msgid "\\%-10[history-node]  Move to the last node seen in this window.\n"
-msgstr "\\%-10[history-node]  Revenu al la Lasta nodo vizitita en ĉi tiu 
fenestro.\n"
+msgstr ""
+"\\%-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"
-msgstr "\\%-10[move-to-next-xref]  Saltu sur la sekvan hipertekstan ligilon en 
ĉi tiu nodo.\n"
+msgid ""
+"\\%-10[move-to-next-xref]  Skip to next hypertext link within this node.\n"
+msgstr ""
+"\\%-10[move-to-next-xref]  Saltu sur la sekvan hipertekstan ligilon en ĉ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 
ĉi tiu nodo.\n"
+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 ĉi "
+"tiu nodo.\n"
 
 #: info/infodoc.c:64
-msgid "\\%-10[select-reference-this-line]  Follow the hypertext link under 
cursor.\n"
-msgstr "\\%-10[select-reference-this-line]  Iru laÅ­ la subkursora hiperteksta 
ligo.\n"
+msgid ""
+"\\%-10[select-reference-this-line]  Follow the hypertext link under cursor.\n"
+msgstr ""
+"\\%-10[select-reference-this-line]  Iru laÅ­ la subkursora hiperteksta 
ligo.\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 ĉefkataloga nodo.  Ekvivalentas al \"g 
(DIR)\".\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"
 
 #: info/infodoc.c:66
-msgid "\\%-10[top-node]  Move to the Top node.  Equivalent to `\\[goto-node] 
Top'.\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"
 
 #: info/infodoc.c:68 info/infodoc.c:116
@@ -521,7 +607,9 @@
 
 #: info/infodoc.c:79
 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"
+msgstr ""
+"\\%-10[menu-digit]  Elektu resp. la unuan ... la naŭan eron el ĉi-noda "
+"menuo.\n"
 
 #: info/infodoc.c:80
 msgid "\\%-10[last-menu-item]  Pick last item in node's menu.\n"
@@ -529,11 +617,15 @@
 
 #: 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]  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"
+"\\%-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]  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 ""
@@ -554,7 +646,8 @@
 #: info/infodoc.c:87
 msgid ""
 "\\%-10[search-backward]  Search backward for a specified string\n"
-"              and select the node in which the previous occurrence is 
found.\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"
@@ -668,43 +761,52 @@
 msgid "  %-10s  Pick last item in node's menu.\n"
 msgstr "  %-10s  Elektu la lastan eron de ĉi-noda menuo.\n"
 
-#: info/infodoc.c:129
-#, c-format
-msgid "  %-10s  Search for a specified string in the index entries of this 
Info\n"
-msgstr "  %-10s  Serĉu indikotan signoĉenon en la indeksaj artikoloj de ĉi 
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
+#, 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]  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:133
 #, c-format
 msgid "  %-10s  Move to node specified by name.\n"
 msgstr "  %-10s  Vizitu nodon indikotan per la nomo.\n"
 
-#: info/infodoc.c:132
-msgid "              You may include a filename as well, as in 
(FILENAME)NODENAME.\n"
+#: info/infodoc.c:134
+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"
 
-#: info/infodoc.c:133
-#, c-format
-msgid "  %-10s  Search forward for a specified string,\n"
-msgstr "  %-10s  Serĉu sube indikotan signoĉenon,\n"
-
-#: info/infodoc.c:134 info/infodoc.c:136
-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"
-
 #: info/infodoc.c:135
+#, 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]  Serĉu sube aperon de donita signoĉeno kaj\n"
+"      vizitu la nodon en kiu troviĝos la sekva apero.\n"
+
+#: info/infodoc.c:137
 #, c-format
 msgid "  %-10s  Search backward for a specified string\n"
 msgstr "  %-10s  Serĉu indikotan signoĉenon supre en la dosiero,\n"
 
-#: info/infodoc.c:316
+#: info/infodoc.c:138
+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"
+
+#: info/infodoc.c:318
 msgid "The current search path is:\n"
 msgstr "La kuranta serĉvojo estas:\n"
 
-#: info/infodoc.c:320
+#: info/infodoc.c:322
 msgid ""
 "Commands available in Info windows:\n"
 "\n"
@@ -712,7 +814,7 @@
 "Komandoj disponeblaj en Info-fenestroj:\n"
 "\n"
 
-#: info/infodoc.c:324
+#: info/infodoc.c:326
 msgid ""
 "Commands available in the echo area:\n"
 "\n"
@@ -720,7 +822,7 @@
 "Komandoj disponeblaj en la eĥozono:\n"
 "\n"
 
-#: info/infodoc.c:347
+#: info/infodoc.c:349
 #, c-format
 msgid ""
 "The following commands can only be invoked via %s:\n"
@@ -729,7 +831,7 @@
 "La sekvaj komandoj vokeblas nur per  %s:\n"
 "\n"
 
-#: info/infodoc.c:351
+#: info/infodoc.c:353
 msgid ""
 "The following commands cannot be invoked at all:\n"
 "\n"
@@ -737,168 +839,155 @@
 "La sekvaj komandoj neniel vokeblas:\n"
 "\n"
 
-#: info/infodoc.c:375
+#: info/infodoc.c:377
 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n"
 msgstr "--- Uzu „\\[history-node]‟ aŭ „\\[kill-node]‟ por eliri ---\n"
 
-#: info/infodoc.c:485
+#: info/infodoc.c:487
 msgid "Display help message"
 msgstr "Eligu helpomesaĝon"
 
-#: info/infodoc.c:503
+#: info/infodoc.c:505
 msgid "Visit Info node `(info)Help'"
 msgstr "Vizitu la Info-nodon „(info)Help‟"
 
-#: info/infodoc.c:641
+#: info/infodoc.c:643
 msgid "Print documentation for KEY"
 msgstr "Eligu la informon pri KLAVO"
 
-#: info/infodoc.c:653
+#: info/infodoc.c:655
 #, c-format
 msgid "Describe key: %s"
 msgstr "Priskribu klavon: %s"
 
-#: info/infodoc.c:664
+#: info/infodoc.c:666
 #, c-format
 msgid "ESC %s is undefined."
 msgstr "ESC %s estas nedifinita."
 
-#: info/infodoc.c:680 info/infodoc.c:709
+#: info/infodoc.c:682 info/infodoc.c:711
 #, c-format
 msgid "%s is undefined."
 msgstr "%s estas nedifinita."
 
-#: info/infodoc.c:730
+#: info/infodoc.c:732
 #, c-format
 msgid "%s is defined to %s."
 msgstr "%s estas ligita al %s."
 
-#: info/infodoc.c:1153
+#: info/infodoc.c:1155
 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:1159
 msgid "Where is command: "
 msgstr "Kie estas la komando: "
 
-#: info/infodoc.c:1179
+#: info/infodoc.c:1181
 #, c-format
 msgid "`%s' is not on any keys"
 msgstr "neniu klavo trovita por la komando «%s»"
 
-#: info/infodoc.c:1186
+#: info/infodoc.c:1188
 #, c-format
 msgid "%s can only be invoked via %s."
 msgstr "%s vokeblas nur per %s."
 
-#: info/infodoc.c:1190
+#: info/infodoc.c:1192
 #, c-format
 msgid "%s can be invoked via %s."
 msgstr "%s vokeblas per %s."
 
-#: info/infodoc.c:1195
+#: info/infodoc.c:1197
 #, c-format
 msgid "There is no function named `%s'"
 msgstr "Malestas funkcio nomata «%s»"
 
-#: info/infokey.c:145
-#, c-format
-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"
-
-#: info/infokey.c:170
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "Malĝusta nombro da argumentoj"
 
-#: info/infokey.c:201
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ne malfermiĝis eniga dosiero «%s»"
 
-#: info/infokey.c:215
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "maleblas krei eligan dosieron «%s»"
 
-#: info/infokey.c:226
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "eraro dum skribo en «%s»"
 
-#: info/infokey.c:232
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "eraro dum fermo de eliga dosiero «%s»"
 
-#: info/infokey.c:450
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "tro longa klavosekvenco"
 
-#: info/infokey.c:529
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "mankanta klavosekvenco"
 
-#: info/infokey.c:610
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL-signo (\\000) malpermesitas"
 
-#: info/infokey.c:641
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL-signo (^%c) malpermesitas"
 
-#: info/infokey.c:665
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "mankas agonomo"
 
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "tro longa sekcio"
 
-#: info/infokey.c:688
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "nekonata ago «%s»."
 
-#: info/infokey.c:698
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "tro longa agonomo"
 
-#: info/infokey.c:712
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "kromaj signoj post la ago «%s»"
 
-#: info/infokey.c:723
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "mankas nomo de variablo"
 
-#: info/infokey.c:733
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "mankas „=‟ tuj post variablonomo"
 
-#: info/infokey.c:741
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "tro longa variablonomo"
 
-#: info/infokey.c:765
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "tro longa valoro"
 
-#: info/infokey.c:890
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "«%s», linio %u: "
 
-#: info/infokey.c:906
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -935,8 +1024,10 @@
 
 #: info/infomap.c:1535
 #, c-format
-msgid "Invalid infokey file `%s' (bad magic numbers) -- run infokey to update 
it"
-msgstr "Misa infoklava dosiero «%s» (magiaj nombroj); aktualigu ĝin per 
infokey"
+msgid ""
+"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it"
+msgstr ""
+"Misa infoklava dosiero «%s» (magiaj nombroj); aktualigu ĝin per infokey"
 
 #: info/infomap.c:1544
 #, c-format
@@ -945,13 +1036,17 @@
 
 #: info/infomap.c:1560
 #, c-format
-msgid "Invalid infokey file `%s' (bad section length) -- run infokey to update 
it"
-msgstr "Misa infoklava dosiero «%s» (misa sekcilongo) -- aktualigu ĝin per 
infokey"
+msgid ""
+"Invalid infokey file `%s' (bad section length) -- run infokey to update it"
+msgstr ""
+"Misa infoklava dosiero «%s» (misa sekcilongo) -- aktualigu ĝin per infokey"
 
 #: info/infomap.c:1581
 #, c-format
-msgid "Invalid infokey file `%s' (bad section code) -- run infokey to update 
it"
-msgstr "Misa infoklava dosiero «%s» (misa sekcikodo); aktualigu ĝin per 
infokey"
+msgid ""
+"Invalid infokey file `%s' (bad section code) -- run infokey to update it"
+msgstr ""
+"Misa infoklava dosiero «%s» (misa sekcikodo); aktualigu ĝin per infokey"
 
 #: info/infomap.c:1716
 msgid "Bad data in infokey file -- some key bindings ignored"
@@ -959,7 +1054,8 @@
 
 #: info/infomap.c:1766
 msgid "Bad data in infokey file -- some var settings ignored"
-msgstr "Misaj datumoj en infoklava dosiero -- iuj valorizoj de variabloj ne 
validos"
+msgstr ""
+"Misaj datumoj en infoklava dosiero -- iuj valorizoj de variabloj ne validos"
 
 #: info/m-x.c:69
 msgid "Read the name of an Info command and describe it"
@@ -991,7 +1087,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Alto de la ekrano estu (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1000,7 +1096,7 @@
 "   La fontodosieroj tralaboritaj por fari ĉi tiun dosieron:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Maleblas prilabori la dosieron %s.\n"
@@ -1044,8 +1140,12 @@
 
 #: info/session.c:162
 #, c-format
-msgid "Welcome to Info version %s. Type \\[get-help-window] for help, 
\\[menu-item] for menu item."
-msgstr "Bonvenon al Info, versio %s.  Tajpu \\[get-help-window] por helpo, 
\\[menu-item] por menuero."
+msgid ""
+"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
+"for menu item."
+msgstr ""
+"Bonvenon al Info, versio %s.  Tajpu \\[get-help-window] por helpo, \\[menu-"
+"item] por menuero."
 
 #: info/session.c:620
 msgid "Move down to the next line"
@@ -1063,7 +1163,7 @@
 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:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Sekva"
 
@@ -1129,7 +1229,8 @@
 msgstr "Rulumu antaŭen en ĉi tiu fenestro sed restu en la nodo"
 
 #: info/session.c:1229
-msgid "Scroll forward in this window staying within node and set default 
window size"
+msgid ""
+"Scroll forward in this window staying within node and set default window size"
 msgstr ""
 "Rulumu antaŭen en ĉi tiu fenestro restante en la nodo kaj\n"
 "fiksu defaÅ­ltan fenestrograndon"
@@ -1140,14 +1241,17 @@
 
 #: info/session.c:1245
 msgid "Scroll backward in this window and set default window size"
-msgstr "Rulumu malantaŭen en ĉi tiu fenestro kaj fiksu defaŭltan 
fenestrograndon"
+msgstr ""
+"Rulumu malantaŭen en ĉi tiu fenestro kaj fiksu defaŭltan fenestrograndon"
 
 #: info/session.c:1254
 msgid "Scroll backward in this window staying within node"
 msgstr "Rulumu malantaŭen en ĉi tiu fenestro sed restu en la nodo"
 
 #: info/session.c:1262
-msgid "Scroll backward in this window staying within node and set default 
window size"
+msgid ""
+"Scroll backward in this window staying within node and set default window "
+"size"
 msgstr ""
 "Rulumu malantaŭen en ĉi tiu fenestro restante en la nodo kaj\n"
 "     fiksu defaÅ­ltan fenestrograndon"
@@ -1289,7 +1393,8 @@
 
 #: info/session.c:2353
 msgid "Visit as many menu items at once as possible"
-msgstr "Vizitu samtempe kiom eble plej multe da menueroj (ĉiun en aparta 
fenestro)"
+msgstr ""
+"Vizitu samtempe kiom eble plej multe da menueroj (ĉiun en aparta fenestro)"
 
 #: info/session.c:2381
 msgid "Read a node name and select it"
@@ -1543,7 +1648,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Uzata interne de \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Virtuala memoro elĉerpita!\n"
@@ -1578,7 +1683,8 @@
 
 #: info/variables.c:64
 msgid "The number lines to scroll when the cursor moves out of the window"
-msgstr "La nombro de linioj rulumataj kiam la kursoro moviĝas ekster la 
fenestron"
+msgstr ""
+"La nombro de linioj rulumataj kiam la kursoro moviĝas ekster la fenestron"
 
 #: info/variables.c:68
 msgid "When \"On\", Info accepts and displays ISO Latin characters"
@@ -1633,174 +1739,146 @@
 msgid " Subfile: %s"
 msgstr " Subdosiero: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opcio «%s» estas ambigua\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcio „--%s‟ ne toleras argumenton\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcio „%c%s‟ ne toleras argumenton\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opcio «%s» bezonas argumenton\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nekonata opcio „--%s‟\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nekonata opcio „%c%s‟\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: misa opcio -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: nevalida opcio -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcio bezonas argumenton -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opcio „-W %s‟ estas ambigua\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcio „-W %s‟ ne toleras argumenton\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:520 makeinfo/cmds.c:542
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "Argumentoj por @%s estas ignoritaj"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "januaro"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "februaro"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "marto"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "aprilo"
 
-#: makeinfo/cmds.c:585
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "majo"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "junio"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "julio"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "aÅ­gusto"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "septembro"
 
-#: makeinfo/cmds.c:586
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "oktobro"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "novembro"
 
-#: makeinfo/cmds.c:587
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "decembro"
 
-#: makeinfo/cmds.c:936
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "dubinda signo „%c‟ en @var"
 
-#: makeinfo/cmds.c:979
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argumento de @sc tuta majuskla, do neniel ŝanĝita"
 
-#: makeinfo/cmds.c:1034
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "„{‟ atendata, sed „%c‟ ricevita"
 
-#: makeinfo/cmds.c:1074
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "dosierfino ene de pretaranĝita bloko (verb block)"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "„}‟ atendata, sed „%c‟ ricevita"
 
-#: makeinfo/cmds.c:1112
-msgid "@strong{Note...} produces a spurious cross-reference in Info; reword to 
avoid that"
-msgstr "address@hidden estigas falsan referencon en Info; alivortigu por eviti 
tion"
+#: makeinfo/cmds.c:1123
+msgid ""
+"@strong{Note...} produces a spurious cross-reference in Info; reword to "
+"avoid that"
+msgstr ""
+"address@hidden estigas falsan referencon en Info; alivortigu por eviti "
+"tion"
 
-#: makeinfo/cmds.c:1305
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s arkaikiĝis"
 
-#: makeinfo/cmds.c:1414
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp bezonas ne «%s» sed pozitivan argumenton nombran"
 
-#: makeinfo/cmds.c:1763 makeinfo/cmds.c:1819 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, 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:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1775 makeinfo/cmds.c:1805 makeinfo/makeinfo.c:4144
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1789
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Misa argumento por @%s"
 
 # set_firstparagraphindent
-#: makeinfo/cmds.c:1803
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "enŝovu"
 
+#: makeinfo/cmds.c:1846
+#, fuzzy, c-format
+msgid "Bad argument to @%s: %s"
+msgstr "Misa argumento por @%s"
+
+#: makeinfo/cmds.c:1929
+#, c-format
+msgid "Expected @%s on or off, not `%s'"
+msgstr ""
+
+#: makeinfo/cmds.c:1949
+#, c-format
+msgid "Only @%s 10 or 11 is supported, not `%s'"
+msgstr ""
+
 #: makeinfo/defun.c:84
 msgid "Missing `}' in @def arg"
 msgstr "Mankas „}‟ en la argumento de @def"
@@ -1834,16 +1912,16 @@
 msgstr "Metodo"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2229
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "de"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2234
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "sur"
 
-#: makeinfo/defun.c:711
+#: makeinfo/defun.c:712
 #, c-format
 msgid "Must be in address@hidden' environment to use address@hidden'"
 msgstr "Nur en address@hidden uzeblas address@hidden"
@@ -1867,6 +1945,17 @@
 msgid "Output buffer not empty."
 msgstr "Eliga bufro ne malplenas"
 
+#: makeinfo/float.c:182
+#, c-format
+msgid "Requested float type `%s' not previously used"
+msgstr ""
+
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/xref.c:206
+msgid "See "
+msgstr "Vidu "
+
 #: makeinfo/footnote.c:150
 #, c-format
 msgid "`%c%s' needs an argument `{...}', not just `%s'"
@@ -1885,7 +1974,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Maleblas fari piednoton al piednoto"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Piednotoj"
 
@@ -1894,12 +1983,12 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: Ne prosperis malfermi CSS-dosieron: %s"
 
-#: makeinfo/html.c:172
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: CSS-dosiero finiĝis en komento"
 
-#: makeinfo/html.c:207
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Sen titolo"
 
@@ -1907,187 +1996,189 @@
 msgid "[unexpected] no html tag to pop"
 msgstr "[neatendite] mankas HTML-etikedo por elstakigo"
 
-#: makeinfo/html.c:752
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[neatendite] misa nodnomo: «%s»"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Nekonata indekso «%s»"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info ne povas trakti „:‟ en indeksa artikolo «%s»"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Jam estas indekso «%s»"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Nekonata indekso «%s» kajaŭ «%s» en @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr "(linio )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(linio %*d)"
 
-#: makeinfo/index.c:750
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Nekonata indekso «%s» en @printindex"
 
-#: makeinfo/index.c:819
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Artikolo por indekso «%s» estas ekster iu ajn nodo"
 
-#: makeinfo/index.c:822 makeinfo/index.c:858
+#: makeinfo/index.c:823 makeinfo/index.c:859
 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:162
 msgid "@item not allowed in argument to @itemize"
 msgstr "address@hidden ne rajtas havi argumenton address@hidden"
 
-#: makeinfo/insertion.c:238
+#: makeinfo/insertion.c:243
 msgid "Broken-Type in insertion_type_pname"
 msgstr "Misa tipo en la funkcio insertion_type_pname"
 
-#: makeinfo/insertion.c:334
+#: makeinfo/insertion.c:339
 msgid "Enumeration stack overflow"
 msgstr "Troo en la stako de enumeracioj"
 
-#: makeinfo/insertion.c:366
+#: makeinfo/insertion.c:371
 #, c-format
 msgid "lettering overflow, restarting at %c"
 msgstr "mankas sekva enumeracia litero, rekomencite ekde %c"
 
-#: makeinfo/insertion.c:631
+#: makeinfo/insertion.c:636
 #, c-format
 msgid "%s requires an argument: the formatter for %citem"
 msgstr "%s bezonas argumenton: la aranĝilon por %citem"
 
-#: makeinfo/insertion.c:719
+#: makeinfo/insertion.c:724
 #, c-format
 msgid "%cfloat environments cannot be nested"
 msgstr "La blokoj %cfloat ne rajtas ingiĝi unu en alia"
 
-#: makeinfo/insertion.c:973
+#: makeinfo/insertion.c:978
 #, c-format
 msgid "address@hidden' expected `%s', but saw `%s'"
 msgstr "address@hidden atendis „%s‟, sed renkontis „%s‟"
 
-#: makeinfo/insertion.c:1337
+#: makeinfo/insertion.c:1346
 #, c-format
 msgid "No matching `%cend %s'"
 msgstr "Mankas para „%cend %s‟"
 
-#: makeinfo/insertion.c:1592
+#: makeinfo/insertion.c:1609
 #, c-format
 msgid "%s requires letter or digit"
 msgstr "%s bezonas literon aÅ­ ciferon"
 
-#: makeinfo/insertion.c:1687
+#: makeinfo/insertion.c:1702
 msgid "end of file inside verbatim block"
 msgstr "dosierfino ene de pretaranĝita bloko"
 
-#: makeinfo/insertion.c:1913
+#: makeinfo/insertion.c:1926
 #, c-format
 msgid "@%s not meaningful outside address@hidden' environment"
 msgstr "@%s estas sensenca ekster bloko address@hidden"
 
-#: makeinfo/insertion.c:1949
+#: makeinfo/insertion.c:1962
 msgid "@menu seen before first @node, creating `Top' node"
 msgstr "@menu jam antaŭ la unua @nodo; nodo „Top‟ kreitas"
 
-#: makeinfo/insertion.c:1950
-msgid "perhaps your @top node should be wrapped in @ifnottex rather than 
@ifinfo?"
+#: makeinfo/insertion.c:1963
+msgid ""
+"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
 msgstr "eble via @top-nodo staru sub @ifnottex anstataÅ­ sub @ifinfo?"
 
-#: makeinfo/insertion.c:1962
+#: makeinfo/insertion.c:1975
 msgid "@detailmenu seen before first node, creating `Top' node"
 msgstr "@detailmenu renkontita jam antaŭ la unua nodo; nodo „Top‟ kreitas"
 
-#: makeinfo/insertion.c:2018
+#: makeinfo/insertion.c:2031
 #, c-format
 msgid "@%s not meaningful outside address@hidden' and address@hidden' 
environments"
 msgstr "@%s sencas nur en bloko address@hidden aÅ­ address@hidden"
 
-#: makeinfo/insertion.c:2032
+#: makeinfo/insertion.c:2045
 #, c-format
 msgid "@%s not meaningful outside address@hidden' environment"
 msgstr "@%s ne sencas ekster bloko address@hidden"
 
-#: makeinfo/insertion.c:2063
+#: makeinfo/insertion.c:2076
 #, c-format
 msgid "Unmatched `%c%s'"
 msgstr "Mankas para „%c%s‟"
 
-#: makeinfo/insertion.c:2068
+#: makeinfo/insertion.c:2081
 #, c-format
 msgid "`%c%s' needs something after it"
 msgstr "„%c%s‟ bezonas post si ion"
 
-#: makeinfo/insertion.c:2074
+#: makeinfo/insertion.c:2087
 #, c-format
 msgid "Bad argument `%s' to address@hidden', using `%s'"
 msgstr "Misa argumento «%s» por «%s»; estos uzata «%s»"
 
-#: makeinfo/insertion.c:2171
+#: makeinfo/insertion.c:2184
 #, c-format
 msgid "@%s not meaningful inside address@hidden' block"
 msgstr "@%s estas sensenca ene de bloko address@hidden"
 
-#: makeinfo/insertion.c:2180
+#: makeinfo/insertion.c:2193
 #, c-format
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx estas sensenca ene de bloko «%s»"
 
-#: makeinfo/insertion.c:2356
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s renkontita ekster „insertion block‟"
 
-#: makeinfo/lang.c:580
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ne estas valida lingvokodo laÅ­ ISO 639"
 
-#: makeinfo/lang.c:655
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "Nekonata nomo de kodosistemo: «%s»"
 
-#: makeinfo/lang.c:663
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "Pardonon, la kodo «%s» ne estas disponebla"
 
-#: makeinfo/lang.c:715
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "misa kodoprezento: «%s»"
 
-#: makeinfo/lang.c:1009
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s atendas argumenton „i‟ aŭ „j‟, ne „%c‟"
 
-#: makeinfo/lang.c:1013
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s akceptas nur solsignan argumenton „i‟ aŭ „j‟"
@@ -2102,7 +2193,7 @@
 msgid "here is the previous definition of `%s'"
 msgstr "ĉi tie estas la antaŭa difino de «%s»"
 
-#: makeinfo/macro.c:355
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "Dum makrogenerado: \\ sekvata de «%s» (anstataŭ de nomo de 
parametro)"
@@ -2112,46 +2203,50 @@
 msgid "Macro `%s' called on line %d with too many args"
 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 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:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Tro multe da eraroj!  Halt'.\n"
 
-#: makeinfo/makeinfo.c:302
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: averto: "
 
-#: makeinfo/makeinfo.c:321 makeinfo/makeinfo.c:2260
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Misloka %c"
 
-#: makeinfo/makeinfo.c:340
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Por pluaj detaloj tajpu „%s --help‟.\n"
 
-#: makeinfo/makeinfo.c:343
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Uzmaniero: %s [OPCIO]... TEXINFO-DOSIERO...\n"
 
-#: makeinfo/makeinfo.c:346
+#: makeinfo/makeinfo.c:351
 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"
@@ -2159,16 +2254,19 @@
 "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:355
+#, 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"
+"      --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 ""
@@ -2182,14 +2280,14 @@
 "  -v, --verbose\t\t    Rakontu kio estas farata\n"
 "      --version\t\t    Eligu la versio-informon kaj eliru\n"
 
-#: makeinfo/makeinfo.c:364
-#, no-wrap
+#: makeinfo/makeinfo.c:371
+#, 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 ""
 "Por elekti celformon (defaÅ­lte, Info):\n"
 "      --docbook\t\t    Generu en DocBook anstataÅ­ en Info\n"
@@ -2197,24 +2295,29 @@
 "      --xml\t\t    Generu en XML (TexinfoML) anstataÅ­ en Info\n"
 "      --plaintext\t    Generu platan tekston anstataÅ­ Infoon\n"
 
-#: makeinfo/makeinfo.c:372
+#: makeinfo/makeinfo.c:379
+#, 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 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 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 ""
 "Ĝ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"
+"      --no-headers          Generu platan tekston, sen dispartigi en "
+"nodojn,\n"
 "                              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"
@@ -2222,18 +2325,22 @@
 "      --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:386
-#, c-format
+#: makeinfo/makeinfo.c:393
+#, 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"
-"      --fill-column=NUM       break Info lines at NUM characters (default 
%d).\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"
-"      --paragraph-indent=VAL  indent Info paragraphs by VAL spaces (default 
%d).\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"
@@ -2246,27 +2353,35 @@
 "\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"
+"      --paragraph-indent=VAL  Alinea enŝovo estu VAL spacetoj (defaŭlte %"
+"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:410
+#, 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 ""
 "Opcioj por HTML:\n"
-"      --css-include=DOSIERO   Inkludu DOSIEROn en <style>-etikedon de 
HTMLaĵo;\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:409
-#, c-format
+#: makeinfo/makeinfo.c:419
+#, 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"
+"      --output-indent=VAL     indent XML elements by VAL spaces (default %"
+"d).\n"
+"                                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"
@@ -2274,7 +2389,7 @@
 "\t\t\t\tsensignifajn spacetojn\n"
 "\n"
 
-#: makeinfo/makeinfo.c:416
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2290,7 +2405,7 @@
 "  -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
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2328,7 +2443,7 @@
 "\n"
 "  Krome, ĉe la opcioj --no-ifFORMO, ja traktu la pecojn sub @ifnotFORMO.\n"
 
-#: makeinfo/makeinfo.c:444
+#: makeinfo/makeinfo.c:454
 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"
@@ -2342,18 +2457,21 @@
 "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:462
+#, 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"
+"  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 ""
 "Ekzemploj:\n"
 " makeinfo UM.texi\t\t      konservu Info laÅ­ @setfilename\n"
@@ -2364,194 +2482,197 @@
 "\n"
 " 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 --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 "%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:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: La argumento %s devas esti nombro, ne «%s».\n"
 
-#: makeinfo/makeinfo.c:660
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: Ne prosperis malfermi makrotraktadan eligdosieron «%s»"
 
-#: makeinfo/makeinfo.c:665
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 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: Post „--paragraph-indent‟ estu nombro, „none‟ aŭ 
„asis‟, ne „%s‟.\n"
+msgstr ""
+"%s: Post „--paragraph-indent‟ estu nombro, „none‟ aŭ „asis‟, ne 
„%s‟.\n"
 
-#: makeinfo/makeinfo.c:732
+#: makeinfo/makeinfo.c:757
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr "%s: Post --footnote-style estu „separate‟ aŭ „end‟, ne 
„%s‟.\n"
 
-#: makeinfo/makeinfo.c:806
+#: makeinfo/makeinfo.c:832
 #, 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:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Misa uzo de plurlinia komando «%c%s»."
 
-#: makeinfo/makeinfo.c:1000
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "«%s» atendatas"
 
-#: makeinfo/makeinfo.c:1479
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Provo krei dosierujon «%s» malsukcesis: %s"
 
-#: makeinfo/makeinfo.c:1525
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Neniu «%s» trovita en «%s»"
 
-#: makeinfo/makeinfo.c:1605
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr "%s: Makrotraktitaĵo ne trafos en la ĉefeligujon ĉar Info iras 
tien.\n"
 
-#: makeinfo/makeinfo.c:1638
+#: makeinfo/makeinfo.c:1664
 #, 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 "Ĉi tiun dosieron %s generis Makeinfo-%s el %s.\n"
-
-#: makeinfo/makeinfo.c:1709
+#: makeinfo/makeinfo.c:1728
 #, c-format
-msgid "%s: Removing macro output file `%s' due to errors; use --force to 
preserve.\n"
+msgid ""
+"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%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:1783
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: La eligdosiero «%s» forigitas ĉar estis eraroj;\n"
 "uzu la opcion --force por ĝin reteni.\n"
 
-#: makeinfo/makeinfo.c:2034
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Nekonata komando «%s»."
 
-#: makeinfo/makeinfo.c:2056
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Uzu vinkulojn por pasigi al address@hidden komandan argumenton"
 
-#: makeinfo/makeinfo.c:2314
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s postulas vinkulojn"
 
-#: makeinfo/makeinfo.c:2327
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Nepara „}‟"
 
-#: makeinfo/makeinfo.c:2375
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "SEN_NOMO!"
 
-#: makeinfo/makeinfo.c:2396
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s sen „}‟"
 
-#: makeinfo/makeinfo.c:3309
+#: makeinfo/makeinfo.c:2618
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "Ĉi tiun dosieron %s generis Makeinfo-%s el %s.\n"
+
+#: makeinfo/makeinfo.c:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "por HTML, la dosiero «%s» en la komando @image estas nelegebla: %s"
 
-#: makeinfo/makeinfo.c:3315
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Ne estas tia dosiero: «%s»"
 
-#: makeinfo/makeinfo.c:3447
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "bilddosiero «%s» (por teksto) estas nelegebla: %s"
 
-#: makeinfo/makeinfo.c:3456
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "mankas dosiera argumento en la komando @image"
 
-#: makeinfo/makeinfo.c:3675
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "Nedifinita flago: %s"
 
-#: makeinfo/makeinfo.c:3676
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Mankas Valoro Por «%s»}"
 
-#: makeinfo/makeinfo.c:3728
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s bezonas nomon"
 
-#: makeinfo/makeinfo.c:3834
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Pli frue ol la para @end %s renkontiĝis dosierfino"
 
-#: makeinfo/makeinfo.c:4082
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "„%.40s...‟ tro longas por malvolvo; malvolvo ne okazos"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Mankas „}‟ en la ŝablono de @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "la misa teksto «%s» post @multitable estas ignorita"
 
-#: makeinfo/multi.c:393
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Tro da kolumnoj en elemento de „multitable‟ (%d maksimume)"
 
-#: makeinfo/multi.c:555
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[neatendite] maleblas elekti %d-an kolumnon en „multitable‟."
 
-#: makeinfo/multi.c:584
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "komando @tab ekster „multitable‟; ignorita"
 
-#: makeinfo/multi.c:632
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multekolumna eligo el la lasta linio:\n"
 
-#: makeinfo/multi.c:635
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolumno %d-a: eligaĵo = %s\n"
@@ -2571,117 +2692,118 @@
 msgid "Node `%s' requires a sectioning command (e.g., %c%s)"
 msgstr "Nodo «%s» bezonas subdividan komandon (ekz-e %c%s)"
 
-#: makeinfo/node.c:879
+#: makeinfo/node.c:880
 #, c-format
 msgid "No node name specified for `%c%s' command"
 msgstr "Mankas nodnomo por la komando „%c%s‟"
 
-#: makeinfo/node.c:920 makeinfo/node.c:1151
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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»"
 
-#: makeinfo/node.c:923
+#: makeinfo/node.c:924
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "Ĉi tiu @anchor-komando estas ignorita; la referencoj al ĝi ne 
funkcios"
 
-#: makeinfo/node.c:925 makeinfo/node.c:1154
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Alinomu la ankron aŭ uzu la opcion „--no-split‟"
 
-#: makeinfo/node.c:955
+#: makeinfo/node.c:956
 #, c-format
 msgid "Unexpected string at end of split-HTML file `%s'"
 msgstr "Nekonvena signoĉeno fine de disfendita HTML-dosiero «%s»"
 
-#: makeinfo/node.c:991
+#: makeinfo/node.c:992
 msgid "Next:"
 msgstr "Sekva:"
 
-#: makeinfo/node.c:1007
+#: makeinfo/node.c:1008
 msgid "Previous:"
 msgstr "AntaÅ­a:"
 
-#: makeinfo/node.c:1021
+#: makeinfo/node.c:1022
 msgid "Up:"
 msgstr "Supre:"
 
-#: makeinfo/node.c:1148
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Dosiernoma kolizio por la ankroj «%s» kaj «%s»"
 
-#: makeinfo/node.c:1153
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "Ignorita @anchor-komando; la referencoj al ĝi ne funkcios"
 
-#: makeinfo/node.c:1347
+#: makeinfo/node.c:1361
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s referencas neekzistantan nodon «%s» (ĉu eraro en sekciaranĝo?)"
 
-#: makeinfo/node.c:1363
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menuo"
 
-#: makeinfo/node.c:1365
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Referenco"
 
-#: makeinfo/node.c:1447
+#: makeinfo/node.c:1461
 #, 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 (ĉu misa 
sekciaranĝo?)"
+msgstr ""
+"La kampo „Next‟ de la nodo «%s» ne estas reciprokita (ĉu misa 
sekciaranĝo?)"
 
-#: makeinfo/node.c:1450
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Ĉi tiu nodo («%s») havas eraran kampon „Prev‟"
 
-#: makeinfo/node.c:1462
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "AntaÅ­a"
 
-#: makeinfo/node.c:1505
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "La kampo „Prev‟ de la nodo «%s» ne estas reciprokita"
 
-#: makeinfo/node.c:1509
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Ĉi tiu nodo («%s») havas eraran kampon „Next‟"
 
-#: makeinfo/node.c:1521
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "«%s» malhavas kampon „Up‟ (ĉu eraro en sekciaranĝo?)"
 
-#: makeinfo/node.c:1524
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Supre"
 
-#: makeinfo/node.c:1590
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "En \"%s„ mankas menuero por ‟%s„, malgraŭ ties ligilo 
‟Up„‟"
 
-#: makeinfo/node.c:1619
+#: makeinfo/node.c:1633
 #, 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:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "la nodo «%s» ne estas referencita"
 
-#: makeinfo/node.c:1723
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "%s estas forigata\n"
 
-#: makeinfo/node.c:1727
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Ne prosperis forigi dosierujon «%s»: %s"
@@ -2696,80 +2818,115 @@
 msgid "Internal error (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»!"
 
-#: makeinfo/sectioning.c:623
+#: makeinfo/sectioning.c:624
 #, c-format
 msgid "%c%s is obsolete; use %c%s instead"
 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 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:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "dosiero «%s» en la komando @image estas nelegebla: %s"
 
-#: makeinfo/xml.c:2097
-msgid "@headitem as the last item of @multitable produces invalid Docbook 
documents"
-msgstr "@headitem lastelemente en @multitable rezultigas nevalidajn 
Docbook-dokumentojn"
+#: makeinfo/xml.c:2000
+msgid ""
+"@headitem as the last item of @multitable produces invalid Docbook documents"
+msgstr ""
+"@headitem lastelemente en @multitable rezultigas nevalidajn Docbook-"
+"dokumentojn"
+
+#: makeinfo/xref.c:128
+msgid "First argument to cross-reference may not be empty"
+msgstr ""
+
+#: makeinfo/xref.c:134 makeinfo/xref.c:171 makeinfo/xref.c:206
+#: makeinfo/xref.c:460
+#, fuzzy
+msgid "see "
+msgstr "Vidu "
+
+#: makeinfo/xref.c:158
+#, c-format
+msgid "See section ``%s'' in "
+msgstr ""
 
-#: util/install-info.c:154
+#: makeinfo/xref.c:253
+#, c-format
+msgid "Empty file name for HTML cross reference in `%s'"
+msgstr ""
+
+#: makeinfo/xref.c:388
+msgid "End of file reached while looking for `.' or `,'"
+msgstr ""
+
+#: makeinfo/xref.c:391
+#, c-format
+msgid "`.' or `,' must follow @%s, not `%c'"
+msgstr ""
+
+#: makeinfo/xref.c:393
+#, fuzzy
+msgid "for cross-references in parentheses, use @pxref"
+msgstr "Neniu referenco en ĉi tiu nodo."
+
+#: makeinfo/xref.c:436
+msgid "First argument to @inforef may not be empty"
+msgstr ""
+
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: averto: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " por %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\tPor ricevi kompletan liston da opcioj tajpu „%s --help‟.\n"
 
-#: util/install-info.c:434
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
+"                     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"
@@ -2780,11 +2937,18 @@
 "                     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"
@@ -2813,11 +2977,12 @@
 "--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"
+"                    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"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2852,98 +3017,100 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: malplena dosiero"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: dir-dosiero estas jam havigita: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Indiku la Info-dosieron solfoje.\n"
 
-#: util/install-info.c:1284
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "troa argumento komandlinia: «%s»"
 
-#: util/install-info.c:1288
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Mankas enigdosiero; provu --help por pluaj informoj."
 
-#: util/install-info.c:1291
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "Mankas dosiero Info-katalogo (dir); provu --help por pluaj informoj."
 
-#: util/install-info.c:1313
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "Nenia informo por Info-katalogo troviĝis en «%s»"
 
-#: util/install-info.c:1426
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menuero «%s» jam ekzistas (por la dosiero «%s»)"
 
-#: util/install-info.c:1449
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "Troviĝis nenia informo Info-kataloga pri «%s»; nenio iĝis forigita"
 
-#: util/texindex.c:252
+#: util/texindex.c:224
 msgid "display this help and exit"
 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 (defaÅ­lto)"
-
-#: util/texindex.c:258
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "sendu la eligaĵon en DOSIEROn"
 
-#: util/texindex.c:260
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "eligu la uzatan version kaj eliru"
 
-#: util/texindex.c:270
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Uzmaniero: %s [OPCIO]... DOSIERO...\n"
 
-#: util/texindex.c:271
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Generu ordigitan indekson por ĉiu TeX-a elig-DOSIERO.\n"
 
-#: util/texindex.c:274
+#: util/texindex.c:242
 #, 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"
 
-#: util/texindex.c:276
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -2952,23 +3119,73 @@
 "\n"
 "Opcioj:\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: ne indeksa dosiero laÅ­ Texinfo"
-
-#: util/texindex.c:968
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "fiasko ĉe remalfermo de %s"
 
-#: util/texindex.c:1218
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ne indeksa dosiero laÅ­ Texinfo"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Mankas paĝnumero en %s"
 
-#: util/texindex.c:1291
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "la artikolo %s sekvas artikolon kun kromnomo"
+
+#~ 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 ""
+#~ "  %-10s  Search for a specified string in the index entries of this Info\n"
+#~ msgstr ""
+#~ "  %-10s  Serĉu indikotan signoĉenon en la indeksaj artikoloj de ĉi tiu "
+#~ "Info-\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 "  %-10s  Search forward for a specified string,\n"
+#~ msgstr "  %-10s  Serĉu sube indikotan signoĉenon,\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)"
Index: po/fr.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/fr.po,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- po/fr.po    8 Jun 2006 22:42:22 -0000       1.39
+++ po/fr.po    1 Jul 2007 18:43:36 -0000       1.40
@@ -11,7 +11,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.90\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2004-12-06 08:00-05:00\n"
 "Last-Translator: Laurent Bourbeau <address@hidden>\n"
 "Language-Team: French <address@hidden>\n"
@@ -20,6 +20,72 @@
 "Content-Transfer-Encoding: 8-bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: l'option « %s » est ambiguë\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: l'option « %s » exige un argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: option non reconnue « --%s »\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: option non reconnue « %c%s »\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: option illégale -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: option invalide -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: l'option exige un argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: l'option « -W %s » est ambiguë\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "mémoire virtuelle épuisée"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Avancer d'un caractère"
@@ -234,38 +300,34 @@
 "\n"
 "* Menu: Noeuds dont les indices contiennent \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Utiliser --help pour plus d'informations.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "aucune entrée d'index retrouvée pour « %s »\n"
 
-#: info/info.c:593
+#: info/info.c:595
 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:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -301,6 +363,7 @@
 "  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"
@@ -351,8 +414,8 @@
 "  info -f ./foo.info         Montrer le fichier ./foo.info, sans chercher "
 "dir\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -364,72 +427,72 @@
 "vos questions et autre discussion à address@hidden"
 "Site de Texinfo: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Ne peut pas trouver le noeud « %s »."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Ne peut pas trouver le noeud « (%s)%s »."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Ne peut pas trouver une fenêtre permanente!"
 
-#: info/info.c:675
+#: info/info.c:678
 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:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Ne peut pas éliminer la dernière fenêtre."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Aucun menu dans ce noeud."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Aucune note de bas de page dans ce noeud."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Aucune référence croisée dans ce noeud."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Aucun pointeur « %s » pour ce noeud."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Commande Info « %c> » inconnue; essayer « ? » pour de l'aide."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 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:684
+#: info/info.c:687
 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:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Une seule fenêtre."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "La fenêtre résultante sera trop petite."
 
-#: info/info.c:687
+#: info/info.c:690
 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."
 
@@ -880,91 +943,91 @@
 msgid "There is no function named `%s'"
 msgstr "Il n'y a pas de fonction nommée « %s »"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "nombre incorrect d'arguments"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "Ne peut ouvrir le fichier d'entrée « %s »."
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "Ne peut pas créer le fichier de sortie « %s »."
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "erreur d'écriture dans « %s »"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "erreur de fermeture du fichier de sortie « %s »."
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "séquence de clé trop longue"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "séquence de clé manquante"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "Caractère NUL (\\000) n'est pas permis"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "Caractère NUL (^%c) n'est pas permis"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "nom de l'action manquant"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "section trop longue"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "action inconnue « %s »."
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "nom de l'action trop long"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "caractères superflues détectés après l'action « %s »."
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "nom de variable manquant"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "« = » manquant immédiatement après le nom de la variable"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "nom de variable trop long"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "valeur trop longue"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "« %s », ligne %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1079,7 +1142,7 @@
 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:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1088,7 +1151,7 @@
 "   Les fichiers sources aplatis pour faire ce fichier incluent:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Ne peut pas manipuler le fichier %s.\n"
@@ -1158,7 +1221,7 @@
 msgid "Move to the start of the line"
 msgstr "Aller au début de la ligne"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Noeud « Next »"
 
@@ -1649,7 +1712,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Utilisé internement par \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "lecture: Mémoire virtuelle épuisée!\n"
@@ -1751,138 +1814,91 @@
 msgid " Subfile: %s"
 msgstr " Sous-fichier: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: l'option « %s » est ambiguë\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: l'option « --%s » ne permet pas un argument\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, 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"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: l'option « %s » exige un argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: option non reconnue « --%s »\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: option non reconnue « %c%s »\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: option illégale -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: option invalide -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: l'option exige un argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: l'option « -W %s » est ambiguë\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, 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"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "arguments à @%s ignorés"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "janvier"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "février"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "avril"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "mai"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "juin"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "juillet"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "août"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "septembre"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "octobre"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "novembre"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "décembre"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "caractère %c improbable dans la macro @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argument de la macro @sc tout en majuscules, alors aucun effet"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "« { » attendu, mais a vu « %c »"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "fin de fichier à l'intérieur du bloc verbe"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "« } » attendu, mais a vu « %c »"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1890,49 +1906,49 @@
 "@strong{Note...} produit une table douteuse de références croisées dans "
 "Info; réécrire pour éviter cela"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s est périmé"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, 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:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Mauvais argument à %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "« asis »"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "« none »"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Mauvais argument à @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "insérer"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Mauvais argument à @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1970,12 +1986,12 @@
 msgstr "Méthode"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "de"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "sur"
 
@@ -2008,8 +2024,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Voir "
@@ -2033,7 +2049,7 @@
 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:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Notes de bas de page"
 
@@ -2042,64 +2058,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: ne peut ouvrir --css-file: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s%d: --css-file terminé dans le commentaire"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Sans titre"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[inattendu] pas d'étiquette html à dépiler"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[inattendu] nom de noeud invalide: « %s »"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Nom d'index inconnu « %s »"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "L'index « %s » existe toujours"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr "(ligne )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(ligne %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Nom d'index « %s » inconnu dans @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, 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:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(à l'extérieur de tout noeud)"
 
@@ -2206,37 +2222,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "macro @itemx inactive à l'intérieur d'un bloc « %s »"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, 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:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nom d'encodage non reconnu « %s »"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "désolé, l'encodage « %s » n'est pas supporté"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "caractère encodé invalide « %s »"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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 »"
@@ -2251,57 +2272,61 @@
 msgid "here is the previous definition of `%s'"
 msgstr "ici se trouve la définition précédente de « %s »"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 "\\ dans l'expansion de macro suivie par « %s » au lieu du nom de paramètre"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "macro %cend non trouvée"
 
-#: makeinfo/macro.c:625
-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:661
+#: 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 "macro @end %s non balancée avec @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Beaucoup trop d'erreurs!  Abandon.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: avertissement: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "%c égarée ou mal placée"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Utiliser « %s --help » pour plus d'informations.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Usage: %s [OPTION]... FICHIER-TEXINFO...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2309,7 +2334,7 @@
 "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:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2338,7 +2363,7 @@
 " -v, --verbose             En mode bavard, expliquer ce qui a été fait.\n"
 " --version                 Afficher la version du logiciel et quitter.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2353,7 +2378,7 @@
 " --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:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2386,7 +2411,7 @@
 "  -o, --output=FICHIER      produire la sortie dans le FICHIER (répertoire "
 "si division en HTML),\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2424,7 +2449,7 @@
 " --split-size=NUM        séparer les fichiers Info selon la taille NUM (par "
 "défaut %d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2438,7 +2463,7 @@
 "sortie HTML;\n"
 "                                  lire de stdin si le FICHIER est -.\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2452,7 +2477,7 @@
 "                                  Si VAL vaut 0, les espaces pouvant être "
 "ignorés sont éliminés.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2472,7 +2497,7 @@
 " -U VAR                    Rendre indéfinie une variable, comme avec "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2512,7 +2537,7 @@
 "  Aussi pour l'options --no-ifFORMAT, ne pas traiter le textuel "
 "@ifnotFORMAT.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2528,7 +2553,7 @@
 "» ;\n"
 "en génération XML, --ifxml est « on » et les autres sont « off ».\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2563,28 +2588,28 @@
 "  makeinfo --no-split foo.texi         Écrire un fichier Info même "
 "volumineux\n"
 
-#: makeinfo/makeinfo.c:615
+#: 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:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
@@ -2592,56 +2617,50 @@
 "ou\n"
 "« asis », non pas « %s ».\n"
 
-#: makeinfo/makeinfo.c:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: absence d'un argument fichier.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Commande multilignes %c%s utilisé de manière incorrecte"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "« %s » attendue"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Ne peut créer le répertoire « %s »: %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Aucun « %s » trouvé dans « %s »"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Fabrication du fichier %s « %s » à partir de « %s ».\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2649,117 +2668,123 @@
 "%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:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Commande inconnue « %s »."
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s accolades attendues"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Accolade « } » non appariée"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "NOM_INCONNU!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s accolade fermante manquante"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, 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:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Aucun fichier  « %s »"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "commande @image avec un fichier (texte) « %s » illisible: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "commande @image ayant un argument fichier absent"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "fanion indéfini: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Aucune valeur pour « %s »}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s exige un nom"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Fin de fichier rencontré avant l'appariement de @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, 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"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Accolade « } » manquante dans un patron @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "abandon du texte orphelin « %s » après la commande @multitable"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, 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:556
+#: makeinfo/multi.c:564
 #, 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:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "inhibition d'une commande @tab à l'extérieur d'une multitable"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Sortie en multicolonnes à partir de la dernière rangée:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* colonne #%d: sortie = %s\n"
@@ -2784,7 +2809,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Aucun nom de noeud spécifié pour la commande « %c%s »"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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"
@@ -2794,7 +2819,7 @@
 msgstr ""
 "Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Renommer cette ancre ou utiliser l'option « --no-split »"
 
@@ -2817,90 +2842,90 @@
 msgid "Up:"
 msgstr "Noeud « Up »:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 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:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menu"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Référence"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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?)"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, 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:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Noeud « Previous »"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, 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:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Ce noeud (%s) a un noeud « Next » erroné"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, 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:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Noeud « Up »"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "Le noeud « %s » a été référencé %d fois"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "noeud « %s » non référencé"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "Retrait de %s\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Ne peut enlever le fichier « %s »: %s"
@@ -2940,20 +2965,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "commande @image avec un fichier « %s » illisible: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2997,30 +3014,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "Premier argument de @inforef peut ne pas être vide"
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: avertissement: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " pour %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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"
 
-#: util/install-info.c:434
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -3041,11 +3058,18 @@
 "                     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"
@@ -3086,7 +3110,7 @@
 "                   à 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
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3124,101 +3148,103 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: fichier vide"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, 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
+#: util/install-info.c:1275
 #, 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:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "excédent d'argument de ligne de commande « %s »"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr ""
 "Aucun fichier d'entrée spécifié; utiliser --help pour plus d'informations."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 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:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "aucune entrée répertoire Info dans « %s »"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "item menu « %s » déjà existant, pour le fichier « %s »"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "aucune entrée trouvée pour « %s »; rien n'a été éliminé"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "afficher cet aide-mémoire et quitter"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "conserver les fichiers temporaires après le traitement"
-
-#: util/texindex.c:264
-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:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "envoyer la sortie dans FICHIER"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "afficher la version du logiciel et quitter"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Usage: %s [OPTION]... FICHIER...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3227,27 +3253,56 @@
 "\n"
 "Options:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: pas un fichier index en format Texinfo"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "échec lors de la réouverture de %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: pas un fichier index en format Texinfo"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Aucun numéro de page dans %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, 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"
 
+#, 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
@@ -3296,9 +3351,6 @@
 #~ 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"
 
Index: po/he.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/he.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- po/he.po    8 Jun 2006 22:42:22 -0000       1.29
+++ po/he.po    1 Jul 2007 18:43:36 -0000       1.30
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2002-04-03 12:31+0300\n"
 "Last-Translator: Eli Zaretskii <address@hidden>\n"
 "Language-Team: Hebrew <address@hidden>\n"
@@ -14,6 +14,72 @@
 "Content-Type: text/plain; charset=ISO-8859-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n"
+
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "éìàèøéåä ïåøëæä øîâð"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "äîéã÷ ãçà åú ïîñ ææä"
@@ -222,37 +288,33 @@
 "\n"
 "* Menu: (úåîéàúîä úåà÷ñôäå \"%s\" íéìéëîä ñ÷ãðéà éèéøô)\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr ".øúåé áø òãéî úâöäì --help äñð\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "      .øåáéã æúðñîì åîéàúäì éãë êñîì äáéúë ïôåà äðù -b, --speech-friendly\n"
 
-#: info/info.c:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -289,6 +351,7 @@
 "  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"
@@ -329,8 +392,8 @@
 "                           ,address@hidden äì÷ú éçååéã çåìùì àð\n"
 "                   address@hidden ïåéãì íéàùåðå úåéììë úåìàùå\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -342,72 +405,72 @@
 "               address@hidden ïåéãì íéàùåðå úåéììë úåìàùå\n"
 "         .http://www.gnu.org/software/texinfo/ :Texinfo ìù úéáä óã"
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr ".äàöîð àì `%s' ä÷ñéô"
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr ".äàöîð àì `%s' õáå÷á `%s' ä÷ñéô"
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "!ïåìç óà àöîð àì"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "!äæ ïåìçá úâöåîä ä÷ñéôá àöîð åðéà ïîñä"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr ".ãéçé ïåìç ÷åçîì ïúéð àì"
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr ".íééìåù úåøòä ïéà åæ ä÷ñéôá"
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr ".%sì äééðôä ïéà åæ ä÷ñéôá"
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr ".äøæò úìá÷ì `?' äñð ;Info-ì úøëåî äðéà `%c' äãå÷ô"
 
-#: info/info.c:682
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ".Info õéøäì éãë åéã ììëåùî åðéà `%s' âåñî âö"
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr ".åæ ä÷ñéô ìù ïåøçàä ãåîòá øáë ä/úà"
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr ".åæ ä÷ñéô ìù ïåùàøä ãåîòá øáë ä/úà"
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr ".ãçà ïåìç ÷ø íéé÷"
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr ".éãî øúåé ïè÷ äéä ïåìçä"
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr ".åäùìë ïåìç ÷åçîì àð ;äøæò ïåìç âéöäì íå÷î ÷éôñî ïéà"
 
@@ -830,91 +893,91 @@
 msgid "There is no function named `%s'"
 msgstr ".úîéé÷ äðéà `%s' íùá äéö÷ðåô"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "éåâù äãå÷ôì íéèðîåâøàä øôñî"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "`%s' èì÷ õáå÷ úçéúôá äì÷ú"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "`%s' èìô õáå÷ úøéöéá äì÷ú"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "`%s'-ì äáéúëá äì÷ú"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "éãî äëåøà íéù÷î úøãñ"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "äøñç íéù÷î úøãñ"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "øåñà (\\000) ÷éø åúá ùåîéùä"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "øåñà (^%c) ÷éø åúá ùåîéùä"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "äãå÷ô íù øñç"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "éãî êåøà ÷ìç"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "äòåãé äððéà `%s' äãå÷ô"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "éãî êåøà äãå÷ô íù"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "`%s' äãå÷ôì êùîäá íéøúåéî íéåú"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "äðúùîä íù øñç"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "äðúùîä íù éøçà ãéî `=' øñç"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "éãî êåøà äðúùîä íù"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "éãî êåøà êøò"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\" õáå÷á %u äøåùá "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1016,7 +1079,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Set screen height to (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1025,7 +1088,7 @@
 "                  :íéììåë äæ õáå÷ì åãáåòù øå÷î éöá÷\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr ".%s õáå÷ ãáòì ïúéð àì\n"
@@ -1092,7 +1155,7 @@
 msgid "Move to the start of the line"
 msgstr "äææ ñîï ìúçéìú äùåøä"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Next äãù"
 
@@ -1583,7 +1646,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "åæ äãå÷ôá ùîúùî \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "!éåðô ïåøëæ øúåé ïéà :readline\n"
@@ -1674,186 +1737,139 @@
 msgid " Subfile: %s"
 msgstr " Subfile: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `%s' ïééôàî\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `--%s' ïééôàî\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `%c%s' ïééôàî\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s úéðëú øåáò èðîåâøà áééçî `%s' ïééôàî\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s úéðëú øåáò `%c%s' ääåæî-éúìá ïééôàî\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s úéðëú øåáò éåâù ïééôàî -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: èðîåâøà áééçî ïééôàî -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s úéðëú øåáò éòîùî-ãç åðéà `-W %s' ïééôàî\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s úéðëú øåáò èðîåâøà ìá÷î åðéà `-W %s' ïééôàî\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "øàåðé"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "øàåøáô"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "õøî"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "ìéøôà"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "éàî"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "éðåé"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "éìåé"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "èñåâåà"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "øáîèôñ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "øáåè÷åà"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "øáîáåð"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "øáîöã"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var êåúá %c øéáñ-éúìá åú"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "è÷ôà ìë @sc-ì ïéà ïëì ,úåìåãâ úåéúåàá åìåë @sc ìù èðîåâøà"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "%c àöîð êà ,`{' ì\"ö"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "verb êåúá õáå÷ óåñ"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "%c àöîð êà ,`}' ì\"ö"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "ïùåéî åðéä %c%s"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "`%s' àì ,éáåéç øôñî àåäù èðîåâøà ùøåã @sp"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "àåäù åîë"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "ïéà"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr ""
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "%c%s-ì éåâù èðîåâøà"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1892,12 +1908,12 @@
 msgstr "Method"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "of"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "on"
 
@@ -1930,8 +1946,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "See "
@@ -1954,7 +1970,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "íééìåù úåøòä êåúá íééìåù úåøòäá äëéîú ïéà"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "íééìåù úåøòä"
 
@@ -1963,64 +1979,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "úøúåë àìì"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "`%s' :éåâù (node) ä÷ñéô íù"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "`%s' ñ÷ãðéà èéøôá `:' ììâá ìùëéé Info"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "øãâåî øáë `%s' ñ÷ãðéà"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "øëåî-éúìá ñ÷ãðéà åðéä @synindex-á `%s' åà `%s'"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex-á `%s' øëåî-éúìá ñ÷ãðéà"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "ä÷ñéô ìëì õåçî øãâåî `%s' ñ÷ãðéà èéøô"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(ä÷ñéô ìëì õåçî)"
 
@@ -2123,37 +2139,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' êåúá @itemx-ì úåòîùî ïéà"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "äñðëä ÷åìá ìëì õåçî %c%s àöîð"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "`%s' øëåî-éúìá ãåãé÷ íù"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "êîúð åðéà `%s' ãåãé÷ ,íéøòèöî"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "`%s' éåâù ããå÷î åú"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "èðîåâøàë `j' åà `i' ãéçé åú ìá÷î %c%s"
@@ -2168,57 +2189,61 @@
 msgid "here is the previous definition of `%s'"
 msgstr "äðåùàøì øãâåä `%s' ïàë"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, fuzzy, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "øèîøô íù åà \\ íå÷îá ,åø÷àî úáçøäá \\ úåá÷òá `%s'"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "àöîð àì %cend macro"
 
-#: makeinfo/macro.c:625
-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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s úà íàåú åðéà @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr ".íééãé éúîøä  !úàéâù éãî øúåé\n"
 
 # Not translated because Emacs recognizes warningsby this template.
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: warning: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "åîå÷îá åðéàù %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ".`%s --help' äñð øúé èåøôì\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2226,7 +2251,7 @@
 " ìãçî úøéøáë ,íéøçà íéðåù íéèîøåôì Texinfo øå÷î úôùá ãåòéú íâøú\n"
 ".GNU Info  úéðëú åà Emacs úøæòá äàéø÷ì íéîéàúîä Info éöá÷ øöééî \n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2252,7 +2277,7 @@
 "                    .úéðëúä úìåòô ìò èåøô âöä  -v, --verbose\n"
 "               .àöå äðëúä úñøéâ éáâì òãéî âöä      --version\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2266,7 +2291,7 @@
 "              .Info íå÷îá HTML èîøåôá èìô ïëä      --html\n"
 "               .Info íå÷îá XML èîøåôá èìô ïëä      --xml\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2295,7 +2320,7 @@
 "               .èìô õáå÷á úåà÷ñéôå íé÷øô øøôñ      --number-sections\n"
 "     .(HTML èìô íà äé÷éú) FILE õáå÷ì èìô áåúë  -o, --output=FILE\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2328,7 +2353,7 @@
 "      .øå÷îá äúéäù éôë äææä ìò øåîù ,`asis'\n"
 "     .(%d ç\"îøá) NUM ìãåâá íéöá÷-úúì Info ÷ìç      --split-size=NUM\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2338,7 +2363,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2348,7 +2373,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2365,7 +2390,7 @@
 "       address@hidden ìù ùåôéç úîéùø ùàøá DIR óñåä  -P DIR\n"
 "      address@hidden úãå÷ôá åîë ,VAR äðúùî úøãâä ìèá  -U VAR\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2395,7 +2420,7 @@
 "                 address@hidden èñëè ãáòú ìà       --no-ifplaintext\n"
 "                address@hidden @iftex-á èñëè ãáòú ìà       --no-iftex\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2409,7 +2434,7 @@
 "        .íéìòôåî íðéà øúéä ìëå ìòôåî --ifinfo  ,èñëè åà Info àåä èìôä íà\n"
 "           .íéìòôåî íðéà øúéä ìëå ìòôåî --ifplaintext  ,èñëè àåä èìôä íà\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2436,192 +2461,192 @@
 "             úåà÷ñéô øåøôñ íò Info èìô  makeinfo --number-sections foo.texi\n"
 "   äéäéù ìëë ìåãâ ,ãéçé õáå÷á Info èìô  makeinfo --no-split foo.texi\n"
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
 
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
 
-#: makeinfo/makeinfo.c:681
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
 
-#: makeinfo/makeinfo.c:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ".õáå÷ íù øñç %s úéðëúì\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "`%s' éåôö äéä ïàë"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' àöîð àì `%s' õáå÷á"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr "%s: .íùì ïååëî èìôù íåùî åèîùåé éð÷ú èìô õåøòì åø÷àî úåáçøä\n"
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ".%s èîøåôá `%s'-ì `%s' õáå÷ ãáòî\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, 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:1788
+#: makeinfo/makeinfo.c:1783
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' èìô õáå÷\n"
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "`%s' úøëåî-éúìá äàøåä"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "`{...}'-ì äôéö %c%s"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "âåæ-ïá åì ïéàù }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "NO_NAME!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s-ì øñç éðîé øâåñ"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "`%s' àöîð àì `%s' õáå÷á"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "(èñëè øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image úàøåäá øñç õáå÷ íù"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{No value for `%s'}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "íù ùøåã %c%s"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "íàåú @end %s éðôì øîâð èì÷ õáå÷"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "áçøåé àì ;åáéçøäì éãëî êåøà `%.40s...'"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "} øñç @multitable ìù úéðáúá"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "@multiline éøçà `%s' øúåéî èñëèî éúîìòúä"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "(%d ãò øúåî) multitable ìù @item-á úåãåîò éãî øúåé"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "multitable-á %d 'ñî äãåîò úøéçáá äì÷ú"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "multitable-ì õåçî @tab-î éúîìòúä"
 
 # The following two look like debugging output, and aren't compiled.
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multicolumn output from last row:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* column #%d: output = %s\n"
@@ -2646,7 +2671,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "ä÷ñéô íù àìì `%c%s' äàøåä"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "õáå÷ íù åúåàì úåîâøåúî `%s' øåùé÷ úéåúå `%s' ä÷ñéô"
@@ -2655,7 +2680,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì åæ @anchor úàøåä"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "`--no-split' ïééôàîá ùîúùä åà úéåúä íù äðù"
 
@@ -2676,82 +2701,82 @@
 msgid "Up:"
 msgstr "Up:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "õáå÷ íù åúåàì úåîâøåúî `%s-å `%s' øåùé÷ úåéåú"
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì @anchor úàøåä"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "èéøôú"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "øåùé÷"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Next äãùá ä÷ñéôä"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "éåâù Prev äãù úìòá àéä (%s) åæ ä÷ñéô"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Prev äãù"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "äøæç äòéáöî äðéà `%s' ä÷ñéô ìù Prev äãùá ä÷ñéôä"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "éåâù Next äãù úìòá àéä (%s) åæ ä÷ñéô"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Up äãù"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "äøæçá òéáöîù èéøôú óéòñ ïéà ìáà ,`%s' ìò òéáöî `%s' ä÷ñéô ìù Up äãù"
 
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "`%s' ä÷ñéôì íéøåùé÷ %d éúøôñ"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
@@ -2791,20 +2816,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2846,30 +2863,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "÷éø úåéäì ìåëé åðéà @inforef ìù ïåùàø èðîåâøà"
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: warning: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " for %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ".íéðééôàî ìù äàìî äîéùø úìá÷ì `%s --help' äñð\n"
 
-#: util/install-info.c:434
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2890,11 +2907,18 @@
 "                     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"
@@ -2927,7 +2951,7 @@
 "                      .àöå úéðëúä úñøéâ ìò òãéî âöä   --version\n"
 "\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2962,98 +2986,100 @@
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "÷éø åðéä %s õáå÷"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr ".ãáìá úçà íòô %s-ì Info õáå÷ ïééöì ïúéð\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "`%s' øúåéî èðîåâøà"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr ".äøæò úìá÷ì --help äñð ;èì÷ õáå÷ ïåéö ïéà"
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr ".äøæò úìá÷ì --help äñð ;dir õáå÷ ïåéö ïéà"
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "`%s'-á éùàø èéøôú éôéòñ ïéà"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "`%s' óéòñ éùàøä èéøôúá íéé÷ øáë `%s' õáå÷ì"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "÷çîð àì íåìë ;`%s' øåáò èéøôú éôéòñ åàöîð àì"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "úéðëúäî àöå äæ äøæò êñî âöä"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "ãåáéòä êìäîá íéøöåðä íééðîæ íéöá÷ ÷çîú ìà"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "(ç\"îøá) ãåáéòä êìäîá íéøöåðä íééðîæ íéöá÷ ÷çî"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "FILE õáå÷ì èìô äðôä"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "àöå úéðëúä úñøéâ ìò òãéî âöä"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "%s [OPTION]... FILE... :ùåîéùä ïôåà\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ".TeX é\"ò áúëðù FILE õáå÷ ìëì ïééåîî ñ÷ãðéà ïëä\n"
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3062,27 +3088,54 @@
 "\n"
 "                                                :íéðééôàî\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "texinfo ìù ñ÷ãðéà õáå÷ åðéà `%s'"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "%s ìù úùãåçî äçéúôá äì÷ú"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "texinfo ìù ñ÷ãðéà õáå÷ åðéà `%s'"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "ãåîò øôñî ïéà %s-á"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "éðùî íù ìòá èéøô úåá÷òá àá %s èéøô"
 
+#, 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr "  %-10s  øåáòå äæ Info õáå÷ ìù íéñ÷ãðéàá úæåøçî ùôç\n"
@@ -3127,9 +3180,6 @@
 #~ 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'"
 
Index: po/hr.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/hr.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- po/hr.po    8 Jun 2006 22:42:22 -0000       1.29
+++ po/hr.po    1 Jul 2007 18:43:36 -0000       1.30
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2002-04-26 13:49-MET+DST (UTC+2)\n"
 "Last-Translator: Mirsad Todorovac <address@hidden>\n"
 "Language-Team: Croatian <address@hidden>\n"
@@ -15,6 +15,71 @@
 "Content-Type: text/plain; charset=iso-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcija `%s' nije jednoznaèna\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcija `%s' tra¾i neophodan argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nepoznata opcija `--%s'\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nepoznata opcija `%c%s'\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: nedozvoljena opcija -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: pogre¹na opcija -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcija zahtijeva argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcija `-W %s' nije jednoznaèna\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Pomakni se znak unaprijed"
@@ -225,38 +290,34 @@
 "\n"
 "* Meni: Èvorovi èiji indeksi sadr¾e \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Poku¹ajte --help za vi¹e informacija.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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"
-"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"
 
-#: info/info.c:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "nijedna stavka indeksa nije naðena za `%s'\n"
 
-#: info/info.c:593
+#: info/info.c:595
 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:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -293,6 +354,7 @@
 "  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"
@@ -334,8 +396,8 @@
 "  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:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -348,72 +410,72 @@
 "Texinfo matièna stranica: http://www.gnu.org/software/texinfo/\n";
 "Pitanja i kritike glede translacije slati na adresu address@hidden"
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Ne mogu naæi èvor `%s'."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Ne mogu naæi èvor `(%s)%s'."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Ne mogu naæi prozor!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Toèka se ne nalazi unutar èvora ovog prozora!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Ne mogu dokinuti zadnji prozor."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Nema menija u ovom èvoru."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Nema fusnota u ovom èvoru."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Nema unakrsnih referenci u ovom èvoru."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Nema `%s' pokazivaèa za ovaj èvor."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Nepoznata Info naredba `%c'; poku¹ajte `?' za pomoæ."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "Veæ se nalazite na zadnjoj stranici ovog èvora."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "Veæ se nalazite na prvoj stranici ovog èvora."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Samo jedan prozor."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Nastali prozor bi bio premalen."
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Nema dovoljno mjesta za prozor za pomoæ, molimo dokinite jedan prozor."
 
@@ -854,93 +916,93 @@
 msgid "There is no function named `%s'"
 msgstr "Ne postoji funkcija `%s'"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "pogre¹an broj argumenata"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ne mogu otvoriti ulaznu datoteku `%s'"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "ne mogu kreirati izlaznu datoteku `%s'"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "gre¹ka pri pisanju u `%s'"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "gre¹ka pri zatvaranju izlazne datoteke `%s'"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "niz tipaka predugaèak"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "nedostaje niz tipaka"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL znak (\\000) nije dozvoljen"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL znak (^%c) nije dozvoljen"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "nedostaje ime akcije"
 
 # this needs to be clarified and verified against info program, since
 # I'm not sure what kind of section they're talking about
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "predugaèki odlomak"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "nepoznata akcija `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "predugaèko ime akcije"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "suvi¹ni znaci slijede akciju `%s'"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "nedostaje ime varijable"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "nedostaje `=' odmah iza imena varijable"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "ime varijable predugaèko"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "predugaèka vrijednost"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", redak %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1049,7 +1111,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Postavi velièinu screena na (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1058,7 +1120,7 @@
 "   Izvorne datoteke prepuzane da se ukljuèi ova datoteka:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Neuspjelo rukovanje datotekom %s.\n"
@@ -1125,7 +1187,7 @@
 msgid "Move to the start of the line"
 msgstr "Pomakni se na poèetak retka"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Next"
 
@@ -1611,7 +1673,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Interno kori¹ten od \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Premalo virtualne memorije!\n"
@@ -1705,186 +1767,139 @@
 msgid " Subfile: %s"
 msgstr " Poddatoteka: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opcija `%s' nije jednoznaèna\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcija `--%s' ne dopu¹ta argument\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcija `%c%s' ne dopu¹ta argument\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opcija `%s' tra¾i neophodan argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nepoznata opcija `--%s'\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nepoznata opcija `%c%s'\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nedozvoljena opcija -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: pogre¹na opcija -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcija zahtijeva argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opcija `-W %s' nije jednoznaèna\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcija `-W %s' ne dopu¹ta argument\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr ""
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr ""
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr ""
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr ""
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr ""
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr ""
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr ""
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr ""
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr ""
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, c-format
 msgid "Bad argument to @%s: %s"
 msgstr ""
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1925,12 +1940,12 @@
 msgstr ""
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr ""
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr ""
 
@@ -1963,8 +1978,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr ""
@@ -1987,7 +2002,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr ""
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr ""
 
@@ -1996,64 +2011,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr ""
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr ""
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr ""
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr ""
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr ""
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr ""
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr ""
 
@@ -2156,37 +2171,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr ""
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr ""
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "%s: nepoznata opcija `%c%s'\n"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr ""
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr ""
@@ -2201,62 +2221,66 @@
 msgid "here is the previous definition of `%s'"
 msgstr ""
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr ""
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:625
-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:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
 msgstr ""
 
-#: makeinfo/macro.c:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr ""
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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:351
+#: makeinfo/makeinfo.c:355
 #, c-format
 msgid ""
 "General options:\n"
@@ -2273,7 +2297,7 @@
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2283,7 +2307,7 @@
 "      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE     output macro-expanded source to FILE.\n"
@@ -2301,7 +2325,7 @@
 "  -o, --output=FILE           output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2322,7 +2346,7 @@
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2332,7 +2356,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2342,7 +2366,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2352,7 +2376,7 @@
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2372,7 +2396,7 @@
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2381,7 +2405,7 @@
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -2397,189 +2421,189 @@
 "  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:676
+#: 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:681
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:728
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:753
+#: makeinfo/makeinfo.c:757
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1697
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr ""
-
-#: makeinfo/makeinfo.c:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr ""
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr ""
+
+#: makeinfo/makeinfo.c:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "Nema menija u èvoru `%s'."
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr ""
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr ""
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr ""
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr ""
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr ""
@@ -2604,7 +2628,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr ""
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
@@ -2613,7 +2637,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
@@ -2635,82 +2659,82 @@
 msgid "Up:"
 msgstr ""
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr ""
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr ""
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr ""
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr ""
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr ""
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr ""
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr ""
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "ne mogu kreirati izlaznu datoteku `%s'"
@@ -2750,20 +2774,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr ""
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2805,30 +2821,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr ""
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr ""
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ""
 
-#: util/install-info.c:434
+#: util/install-info.c:453
 #, 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"
+"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"
@@ -2849,15 +2865,22 @@
 "                     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 ""
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2877,125 +2900,140 @@
 "%s\n"
 msgstr ""
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr ""
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr ""
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:948
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr ""
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr ""
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr ""
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr ""
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr ""
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr ""
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr ""
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr ""
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr ""
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr ""
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 
-#: util/texindex.c:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
 "Options:\n"
 msgstr ""
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
+#: util/texindex.c:744
 #, c-format
-msgid "%s: not a texinfo index file"
+msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:980
+#: util/texindex.c:759 util/texindex.c:787
 #, c-format
-msgid "failure reopening %s"
+msgid "%s: not a texinfo index file"
 msgstr ""
 
-#: util/texindex.c:1230
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr ""
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
 
+#, 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 ""
 #~ "  %-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"
Index: po/hu.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/hu.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- po/hu.po    8 Jun 2006 22:42:22 -0000       1.3
+++ po/hu.po    1 Jul 2007 18:43:36 -0000       1.4
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: info\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2006-02-18 16:00+0100\n"
 "Last-Translator: Mate LABADI <address@hidden>\n"
 "Language-Team: hungarian <address@hidden>\n"
@@ -16,6 +16,71 @@
 "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:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: „%s“ opció félreérthető\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: Opció „--%s“ nem fogad argumentumot\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: Option „%s“ argumentumot vár\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ismeretlen opció „--%s“\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ismeretlen opció „%c%s“\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: érvénytelen opció -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: érvénytelen opció -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: Az opció egy argumentumot vár -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: Option „-W %s“ nem érthető\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "1 karakterrel előre"
@@ -228,34 +293,32 @@
 "\n"
 "* Menü: Oldalak, amelyek tárgymutatói tartalmazzák „%s“-t:\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "A --help több információt ad.\n"
 
-# Hier de-Standard-Formulierung einsetzen!
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
 #, c-format
 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"
+"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "Nincs tárgymutató ehhez: %s\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-# Die "." am Zeilenende habe ich entfernt. -ke-
-#: info/info.c:600
+#: info/info.c:602
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -292,11 +355,12 @@
 "  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 ""
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -309,77 +373,77 @@
 "címre küldhetők.\n"
 "Texinfo honlap: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "A(z) „%s“ oldal nem található."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "A(z) „(%s)%s“ oldal nem található."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Nem található ablak!"
 
 # ATNEZNI LM
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "A pont nem jelenik meg az ablakon látható oldalon!"
 
-#: info/info.c:676
+#: info/info.c:679
 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:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Nincs menü ezen az oldalon."
 
 # node = csomópont? LM
 # vagy csak pont? sas
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Nincs lábjegyezet ezen az oldalon."
 
 # node = csomópont? LM
 # vagy csak pont? sas
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Ez az oldal nem tartalmaz kereszthivatkozást."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Nincs „%s“ utalás ezen az oldalon."
 
-#: info/info.c:681
+#: info/info.c:684
 #, 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:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 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:684
+#: info/info.c:687
 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:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Csak egy ablak."
 
@@ -387,13 +451,13 @@
 # vagy
 # resulting window = létrejövő/keletkező ablak
 # LM
-#: info/info.c:686
+#: info/info.c:689
 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:687
+#: info/info.c:690
 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!."
 
@@ -871,107 +935,107 @@
 
 # argument = argumentum
 # argument = paraméter ? LM
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "érvénytelen számú argumentum"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "a(z) „%s“ input fájl nem nyitható meg."
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "a(z) „%s“ output fájl nem hozható létre."
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "hiba „%s“ írásakor."
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, 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:453
+#: info/infokey.c:451
 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:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "hiányzó billentyűkombináció "
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "A NUL karakter (\\000) tilos"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, 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:668
+#: info/infokey.c:666
 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:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "túl hosszú szakasz"
 
 # action=művelet ? LM
 # általában az - sas
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "ismeretlen művelet: „%s“."
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "túl hosszú műveletnév"
 
 # action=muvelet? LM
 # általában az - sas
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "`%s' művelet utáni extra karakterek"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "hiányzó változónév"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "hiányzó „=“ jel közvetlen egy változónév után"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 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:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "túl nagy érték"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "„%s“, %u. sor: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1064,14 +1128,14 @@
 msgstr "A képernyő magasságának beállítása (%d): "
 
 # FORDITANI
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "A(z) „%s“ fájl nem módosítható.\n"
@@ -1142,7 +1206,7 @@
 msgid "Move to the start of the line"
 msgstr "Ugrás a sor elejére"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Következő"
 
@@ -1665,7 +1729,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Belső használatra a \\[universal-argument]-nek"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Nincs több virtuális memória!\n"
@@ -1759,187 +1823,140 @@
 msgid " Subfile: %s"
 msgstr "Alfájl: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: „%s“ opció félreérthető\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: Opció „--%s“ nem fogad argumentumot\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: Opció „%c%s“ nem fogad argumentumot\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: Option „%s“ argumentumot vár\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ismeretlen opció „--%s“\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ismeretlen opció „%c%s“\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: érvénytelen opció -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: érvénytelen opció -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: Az opció egy argumentumot vár -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: Option „-W %s“ nem érthető\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: A  „-W %s“ opció nem vár argumentumot\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "@%s argumentuma(i) figyelmen kívül lett(ek) hagyva"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Január"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "Február"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "Március"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "Április"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "Május"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "Június"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "Július"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "Augusztus"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "Szeptember"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "Október"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "November"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "December"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "nem kedvelt karakter %c a @var-ban"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc argumentuma végig nagybetűs, így nincs hatása"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "„{“-t vártam, de „%c“-t láttam"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "„}“-t vártam, de „%c“-t láttam"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s elavult"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, 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:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Rossz argumentum ide: %c%s"
 
 # elég / ahogy van ? LM
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "nincs"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Rossz argumentum ide: @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "beszúr"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Rossz argumentum ide: %s: %s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr "@%s on vagy off-t vártam, „%s“ helyett"
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1984,12 +2001,12 @@
 # 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/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr ""
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr ""
 
@@ -2022,8 +2039,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Lásd "
@@ -2047,7 +2064,7 @@
 msgstr "Lábjegyzetben nem lehet lábjegyzet"
 
 # HTML
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Lábjegyzetek"
 
@@ -2056,64 +2073,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: A CSS fájl nem nyitható meg: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-file kommenttel végződik"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Névtelen"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[váratlan] nincs html tag, amit ki lehetne venni"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[váratlan] érvénytelen oldalnév: „%s“"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Ismeretlen tárgymutató „%s“"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "„%s“ tárgymutató már létezik"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Ismeretlen tárgymutató „%s“ és/vagy „%s“ itt: @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr "(sor )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(%*d sor)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Ismeretlen tárgymutató „%s“ itt: @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, 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:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(az oldalakon kívül)"
 
@@ -2225,37 +2242,42 @@
 msgstr "@itemx -nek nincs jelentése a(z) „%s“ blokkon belül"
 
 # checkit
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, 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:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "ismeretlen kódolási név: „%s“"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "bocsánat, de a(z) „%s“ kódolás nem támogatott"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "érvénytelen kódolt karakter: „%s“"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2270,62 +2292,66 @@
 msgid "here is the previous definition of `%s'"
 msgstr "„%s“ korábbi definíciója"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:402
+#: 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makró nem található"
 
-#: makeinfo/macro.c:625
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "A @quote-arg csak az egyargumentumos makróknál használatos"
+#: makeinfo/macro.c:591
+msgid "@allow-recursion is deprecated; please use @rmacro instead"
+msgstr ""
 
-#: makeinfo/macro.c:661
+#: 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:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Túl sok hiba! Feladom.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: figyelem: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Rossz helyen levő %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, 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:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Használat: %s [OPCIÓK] ... TEXINFO-FÁJL...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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:351
+#: makeinfo/makeinfo.c:355
 #, c-format
 msgid ""
 "General options:\n"
@@ -2342,7 +2368,7 @@
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2357,7 +2383,7 @@
 "      --xml                   Texinfo XML kimenet Info helyett\n"
 "      --plaintext             sima szöveg kimenet Info helyett\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE     output macro-expanded source to FILE.\n"
@@ -2375,7 +2401,7 @@
 "  -o, --output=FILE           output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2396,7 +2422,7 @@
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2406,7 +2432,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2416,7 +2442,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2426,7 +2452,7 @@
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2446,7 +2472,7 @@
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2456,7 +2482,7 @@
 msgstr ""
 
 # Die "." am Zeilenende habe ich entfernt. -ke-
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 msgid ""
 "Examples:\n"
 "  makeinfo foo.texi                      write Info to foo's @setfilename\n"
@@ -2472,87 +2498,82 @@
 "  makeinfo --no-split foo.texi           write one Info file however big\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:615
+#: 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:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: hiányzó fájl argumentum.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "A többsoros %c%s parancs helytelenül van használva"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "„%s“-t várok"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "A(z) „%s“ könyvtár nem hozható létre: %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Nem található „%s“ ebben: „%s“"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, 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:1697
-#, c-format
-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"
-
-#: makeinfo/makeinfo.c:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2560,119 +2581,124 @@
 "%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:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Ismeretlen parancs: „%s“"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s kapcsos zárójelpárt vár"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Pár nélküli }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "NINCS_NÉV!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s hiányzó kapcsos bezárójel"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, c-format
+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"
+
+#: makeinfo/makeinfo.c:3443
 #, 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:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Nincs ilyen fájl: „%s“"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, 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:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image hiányzó fájlnév argumentum"
 
 # flag ? LM
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "ismeretlen flag: %s"
 
 # checkit
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{„%s“-hoz nincs érték}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s egy nevet igényel"
 
 # AATNEZNI ? LM
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, 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:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Hiányzó } a @multitable sablonban"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, 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:394
+#: makeinfo/multi.c:401
 #, 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:556
+#: makeinfo/multi.c:564
 #, 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:585
+#: makeinfo/multi.c:593
 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:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multicolumn kimenet az utolsó sortól:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* %d. oszlop: kimenet = %s\n"
@@ -2699,7 +2725,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "A(z) „%c%s“ parancshoz nem lett oldalnév rendelve"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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"
@@ -2710,7 +2736,7 @@
 "Ez az @anchor parancs figyelmen kívül lett hagyva; bármely rá való "
 "hivatkozás nem fog működni"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Nevezze át ezt a horgonyt vagy használja a „--no-split“ opciót"
 
@@ -2734,91 +2760,91 @@
 msgid "Up:"
 msgstr "Fel:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 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:1348
+#: makeinfo/node.c:1361
 #, 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?)"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menü"
 
 # ATNEZNI ? LM
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Kereszt"
 
 # ATNEZNI ? LM
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Ennek az oldalnak (%s) hibás az Előző (Prev) mezője"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Előző"
 
 # ATNEZNI ? LM
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, 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:1510
+#: makeinfo/node.c:1523
 #, 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:1522
+#: makeinfo/node.c:1535
 #, 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:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Fel"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "a(z) „%s“ oldalra %d hivatkozás mutat"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "nem hivatkozott oldal „%s“"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "Törlés: %s\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Nem törölhető fájl: `%s': %s"
@@ -2859,20 +2885,12 @@
 msgstr ""
 "%ctop korábban szerepel, mint %cnode, az alapértelmezett %s-t használom"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Tartalom"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Rövid tartalom"
-
-#: makeinfo/xml.c:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image a(z) „%s“ fájl nem olvasható: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2919,31 +2937,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: figyelem: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " ehhez: %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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"
 
-# Die "." am Zeilenende habe ich entfernt. -ke-
-#: util/install-info.c:434
+#: util/install-info.c:453
 #, 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"
+"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"
@@ -2964,15 +2981,22 @@
 "                     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 ""
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2992,104 +3016,104 @@
 "%s\n"
 msgstr ""
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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"
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: üres fájl"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr "START-INFO-DIR-ENTRY-nek nincs END-INFO-DIR-ENTRY párja"
 
-#: util/install-info.c:948
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY-nek nincsSTART-INFO-DIR-ENTRY párja"
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: már van dir fájl: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Az Info fájlt csak egyszer kell megadni!\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "felesleges parancssori argumentum: „%s“"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 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
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 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
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "nincs info dir bejegyzés „%s“-ben"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "A(z) „%s“ menüelem már létezik a „%s“ fájlhoz"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "„%s“-hez nem találtam bejegyzést; nincs mit törölni"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "kiírja e súgót és kilép"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "az ideiglenes állományok megtartása a feldolgozás után"
-
-#: util/texindex.c:264
-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)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "kimenet átirányítása FILE-ba"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "kiírja a verzióinformációt és kilép"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Használat: %s [OPCIÓK]... FÁJL...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3098,23 +3122,39 @@
 "\n"
 "Opciók:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: nem Texinfo tárgymutatófájl"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "Hiba történt „%s“ újbóli megnyitásakor"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: nem Texinfo tárgymutatófájl"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Nem található oldalszám ebben: %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, 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 "@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)"
Index: po/ja.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/ja.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- po/ja.po    8 Jun 2006 22:42:22 -0000       1.29
+++ po/ja.po    1 Jul 2007 18:43:36 -0000       1.30
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: GNU texinfo 4.0f\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2002-01-23 20:46+0900\n"
 "Last-Translator: Daisuke Yamashita <address@hidden>\n"
 "Language-Team: Japanese <address@hidden>\n"
@@ -14,6 +14,72 @@
 "Content-Type: text/plain; charset=EUC-JP\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+
+#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï¡¢°ú¿ô¤¬É¬ÍפǤ¹\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤¬Û£Ëæ¤Ç¤¹\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "²¾ÁÛ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "°ìʸ»úʬ¿Ê¤á¤ë"
@@ -222,43 +288,33 @@
 "\n"
 "* ¥á¥Ë¥å¡¼: \"%s\" ¤ò´Þ¤à¸«½Ð¤·¹àÌÜ\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "¾Ü¤·¤¯¤Ï --help ¥ª¥×¥·¥ç¥ó¤ò»î¤·¤Æ¤ß¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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"
-"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"
 
-#: info/info.c:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "`%s' ¤ËÂФ¹¤ë¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó\n"
 
-#: info/info.c:593
+#: info/info.c:595
 #, fuzzy
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr " --speech-friendly        ²»À¼¹çÀ®´ï¤ËÂФ¹¤ë¿ÆÏÂÀ­¤ò¹â¤á¤ë\n"
 
-#: info/info.c:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -295,6 +351,7 @@
 "  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"
@@ -334,8 +391,8 @@
 "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï address@hidden"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï address@hidden ¤Þ¤Ç¡£\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 #, fuzzy
 msgid ""
 "\n"
@@ -347,72 +404,72 @@
 "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï address@hidden"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï address@hidden ¤Þ¤Ç¡£\n"
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "`%s' ¥Î¡¼¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "`(%s)%s' ¥Î¡¼¥É¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "¥¦¥£¥ó¥É¥¦¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "¤³¤Î¥¦¥£¥ó¥É¥¦¥Î¡¼¥ÉÆâ¤Ë¥Ý¥¤¥ó¥È¤¬¸½¤ì¤Þ¤»¤ó¡ª"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "ºÇ¸å¤Î¥¦¥£¥ó¥É¥¦¤Ïºï½ü¤Ç¤­¤Þ¤»¤ó"
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤Ë¥á¥Ë¥å¡¼¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤ËµÓÃí¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤ËÁê¸ß»²¾È¤Ï¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "¤³¤Î¥Î¡¼¥É¤Î `%s' ¥Ý¥¤¥ó¥¿¤¬¤¢¤ê¤Þ¤»¤ó¡£"
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "̤ÃΤΠInfo ¥³¥Þ¥ó¥É `%c' -- `?' ¤Ç¥Ø¥ë¥×¤ò¸«¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: info/info.c:682
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "üËö¥¿¥¤¥× `%s' ¤Ï Info ¤òÆ°¤«¤»¤ë¤Û¤ÉÍø¸ý¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "¤³¤³¤Ï¤â¤¦¡¢¤³¤Î¥Î¡¼¥É¤ÎºÇ½ª¥Ú¡¼¥¸¤Ç¤¹¡£"
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "¤³¤³¤Ï¤â¤¦¡¢¤³¤Î¥Î¡¼¥É¤ÎºÇ½é¤Î¥Ú¡¼¥¸¤Ç¤¹¡£"
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Í£°ì¤Î¥¦¥£¥ó¥É¥¦¡£"
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "·ë²Ì¥¦¥£¥ó¥É¥¦¤¬¾®¤µ¤¹¤®¤ëÍͤǤ¹"
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 "¥Ø¥ë¥×¥¦¥£¥ó¥É¥¦ÍѤξì½ê¤¬Â­¤ê¤Þ¤»¤ó¡¢¥¦¥£¥ó¥É¥¦¤ò°ì¤Äºï½ü¤·¤Æ¤¯¤À¤µ¤¤¡£"
@@ -844,91 +901,91 @@
 msgid "There is no function named `%s'"
 msgstr "`%s' ¤È¤¤¤¦µ¡Ç½¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "°ú¿ô¤Î¿ô»ú¤¬´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ÆþÎÏ¥Õ¥¡¥¤¥ë `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "`%s' ¤Ø¤Î½ñ¤­¹þ¤ßÃæ¤Î¥¨¥é¡¼"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òÊĤ¸¤ëºÝ¤Î¥¨¥é¡¼"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "¥­¡¼ÆþÎÏÎó¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "¥­¡¼ÆþÎÏÎó¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL ʸ»ú (\\000) ¤Ï»È¤¨¤Þ¤»¤ó"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL ʸ»ú (^%c) ¤Ï»È¤¨¤Þ¤»¤ó"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "¥¢¥¯¥·¥ç¥ó̾¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "¥»¥¯¥·¥ç¥ó¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "ÉÔÌÀ¤Ê¥¢¥¯¥·¥ç¥ó `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "¥¢¥¯¥·¥ç¥ó̾¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "¥¢¥¯¥·¥ç¥ó `%s' ¤Ë;ʬ¤Êʸ»ú¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "ÊÑ¿ô̾¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "ÊÑ¿ô̾¤Îľ¸å¤Î `=' ¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "ÊÑ¿ô̾¤¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "Ãͤ¬Ä¹¤¹¤®¤Þ¤¹"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", %u ¹ÔÌÜ: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1042,7 +1099,7 @@
 msgid "Set screen height to (%d): "
 msgstr "¥¹¥¯¥ê¡¼¥ó¤Î¹â¤µ¤ò¥»¥Ã¥È (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1051,7 +1108,7 @@
 "   ¤³¤Î¥Õ¥¡¥¤¥ë¤òºî¤ë¸µ¤Ë¤Ê¤Ã¤¿¥Õ¥¡¥¤¥ë:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "¥Õ¥¡¥¤¥ë %s ¤ò¾å¼ê¤¯½èÍý¤Ç¤­¤Þ¤»¤ó¡£\n"
@@ -1120,7 +1177,7 @@
 msgid "Move to the start of the line"
 msgstr "¹ÔƬ¤Ë°ÜÆ°"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "¼¡"
 
@@ -1603,7 +1660,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "ÆâÉôŪ¤Ë \\[universal-argument] ¤Ë¤è¤Ã¤ÆÍøÍѤµ¤ì¤Þ¤¹"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ²¾ÁÛ¥á¥â¥ê¤ò»È¤¤²Ì¤¿¤·¤Þ¤·¤¿!\n"
@@ -1693,186 +1750,139 @@
 msgid " Subfile: %s"
 msgstr " Éû¥Õ¥¡¥¤¥ë: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤ÏÛ£Ëæ¤Ç¤¹\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `--%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `%c%s' ¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó `%s' ¤Ë¤Ï¡¢°ú¿ô¤¬É¬ÍפǤ¹\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: `--%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: `%c%s' ¤Ïǧ¼±¤Ç¤­¤Ê¤¤¥ª¥×¥·¥ç¥ó¤Ç¤¹\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÉÔÀµ¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ̵¸ú¤Ê¥ª¥×¥·¥ç¥ó -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ¥ª¥×¥·¥ç¥ó¤Ï°ú¿ô¤òÍ׵ᤷ¤Þ¤¹ -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤¬Û£Ëæ¤Ç¤¹\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: `-W %s' ¥ª¥×¥·¥ç¥ó¤Ë¤Ï°ú¿ô¤¬ÉÔÍפǤ¹\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "°ì·î"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "Æó·î"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "»°·î"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "»Í·î"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "¸Þ·î"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "Ï»·î"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "¼··î"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "Ȭ·î"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "¶å·î"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "½½·î"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "½½°ì·î"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "½½Æó·î"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var ¤Ç»È¤¨¤½¤¦¤Ë¤Ê¤¤Ê¸»ú %c"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "Á´¤ÆÂçʸ»ú¤Î @sc °ú¿ô¡¢½¾¤Ã¤Æ¸ú²Ì¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{' ¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¤¬¡¢`%c' ¤Ç¤·¤¿"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "verb ¥Ö¥í¥Ã¥¯Æâ¤Ç¥Õ¥¡¥¤¥ëËöÈø¤È¤Ê¤ê¤Þ¤·¤¿"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}' ¤¬¤¢¤ë¤Ï¤º¤Ç¤¹¤¬¡¢`%c' ¤Ç¤·¤¿"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ¤ÏÇѤ줿̿Îá¤Ç¤¹"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp ¤Ë¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¡¢Àµ¤Î¿ôÃͤòÍ¿¤¨¤Ê¤±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "¤½¤Î¤Þ¤Þ"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "¤Ê¤·"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr ""
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "%c%s ¤ËÂФ¹¤ëÉÔÀµ¤Ê°ú¿ô"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1910,12 +1920,12 @@
 msgstr "¥á¥½¥Ã¥É"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "of"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "on"
 
@@ -1948,8 +1958,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "See "
@@ -1973,7 +1983,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "µÓÃí¤Ë¿Æ¥Î¡¼¥É¤ÎÄêµÁ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "µÓÃí"
 
@@ -1982,64 +1992,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "̵Âê"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "ÉÔŬÀڤʥΡ¼¥É̾¤Ç¤¹: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "ÉÔÌÀ¤Ê¥¤¥ó¥Ç¥Ã¥¯¥¹ `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "¸«½Ð¤· `%s' ¤Ï´û¤Ë¸ºß¤·¤Þ¤¹"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "@synindex ¤Ë¡¢ÃΤé¤Ê¤¤¸«½Ð¤· `%s' ¤ä `%s' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex ¤Ë¡¢ÃΤé¤Ê¤¤¸«½Ð¤· `%s' ¤¬¤¢¤ê¤Þ¤¹"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "¸«½Ð¤· `%s' ¤Î¥¨¥ó¥È¥ê¤Ï¤¢¤é¤æ¤ë¥Î¡¼¥É¤Î³°Â¦¤Ç¤¹"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(¤¢¤é¤æ¤ë¥Î¡¼¥É¤Î³°Â¦)"
 
@@ -2142,37 +2152,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' ¥Ö¥í¥Ã¥¯Æ⦤ǤΠ@itemx ¤Ï¡¢¤¢¤Þ¤ê°ÕÌ£¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "ÁÞÆþ¥Ö¥í¥Ã¥¯³°¤Ç¡¢%c%s ¤¬¸«¤Ä¤«¤ê¤Þ¤·¤¿"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ¤ÏÍ­¸ú¤Ê ISO 639 ¸À¸ì¥³¡¼¥É¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "¥¨¥ó¥³¡¼¥Ç¥£¥ó¥°Ì¾ `%s' ¤òǧ¼±¤Ç¤­¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "»ÄÇ°¤Ê¤¬¤é¡¢¥¨¥ó¥³¡¼¥É `%s' ¤Ï¼õ¤±ÉÕ¤±¤é¤ì¤Þ¤»¤ó"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "¥¨¥ó¥³¡¼¥Éʸ»ú `%s' ¤¬Ìµ¸ú¤Ç¤¹"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ¤Ï `%c' ¤Ç¤Ï¤Ê¤¯¡¢`i' ¤« `j' ¤ò°ú¿ô¤È¤·¤ÆɬÍפȤ·¤Þ¤¹"
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ¤Ï°ú¿ô¤È¤·¤Æ `i' ¤« `j' ¤Î¤¤¤º¤ì¤«°ìʸ»ú¤¬É¬ÍפǤ¹"
@@ -2187,56 +2202,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "¤³¤³¤Ï¡¢`%s' ¤ÎÁ°¤ÎÄêµÁ¤Ç¤¹"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, fuzzy, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "¥Þ¥¯¥íŸ³«Æâ¤Î \\ ¤Î¸å¤í¤Ë \\ ¤ä¥Ñ¥é¥á¥¿Ì¾¤Ç¤Ï¤Ê¤¯ `%s' ¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "¥Þ¥¯¥í `%s' ¸Æ¤Ó½Ð¤·(%d¹ÔÌÜ)¤Î°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend ¥Þ¥¯¥í¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/macro.c:625
-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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@%2$s ¤È°ìÃפ·¤Ê¤¤ @end %1$s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "¥¨¥é¡¼¤¬Â¿¤¹¤®¤Þ¤¹!  Äü¤á¤Þ¤·¤¿¡£\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: ·Ù¹ð: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "´Ö°ã¤Ã¤¿°ÌÃÖ¤Ë %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¾Ü¤·¤¯¤Ï `%s --help' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... TEXINFO¥Õ¥¡¥¤¥ë...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2244,7 +2263,7 @@
 "Texinfo ¥½¡¼¥¹Ê¸½ñ¤òÍÍ¡¹¤Ê·Á¼°¤ÇÆɤá¤ë¤è¤¦¤ËÊÑ´¹¤·¤Þ¤¹¡£¥Ç¥Õ¥©¥ë¥È¤Ç¤Ï\n"
 "¥ª¥ó¥é¥¤¥ó¤Ç Emacs ¤äñÆȤΠGNU Info ¤ÇÆɤà¤Î¤ËŬ¤·¤¿ Info ¥Õ¥¡¥¤¥ë¤Ç¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2272,7 +2291,7 @@
 "  -v, --verbose               ¹Ô¤Ê¤ï¤ì¤ë»ö¤òÀâÌÀ¤¹¤ë¡£\n"
 "      --version               ¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤¹¤ë¡£\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2289,7 +2308,7 @@
 "                              ¤Ä¤±¤Ê¤¤¤Èɸ½à½ÐÎϤ˽ñ¤­¹þ¤à\n"
 "      --xml                 Info ¤Ç¤Ï¤Ê¤¯ XML (TexinfoML) ·Á¼°¤Ç½ÐÎϤ¹¤ë¡£\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2316,7 +2335,7 @@
 "  -o, --output=FILE         FILE ¤Ø½ÐÎϤ¹¤ë (ʬ³ä HTML ¤Î¾ì¹ç¥Ç¥£¥ì¥¯¥È"
 "¥ê)¡£\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2350,7 +2369,7 @@
 "                                ¤À¤È¡¢´û¸¤Î»ú²¼¤²¤ò¤½¤Î¤Þ¤Þ»È¤¦¡£\n"
 "      --split-size=NUM        Info ¥Õ¥¡¥¤¥ë¥µ¥¤¥º¤ò NUM ¤Çʬ³ä (default %d)\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2360,7 +2379,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2370,7 +2389,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2387,7 +2406,7 @@
 "  -P DIR                         @include õº÷¥Ñ¥¹¤ÎÀèƬ¤Ë DIR ¤òÁÞÆþ¤¹¤ë¡£\n"
 "  -U VAR                         ÊÑ¿ô VAR address@hidden ¤ÈƱ¤¸¡£\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2415,7 +2434,7 @@
 "     --no-ifinfo   @ifinfo ¥Æ¥¯¥¹¥È¤ò½èÍý¤·¤Ê¤¤¡£\n"
 "     --no-iftex    @iftex ¤ä @tex ¥Æ¥¯¥¹¥È¤ò½èÍý¤·¤Ê¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2428,7 +2447,7 @@
 "  HTML ¤òÀ¸À®¤¹¤ë¤Ê¤é --ifhtml ¤¬Í­¸ú¤Ç¾¤Ï̵¸ú¤Ç¤¹¡£\n"
 "  Info ¤ä¥×¥ì¥¤¥ó¥Æ¥¯¥¹¥È¤òÀ¸À®¤¹¤ë¤Ê¤é --ifinfo ¤¬Í­¸ú¤Ç¾¤Ï̵¸ú¤Ç¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2451,83 +2470,77 @@
 "  makeinfo --number-sections foo.texi  Àá¤ËÈÖ¹æ¤òÉÕ¤±¤¿ Info ¤ò½ÐÎÏ\n"
 "  makeinfo --no-split foo.texi         Â礭¤µ¤Ë´Ø¤ï¤é¤º°ì¤Ä¤Î Info ¤ò½ÐÎÏ\n"
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s °ú¿ô¤Ï `%s' ¤Ç¤Ï¤Ê¤¯¤Æ¡¢¿ôÃͤǤʤ±¤ì¤Ð¤Ê¤ê¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "¥Þ¥¯¥í³ÈÄ¥½ÐÎÏ `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:681
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "¥Þ¥¯¥í³ÈÄ¥½ÐÎÏ `%s' ¤ò³«¤±¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ¥Õ¥¡¥¤¥ë°ú¿ô¤ò˺¤ì¤Æ¤¤¤Þ¤¹¤è\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "¤³¤³¤Ç¤Ï `%s' ¤¬Í׵ᤵ¤ì¤Þ¤¹"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%2$s' ¤Ë `%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr "%s: Info ¤Î½ÐÎϤò¹Ô¤Ê¤¦¤Î¤Ç¡¢¥Þ¥¯¥í³ÈÄ¥¤òɸ½à½ÐÎϤ˽ÐÎϤ·¤Þ¤»¤ó¡£\n"
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "`%3$s' ¤«¤é %1$s ¥Õ¥¡¥¤¥ë `%2$s' ¤òºîÀ®¤·¤Þ¤¹¡£\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2535,114 +2548,120 @@
 "%s: ¥¨¥é¡¼¤Ë¤è¤ê¡¢¥Þ¥¯¥í½ÐÎÏ¥Õ¥¡¥¤¥ë `%s' ¤òºï½ü¤·¤Þ¤¹¡£\n"
 "       -- »Ä¤·¤¿¤¤¾ì¹ç¤Ë¤Ï `--force' ¥ª¥×¥·¥ç¥ó¤ò»È¤Ã¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "ÃΤé¤Ê¤¤¥³¥Þ¥ó¥É `%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "@%s ¤Ø¤Î°ú¿ô¤È¤·¤Æ¥³¥Þ¥ó¥É¤òÍ¿¤¨¤ë¤Ë¤Ï¡¢¥Ö¥ì¡¼¥¹¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ¤Ë¤Ï `{...}' ¤¬É¬ÍפǤ¹"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Âбþ¤Î¤Ê¤¤ }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "̾Á°¤¬Ìµ¤¤¡ª"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "ÊĤ¸¤ë¥Ö¥ì¡¼¥¹¤Î¤Ê¤¤ %c%s"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' (HTML ÍÑ) ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "`%2$s' ¤Ë `%1$s' ¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' (text ÍÑ) ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image ¤Ë¥Õ¥¡¥¤¥ë̾¤¬Í¿¤¨¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{`%s' ¤ÎÃͤ¬¤Ê¤¤}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s ¤Ë¤Ï̾Á°¤¬É¬ÍפǤ¹"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "@end %s ¤ÎÂбþ¤ÎÁ°¤Ë¥Õ¥¡¥¤¥ë¤Î½ª¤ê¤Ë½Ð¤¯¤ï¤·¤Þ¤·¤¿"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "@multitable ¥Æ¥ó¥×¥ì¡¼¥È¤Ë } ¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "@multitable ¤Î¸å¤í¤Î¥Æ¥¯¥¹¥È `%s' ¤ò̵»ë¤·¤Þ¤¹"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ë¹àÌÜÆâ¤Î¥«¥é¥à¿ô¤¬Â¿¤¹¤®¤Þ¤¹(ºÇÂç %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ëÆâ¤Ç¤Ï¡¢Âè %d ¹Ô¤òÁªÂò¤Ç¤­¤Þ¤»¤ó"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "¥Þ¥ë¥Á¥Æ¡¼¥Ö¥ë¤Î³°Â¦¤Î @tab ¤ò̵»ë¤·¤Þ¤¹"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** ¥Þ¥ë¥Á¥«¥é¥à¤ÎºÇ¸å¤ÎÎ󤫤é½ÐÎÏ\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* Âè %d ¥«¥é¥à: ½ÐÎÏ = %s\n"
@@ -2667,7 +2686,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "`%c%s' ¥³¥Þ¥ó¥É¤Ë»ØÄꤵ¤ì¤¿¥Î¡¼¥É̾¤¬¤¢¤ê¤Þ¤»¤ó"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "¥¢¥ó¥«¡¼ `%s' ¤È¥Î¡¼¥É `%s' ¤¬Æ±¤¸¥Õ¥¡¥¤¥ë¤ò¥Þ¥Ã¥×¤·¤Æ¤¤¤Þ¤¹"
@@ -2676,7 +2695,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "¤³¤Î @anchor ¥³¥Þ¥ó¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹ -- ¤½¤³¤Ø¤Î»²¾È¤ÏÆ°ºî¤·¤Þ¤»¤ó"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "¤³¤Î¥¢¥ó¥«¡¼Ì¾¤òÊѹ¹¤¹¤ë¤« `--no-split' ¥ª¥×¥·¥ç¥ó¤ò»È¤¤¤Þ¤·¤ç¤¦"
 
@@ -2697,83 +2716,83 @@
 msgid "Up:"
 msgstr "¾å:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "¥¢¥ó¥«¡¼ `%s' ¤È `%s' ¤¬Æ±¤¸¥Õ¥¡¥¤¥ë̾¤Ë¥Þ¥Ã¥×¤·¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor ¥³¥Þ¥ó¥É¤Ï̵»ë¤µ¤ì¤Þ¤¹ -- ¤½¤³¤Ø¤Î»²¾È¤ÏÆ°ºî¤·¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s ¤Ï¸ºß¤·¤Ê¤¤¥Î¡¼¥É `%s' ¤ò»²¾È¤·¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "¥á¥Ë¥å¡¼"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Áê¸ß"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "¥Î¡¼¥É `%s' ¤Î¼¡¤Î¥Õ¥£¡¼¥ë¥É¤¬¥Î¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤»¤ó -- "
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "¤³¤Î¥Î¡¼¥É (%s) ¤Ï¤­¤Á¤ó¤È Á° ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Á°"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "¥Î¡¼¥É `%s' ¤ÎÁ°¤Î¥Õ¥£¡¼¥ë¥É¤¬¥Î¡¼¥É¤ò»Ø¤·¤Æ¤¤¤Þ¤»¤ó -- "
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "¤³¤Î¥Î¡¼¥É (%s) ¤Ï¤­¤Á¤ó¤È ¼¡ ¤ò»ý¤Ã¤Æ¤¤¤Þ¤»¤ó"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "¾å"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 "¥Î¡¼¥É `%s' ¤Ë¤Ï ¾å°Ì¹àÌܤ¬¤¢¤ë¤Î¤Ë¡¢`%s' ¤Ø¤Î¥á¥Ë¥å¡¼¥¢¥¤¥Æ¥à¤ò·ç¤¤¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "¥Î¡¼¥É `%s' ¤Ï´û¤Ë %d ²ó»²¾È¤µ¤ì¤Æ¤¤¤Þ¤¹"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "»²¾È¤µ¤ì¤Æ¤¤¤Ê¤¤¥Î¡¼¥É `%s'"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "¥Ç¥£¥ì¥¯¥È¥ê `%s' ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó: %s"
@@ -2813,20 +2832,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image ¥Õ¥¡¥¤¥ë `%s' ¤¬Æɤá¤Þ¤»¤ó: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2868,30 +2879,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "@inforef ¤Ø¤ÎÂè°ì°ú¿ô¤Ï¶õ¤Ç¤¢¤Ã¤Æ¤Ï¤Ê¤ê¤Þ¤»¤ó"
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ·Ù¹ð: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "\t´°Á´¤Ê ¥ª¥×¥·¥ç¥ó¥ê¥¹¥È¤òÆÀ¤ë¤Ë¤Ï `%s --help' ¤ò¼Â¹Ô¤·¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: util/install-info.c:434
+#: util/install-info.c:453
 #, 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"
+"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"
@@ -2912,11 +2923,18 @@
 "                     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"
@@ -2955,7 +2973,7 @@
 "Email ¤Ë¤è¤ë¥Ð¥°¥ì¥Ý¡¼¥È¤Ï address@hidden"
 "°ìÈÌŪ¤Ê¼ÁÌä¤äµÄÏÀ¤Ï address@hidden ¤Þ¤Ç¡£\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2993,101 +3011,103 @@
 "\n"
 "* ¥á¥Ë¥å¡¼:\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: (%s) ¤òÆɤ᤺¡¢(%s) ¤òºîÀ®¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿\n"
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: ¶õ¤Î¥Õ¥¡¥¤¥ë"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Info ¥Õ¥¡¥¤¥ë¤Ï°ìÅÙ¤À¤±»ØÄꤷ¤Æ¤¯¤À¤µ¤¤¡£\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "¥³¥Þ¥ó¥É¥é¥¤¥ó°ú¿ô¤¬Â¿¤¹¤®¤Þ¤¹ `%s'"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr ""
 "ÆþÎÏ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó -- ¾Ü¤·¤¯¤Ï --help ÉդǼ¹Ԥ·¤Æ¤¯¤À¤µ¤¤¡£"
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 "dir ¥Õ¥¡¥¤¥ë¤¬»ØÄꤵ¤ì¤Æ¤¤¤Þ¤»¤ó -- ¾Ü¤·¤¯¤Ï --help ÉդǼ¹Ԥ·¤Æ²¼¤µ¤¤¡£"
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "`%s' ¤Ë Info dir ÍѤιàÌܤ¬¤¢¤ê¤Þ¤»¤ó"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "¥á¥Ë¥å¡¼¹àÌÜ `%s' ¤Ï¡¢`%s' ¤Ë´û¤Ë¸ºß¤·¤Þ¤¹"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "`%s' ¹àÌܤ¬¸«¤Ä¤«¤ê¤Þ¤»¤ó -- ²¿¤âºï½ü¤·¤Þ¤»¤ó¤Ç¤·¤¿"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "»È¤¤Êý¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "½èÍý¤Î¸å¤Ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤ò»Ä¤·¤Æ¤ª¤­¤Þ¤¹"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "½èÍý¤Î¤¢¤È¤Ë¥Æ¥ó¥Ý¥é¥ê¥Õ¥¡¥¤¥ë¤òºï½ü¤·¤Þ¤¹ (default)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "½ÐÎϤò FILE ¤ËÁ÷¤ê¤Þ¤¹"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "¥Ð¡¼¥¸¥ç¥ó¾ðÊó¤òɽ¼¨¤·¤Æ½ªÎ»¤·¤Þ¤¹"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "»È¤¤Êý: %s [¥ª¥×¥·¥ç¥ó]... ¥Õ¥¡¥¤¥ë...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "TeX ¤Î°Ù¤Î¥½¡¼¥ÈºÑ¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤òÀ¸À®¤·¤Þ¤¹\n"
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3096,27 +3116,62 @@
 "\n"
 "¥ª¥×¥·¥ç¥ó:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: texinfo ¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "%s ¤ÎºÆ¥ª¡¼¥×¥ó¤Ë¼ºÇÔ"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: texinfo ¤Î¥¤¥ó¥Ç¥Ã¥¯¥¹¥Õ¥¡¥¤¥ë¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "%s ¤Ë¥Ú¡¼¥¸Èֹ椬¤¢¤ê¤Þ¤»¤ó"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "%s ¹àÌܤËÆó¤ÄÌܤιàÌÜ̾¤¬Â³¤¤¤Æ¤¤¤Þ¤¹"
 
+#, 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
@@ -3170,9 +3225,6 @@
 #~ 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' ¤¬¤Ê¤¯¡¢³ÈÄ¥»Ò¤¬¤Ä¤±¤é¤ì¤Æ¤¤¤Þ¤»¤ó"
 
Index: po/nb.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/nb.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- po/nb.po    8 Jun 2006 22:42:22 -0000       1.12
+++ po/nb.po    1 Jul 2007 18:43:36 -0000       1.13
@@ -21,7 +21,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.90\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2004-12-05 15:37+0100\n"
 "Last-Translator: Trond Endrestøl <address@hidden>\n"
 "Language-Team: Norwegian Bokmaal <address@hidden>\n"
@@ -29,6 +29,71 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: valget «%s» er flertydig\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: valget «%s» krever et argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent valg «--%s»\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukjent valg «%c%s»\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovlig valg -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldig valg -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: valget krever et argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: valget «-W %s» er flertydig\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Flytte forover et tegn"
@@ -240,38 +305,34 @@
 "\n"
 "* Menu: Noder med indekser som inneholder «%s»:\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Prøv --help for mer informasjon.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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"
-"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ingen innslag funnet for «%s»\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "  -b, --speech-friendly        vær vennlig ovenfor talesyntetisatorer.\n"
 
-#: info/info.c:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -307,6 +368,7 @@
 "  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"
@@ -346,8 +408,8 @@
 "  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:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -359,72 +421,72 @@
 "generelle spørsmål og diskusjoner til address@hidden"
 "Websida for Texinfo: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan ikke finne noden «%s»."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan ikke finne noden «(%s)%s»."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Kan ikke finne et vindu!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Markøren vises ikke innen dette vinduets node!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Kan ikke slette det siste vinduet."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Ingen meny i denne noden."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Ingen fotnoter i denne noden."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Ingen kryssreferanser i denne noden."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Ingen «%s»-peker for denne noden."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 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:684
+#: info/info.c:687
 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:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Bare et vindu."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Resulterende vindu ville blitt for lite."
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
 
@@ -869,91 +931,91 @@
 msgid "There is no function named `%s'"
 msgstr "Det finnes ingen funksjon ved navn «%s»"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "unøyaktig antall argumenter"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "Kan ikke åpne inputfilen «%s»"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "Kunne ikke opprette outputfila «%s»"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "feil ved skriving til «%s»"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "Feil ved lukking av outputfila «%s»"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "tastesekvensen er for lang"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "manglende tastesekvens"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NULL-tegn (\\000) er ikke tillatt"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NULL-tegn (^%c) er ikke tillatt"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "manglende handlingsnavn"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "avdeling for lang"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "Ukjent handling «%s»"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "handlingsnavn for langt"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "ekstra tegn følger handlingen «%s»"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "manglende variabelnavn"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "manglende «=» umiddelbart etter variabelnavn"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "variabelnavn for langt"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "verdi for lang"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "«%s», linje %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1058,7 +1120,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Sette skjermhøyde til (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1067,7 +1129,7 @@
 "   Kildefiler søkt gjennom for å lage denne filen inkluderer:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunne ikke manipulere filen %s.\n"
@@ -1134,7 +1196,7 @@
 msgid "Move to the start of the line"
 msgstr "Flytte til starten av linjen"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "neste"
 
@@ -1620,7 +1682,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Brukt internt av \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Tomt for virtuelt minne!\n"
@@ -1712,138 +1774,91 @@
 msgid " Subfile: %s"
 msgstr " Delfil: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: valget «%s» er flertydig\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: valget «--%s» tillater ikke et argument\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: valget «%c%s» tillater ikke et argument\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: valget «%s» krever et argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent valg «--%s»\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent valg «%c%s»\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovlig valg -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldig valg -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: valget krever et argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: valget «-W %s» er flertydig\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: valget «-W %s» tillater ikke et argument\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "argumentene til @%s ble ignorert"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "januar"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "februar"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "mai"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "august"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "desember"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "usannsynlig tegn %c i @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc-argument med store bokstaver, dermed ingen effekt"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "«{» forventet, men så «%c»"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "slutt-på-fila inne i verb-blokk"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "«{» forventet, men så «%c»"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1851,49 +1866,49 @@
 "@strong{Note...} lager en overflødig kryssreferanse i Info; skriv om for å "
 "unngå dette"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s er utgått"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp krever et positivt numerisk argument, ikke `%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Ugyldig argument til %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Ugyldig argument til @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "insert"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Ugyldig argument til @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1931,12 +1946,12 @@
 msgstr "Metode"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "av"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "på"
 
@@ -1969,8 +1984,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Se "
@@ -1993,7 +2008,7 @@
 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:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Fotnoter"
 
@@ -2002,64 +2017,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: kunne ikke åpne --css-file: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-file endte i en kommentar"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[uforventet] kunne ikke poppe neste htmltagg"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[uforventet] ugyldig nodenavn: «%s»"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Ukjent indeks «%s»"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indeksen «%s» eksisterer allerede"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr "(linje )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(linje %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Ukjent indeks «%s» i @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Innslag for indeksen «%s» utenfor node"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(utenfor noder)"
 
@@ -2163,37 +2178,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx er meningsløs innenfor en address@hidden"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s funnet utenfor en innsettingsblokk"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "ugjenkjennelig kodingsnavn «%s»"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "beklager, kodingen «%s» er ikke støttet"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "Ugyldig kodet tegn «%s»"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2208,56 +2228,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "her er den tidligere definisjonen av «%s»"
 
-#: makeinfo/macro.c:356
+#: 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"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend macro ikke funnet"
 
-#: makeinfo/macro.c:625
-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:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "umatchet @end %s med @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "For mange feil!  Ga opp.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: advarsel: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Feilplassert %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2265,7 +2289,7 @@
 "Oversette Texinfodokumentasjon til forskjellige andre formater:\n"
 "Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2292,7 +2316,7 @@
 "  -v, --verbose               forklare hva som blir gjort.\n"
 "      --version               vise programversjon og avslutte.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2307,7 +2331,7 @@
 "      --xml                 generere Texinfo XML i stedet for Info.\n"
 "      --plaintext           generere ren tekst i stedet for Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2342,7 +2366,7 @@
 "  -o, --output=FIL          sende output til FIL (eller katalog dersom "
 "splittet HTML),\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2381,7 +2405,7 @@
 "      --split-size=ANT        splitte Infofilene ved lengde ANT (standard %"
 "d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2395,7 +2419,7 @@
 "      --css-include=FIL         inkluder FIL i HTML <style>-taggen;\n"
 "                                  les stdin dersom FIL er -.\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2410,7 +2434,7 @@
 "                                  Dersom ANT er 0, blir ignorerbart tomrom "
 "ikke brukt.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2430,7 +2454,7 @@
 "  -U VAR                         udefiner variabelen VAR, som om @clear "
 "brukes.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2466,7 +2490,7 @@
 "  --no-iftex         ikke behandle @iftex og @tex.\n"
 "  --no-ifxml         ikke behandle @ifxml og @xml.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2480,7 +2504,7 @@
 "  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:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2507,81 +2531,76 @@
 "  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:615
+#: 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:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: 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"
 
-#: makeinfo/makeinfo.c:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filargument.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Flerlinjekommandoen %c%s brukes ikke riktig"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Forventet «%s»"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan ikke opprette katalogen «%s»: %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Ingen «%s» funnet i «%s»"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Lager %s-filen «%s» fra «%s».\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2589,114 +2608,119 @@
 "%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å "
 "bevare.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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"
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Ukjent kommando «%s»"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s forventet krøllparanteser"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Umatchet }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "INTET_NAVN!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s mangler avsluttende krøllparentes"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "«%s» er ingen fil"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image mangler filnavn"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "udefinert flagg: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Ingen verdi for «%s»}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s krever et navn"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Traff slutt-på-filen før matchende @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Manglende «}» i @multitable-mal"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignorerer løs tekst «%s» etter @multitable"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "For mange kolonner i multitabellrad (maks %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[uforventet] kan ikke velge kolonne #%d i multitabell"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerer @tab utenfor multitabell"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multikolonne-output fra siste rad:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolonne #%d output = %s\n"
@@ -2721,7 +2745,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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"
@@ -2731,7 +2755,7 @@
 msgstr ""
 "Denne @anchor-kommandoen ble ignorert, referanser til den vil ikke virke"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget"
 
@@ -2752,84 +2776,84 @@
 msgid "Up:"
 msgstr "Opp:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Meny"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Kryss"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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?)"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Denne noden (%s) har den dårlige forrigepekeren"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "forrige"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Forrigefeltet til noden «%s» er ikke pekt på"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Denne noden (%s) har den dårlige nestepekeren"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "`%s' har ingen Up-felt (kanskje feil inndeling?)"
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "opp"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "noden «%s» har blitt referert %d ganger"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ureferert node «%s»"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "Fjerner %s\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kan ikke slette filen «%s»: %s"
@@ -2869,20 +2893,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-fil «%s» er uleselig: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2927,30 +2943,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: advarsel: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " for %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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"
 
-#: util/install-info.c:434
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2971,11 +2987,18 @@
 "                     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"
@@ -3012,7 +3035,7 @@
 "                     fra informasjon i selve Infofilen.\n"
 " --version         vise programversjon og avslutte.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3048,99 +3071,101 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: tom fil"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: har allerede en dirfil: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Spesifiser infofilen bare en gang.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "overflødig argument på kommandolinjen «%s»"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Ingen innfil angitt; prøv --help for mer informasjon."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "ingen info-dir-oppføring i «%s»"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menypunktet «%s» eksisterer allerede for filen «%s»"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "vise denne hjelpen og avslutte"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "bevar midlertidige filer etter behandling"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ikke bevar midlertidige filer etter behandling (standard)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "sende utdata til FILE"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "vise programversjon og avslutte"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Bruksmåte: %s [VALG]... FIL...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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"
 
-#: util/texindex.c:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3149,27 +3174,54 @@
 "\n"
 "Valg:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ikke en texinfo-indeksfil"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "feil ved gjenåpning av %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ikke en texinfo-indeksfil"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Ingen sidenummer i %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, 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"
 
+#, 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)"
+
 # This translation is connected to the next one
 #~ msgid ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
Index: po/nl.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/nl.po,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- po/nl.po    8 Jun 2006 22:42:22 -0000       1.31
+++ po/nl.po    1 Jul 2007 18:43:36 -0000       1.32
@@ -10,7 +10,7 @@
 msgstr ""
 "Project-Id-Version: texinfo-4.7.94\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2005-03-09 10:50+0100\n"
 "Last-Translator: Freek de Kruijf <address@hidden>\n"
 "Language-Team: Dutch <address@hidden>\n"
@@ -20,6 +20,73 @@
 "X-Generator: KBabel 1.9.1\n"
 "Plural-Forms:  nplurals=2; plural=(n != 1);\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: optie `%s' is niet eenduidig\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: optie `--%s' staat geen argumenten toe\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: optie `%s' vereist een argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: onbekende optie `--%s'\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: onbekende optie `%c%s'\n"
+
+# Dit is de POSIX versie van de volgende melding
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ongeldige optie -- %c\n"
+
+# Dezelfde tekst als hiervoor
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ongeldige optie -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: optie vereist een argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: optie `-W %s' is niet eenduidig\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: optie `-W %s' staat geen argumenten toe\n"
+
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Beweeg een teken naar voren"
@@ -241,38 +308,34 @@
 "\n"
 "* Menu: Pagina's waarvan de indexen `%s' bevatten:\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Probeer --help voor meer informatie.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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"
 
-#: info/info.c:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "geen index-ingangen gevonden voor `%s'\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "  -b, --speech-friendly        wees vriendelijk voor spraaksynthesizers.\n"
 
-#: info/info.c:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -308,6 +371,7 @@
 "  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 ""
 "Aanroep: %s [OPTIE]... [MENU-ITEM...]\n"
@@ -360,8 +424,8 @@
 "  info -f ./foo.info           laat het bestand ./foo.info zien en zoekt "
 "niet in inhoud\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -374,72 +438,72 @@
 "Texinfo-homepagina: http://www.gnu.org/software/texinfo/\n";
 "Opmerkingen over de vertaling naar address@hidden"
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan pagina `%s' niet vinden."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan pagina `(%s)%s' niet vinden."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Kan een venster niet vinden!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Wijzer verschijnt niet binnen het paginavenster!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Kan het laatste venster niet verwijderen."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Er is geen menu op deze pagina."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Geen voetnoten in deze pagina."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Geen kruisverwijzingen in deze pagina."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Geen `%s' wijzer voor deze pagina."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Onbekend Info-commando `%c'; probeer `?' voor help."
 
-#: info/info.c:682
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Terminal type `%s' is niet krachtig genoeg voor Info."
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "U bent al bij de laatste subpagina van deze pagina."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "U bent al bij de eerste subpagina van deze pagina."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Slechts een venster."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Het resulterende venster zou te klein zijn."
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Niet genoeg ruimte voor een help-venster, verwijder een venster."
 
@@ -893,91 +957,91 @@
 msgid "There is no function named `%s'"
 msgstr "Er is geen functie met de naam `%s'"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "onjuist aantal argumenten"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "kan het invoerbestand `%s' niet openen"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "kan het uitvoerbestand `%s' niet aanmaken."
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "fout bij het schrijven naar `%s'"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "fout bij het sluiten van het uitvoerbestand `%s'"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "toetsenreeks te lang"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "ontbrekende toetsenreeks"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL karakter (\\000) niet toegestaan"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL karakter (^%c) niet toegestaan"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "ontbrekende actienaam"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "sectie te lang"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "onbekende actie `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "actienaam te lang"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "extra karakters na actie `%s'"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "ontbrekende naam van variabele"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "ontbrekende `=' onmiddelijk na naam van variabele"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "naam van variabele te lang"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "waarde te lang"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", regel %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1086,7 +1150,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Zet schermhoogte op (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1095,7 +1159,7 @@
 "   Bronbestanden veranderd om dit bestand in te voegen:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kon het bestand %s niet manipuleren.\n"
@@ -1163,7 +1227,7 @@
 msgid "Move to the start of the line"
 msgstr "Ga naar het begin van de regel"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Volgende"
 
@@ -1650,7 +1714,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Intern gebruikt door \\[universeel-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Geen virtueel geheugen meer!\n"
@@ -1747,140 +1811,91 @@
 msgid " Subfile: %s"
 msgstr " Sub-bestand: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: optie `%s' is niet eenduidig\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: optie `--%s' staat geen argumenten toe\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: optie `%c%s' staat geen argument toe\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: optie `%s' vereist een argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: onbekende optie `--%s'\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: onbekende optie `%c%s'\n"
-
-# Dit is de POSIX versie van de volgende melding
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ongeldige optie -- %c\n"
-
-# Dezelfde tekst als hiervoor
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ongeldige optie -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: optie vereist een argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: optie `-W %s' is niet eenduidig\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: optie `-W %s' staat geen argumenten toe\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "argumenten bij @%s genegeerd"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "januari"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "februari"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "maart"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "mei"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "jJuli"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "augustus"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "december"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "onwaarschijnlijk karakter %c in @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc argument alles hoofdletters, dus geen effect"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{' verwacht, maar `%c' gevonden"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "einde van bestand in een \"verb\"-blok"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}' verwacht, maar `%c' gevonden"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1888,49 +1903,49 @@
 "@strong{Noot...} produceert een zeldzame kruisverwijzing in Info; kies een "
 "ander woord om dat te vermijden"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s is verouderd"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp vereist een postief numeriek argument, niet `%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Fout argument voor %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "geen"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Fout argument voor @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "invoegen"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Fout argument voor @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1968,12 +1983,12 @@
 msgstr "Methode"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "van"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "aan"
 
@@ -2007,8 +2022,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Zie "
@@ -2033,7 +2048,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Voetnoten in een voetnoot zijn niet toegestaan"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Voetnoten"
 
@@ -2042,64 +2057,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: kan --css-bestand `%s' niet openen"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-bestand eindigt in commentaar"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[unexpected] geen html tag aanwezig"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[unexpected] ongeldige paginanaam: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Onbekende index `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info kan `:' in een indexingang niet aan `%s'"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Index `%s' bestaat al"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Onbekende index `%s' en/of `%s' in @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr "(regel )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(regel %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Onbekende index `%s' in @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Ingang voor index `%s' is buiten elke pagina"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(buiten elke pagina)"
 
@@ -2206,37 +2221,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx is zinloos in een `%s' blok"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s buiten een invoeg-blok gevonden"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s is geen geldige ISO 639 taalcode"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "onbekende encodingnaam `%s'"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "sorry, encoding `%s' wordt niet ondersteund"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ongeldig geëncodeerd karakter `%s'"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s verwacht `i' of `j' als argument, niet `%c'"
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2251,56 +2271,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "hier is de vorige definitie van `%s'"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "\\ in macro-expansie gevolgd door `%s' in plaats van parameternaam"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Macro `%s' in regel %d aangeroepen met te veel argumenten"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend makro niet gevonden"
 
-#: makeinfo/macro.c:625
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg is alleen nuttig als de macro slechts één argument 
verwacht"
+#: 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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "niet overeenkomend @end %s met @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Te veel fouten!  Gestopt.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: waarschuwing: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Verkeerd geplaatste %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Probeer `%s --help' voor meer informatie.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Aanroep: %s [OPTIE]... TEXINFO-BESTAND...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2310,7 +2334,7 @@
 "\"info\"-bestanden geschikt om online te lezen met Emacs of het "
 "onafhankelijke GNU-info.\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2338,7 +2362,7 @@
 "  -v, --verbose               laat zien wat er gedaan wordt.\n"
 "      --version               laat de versie zien en beëindig.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2353,7 +2377,7 @@
 "      --xml                 uitvoer Texinfo XML in plaats van Info.\n"
 "      --plaintext           uitvoer platte tekst in plaats van Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2386,7 +2410,7 @@
 "  -o, --output=BESTAND      schrijf naar BESTAND (map indien gesplitste "
 "HTML),\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2426,7 +2450,7 @@
 "      --split-size=NUM        splits Info-bestanden bij de grootte NUM "
 "(standaard %d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2442,7 +2466,7 @@
 "                                  lees standaardinvoer (stdin) als BESTAND "
 "is -.\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2457,7 +2481,7 @@
 "                                  Als VAL 0 is, witruimte die weggelaten mag "
 "worden vervalt.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2474,7 +2498,7 @@
 "  -U VAR                        verwijder de definitie van variabele VAR, "
 "zoals in @clear.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2512,7 +2536,7 @@
 "\n"
 "  Ook, voor de --no-ifFORMAT opties, verwerk geen @ifnotFORMAT tekst.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2528,7 +2552,7 @@
 "niet-waar;\n"
 "  als XML gemaakt wordt, --ifxml is waar en de anderen zijn niet-waar.\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2561,86 +2585,81 @@
 "  makeinfo --no-split foo.texi          maak één Info bestand ongeacht de "
 "grootte\n"
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s: Negeert onbegrijpelijke TEXINFO_OUTPUT_FORMAT waarde `%s'.\n"
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s argument moet numeriek zijn, niet `%s'.\n"
 
 # Vanaf hier
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: kon uitvoer `%s' voor macro-expansie niet openen"
 
 # Vanaf hier
-#: makeinfo/makeinfo.c:681
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: tweede uitvoer voor makro-expansie `%s' genegeerd.\n"
 
-#: makeinfo/makeinfo.c:728
+#: 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"
 
-#: makeinfo/makeinfo.c:753
+#: makeinfo/makeinfo.c:757
 #, 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"
 
-#: makeinfo/makeinfo.c:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ontbrekend bestandsargument.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Multi-regel commando %c%s onjuist gebruikt"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Verwachtte `%s'"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan map `%s': %s niet aanmaken"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Geen `%s' gevonden in `%s'"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Macro-expansie naar de standaard uitvoer overgeslagen, want de uitvoer\n"
 "van Info gaat daar al heen.\n"
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, 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:1697
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Dit is %s, gemaakt door makeinfo versie %s van %s.\n"
-
-#: makeinfo/makeinfo.c:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2648,114 +2667,119 @@
 "%s: macro-uitvoerbestand `%s' verwijderd wegens fouten; gebruik --force om "
 "te bewaren.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr ""
 "%s: uitvoerbestand `%s' verwijderd wegens fouten; gebruik --force om te "
 "bewaren.\n"
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Onbekend commando `%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "Gebruik `{...}' om een commando als argument mee te geven aan @%s"
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s verwachtte `{...}'"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Geen tegenhanger van }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "GEEN_NAAM!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ontbrekende afsluitende accolade"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "Dit is %s, gemaakt door makeinfo versie %s van %s.\n"
+
+#: makeinfo/makeinfo.c:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image bestand `%s' (voor HTML) is niet leesbaar: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Geen bestand `%s' gevonden"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image bestand `%s' (voor tekst) is niet leesbaar: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "ontbrekend bestandsnaam argument voor @image"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "ongedefinieerde vlag: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Geen waarde voor `%s'}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s vereist een naam"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Bereikte bestandseinde vòòr een bijbehorend @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' is te lang voor expansie; niet geëxpandeerd"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Ontbrekende } in @multitable sjabloon"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "verloren tekst `%s' na @multitable genegeerd"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Te veel kolommen in `multitable' item (maximaal %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[unexpected] kan kolom #%d niet selecteren in `multitabel'"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "@tab buiten een `multitable' genegeerd"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** `Multikolom' uitvoer van de laatste rij:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolom #%d: uitvoer = %s\n"
@@ -2780,7 +2804,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Geen paginanaam gespecificeerd voor `%c%s' commando"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Het anker `%s' en pagina `%s' verwijzen naar dezelfde bestandsnaam"
@@ -2789,7 +2813,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "Dit @anchor commando is genegeerd; verwijzing ernaar werkt niet"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Geef dit anker een andere naam of gebruik de `--no-split' optie"
 
@@ -2810,69 +2834,69 @@
 msgid "Up:"
 msgstr "Omhoog:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Ankers `%s' en `%s' verwijzen naar dezelfde bestandsnaam"
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor commando is genegeerd; verwijzing ernaar werkt niet"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%s verwijst naar niet-bestaande pagina `%s' (misschien een onjuiste "
 "sectieindeling?)"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menu"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Kruis"
 
 # 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:1448
+#: makeinfo/node.c:1461
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 "Het `next'-veld van pagina `%s' wijst nergens naar (misschien een onjuiste "
 "sectieindeling?)"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Deze pagina (%s) is degene met het foute `vorige'-veld"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Vorige"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Het `vorige'-veld van pagina `%s' wijst nergens naar"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Deze pagina (%s) is degene met het foute `volgende'-veld"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "`%s' heeft geen `omhoog'-veld (misschien foute sectie indeling?)"
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Omhoog"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
@@ -2881,22 +2905,22 @@
 
 # Eigenlijk zouden hier de %s en de %d omgedraaid moeten worden:
 # `Er wordt %d keer naar %s verwezen'
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "er wordt naar pagina `%s' %d keer verwezen"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "naar pagina `%s' wordt niet verwezen"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "%s verwijderd\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kan bestand `%s': %s niet verwijderen"
@@ -2936,20 +2960,12 @@
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctop wordt voor %cnode gebruikt, de standaard %s wordt nu gebruikt"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Inhoudsopgave"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Korte inhoud"
-
-#: makeinfo/xml.c:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image bestand `%s' onleesbaar: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2994,30 +3010,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: waarschuwing: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " voor %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -3038,11 +3054,18 @@
 "                     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 [OPTIE]... [INFO-BESTAND [INHOUD-BESTAND]]\n"
@@ -3079,7 +3102,7 @@
 "                    in het Info bestand zelf gehaald.\n"
 "--version         geef de versie en beëindig.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3117,100 +3140,102 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: kan (%s) niet lezen en kan (%s) niet aanmaken\n"
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: leeg bestand"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY zonder overeenkomende START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: heeft reeds inhoudbestand: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Geef het Info-bestand slechts een keer.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "commandoregel-argument `%s' is overbodig"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Geen invoerbestand gegeven; probeer --help voor meer informatie."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "Geen inhoudbestand gegeven; probeer --help voor meer informatie."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "geen info inhoudsingang in `%s'"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menukeuze `%s' bestaat al, voor bestand `%s'"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "geen ingangen voor `%s' gevonden; niets verwijderd"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "geef deze hulp en beëindig"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "behoudt tijdelijke bestanden na verwerking"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "behoudt de tijdelijke bestanden na verwerking niet (standaard)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "stuur uitvoer naar BESTAND"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "geef versie en beëindig"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Aanroep: %s [OPTIE]... BESTAND...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Maak een gesorteerde index voor elk TeX uitvoerbestand.\n"
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, c-format
 msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n"
 msgstr ""
 "Normaal gesproken is BESTAND... gespecificeerd als `foo.%c%c' voor een "
 "dokument `foo.texi'.\n"
 
-#: util/texindex.c:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3219,28 +3244,56 @@
 "\n"
 "Opties:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: geen texinfo inhoudbestand"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "fout bij het heropenen van %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: geen texinfo inhoudbestand"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Geen paginanummer in %s"
 
 # FIXME: secondary
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "ingang %s volgt een ingang met een alternatieve naam"
 
+#, 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"
+#~ "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"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr ""
+#~ "@quote-arg is alleen nuttig als de macro slechts één argument verwacht"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Inhoudsopgave"
+
+#~ msgid "Short Contents"
+#~ msgstr "Korte inhoud"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "behoudt tijdelijke bestanden na verwerking"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "behoudt de tijdelijke bestanden na verwerking niet (standaard)"
+
 #~ msgid ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
Index: po/no.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/no.po,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- po/no.po    8 Jun 2006 22:42:22 -0000       1.30
+++ po/no.po    1 Jul 2007 18:43:36 -0000       1.31
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: Texinfo 4.6\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2003-07-14 13:13+02:00\n"
 "Last-Translator: Trond Endrestøl <address@hidden>\n"
 "Language-Team: Norwegian-bokmål <address@hidden>\n"
@@ -14,6 +14,71 @@
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: valget «%s» er flertydig\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: valget «%s» krever et argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ukjent valg «--%s»\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ukjent valg «%c%s»\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ulovlig valg -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ugyldig valg -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: valget krever et argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: valget «-W %s» er flertydig\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Flytte forover et tegn"
@@ -225,37 +290,33 @@
 "\n"
 "* Menu: Noder med indekser som inneholder «%s»:\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Prøv --help for mer informasjon.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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"
-"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ingen innslag funnet for «%s»\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "  -b, --speech-friendly        vær vennlig ovenfor talesyntetisatorer.\n"
 
-#: info/info.c:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -292,6 +353,7 @@
 "  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"
@@ -334,8 +396,8 @@
 "Send bugrapport til address@hidden,\n"
 "generelle spørsmål og diskusjoner til address@hidden"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -347,72 +409,72 @@
 "generelle spørsmål og diskusjoner til address@hidden"
 "Websida for Texinfo: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan ikke finne noden «%s»."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan ikke finne noden «(%s)%s»."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Kan ikke finne et vindu!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Markøren vises ikke innen dette vinduets node!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Kan ikke slette det siste vinduet."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Ingen meny i denne noden."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Ingen fotnoter i denne noden."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Ingen kryssreferanser i denne noden."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Ingen «%s»-peker for denne noden."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 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:684
+#: info/info.c:687
 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:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Bare et vindu."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Resulterende vindu ville blitt for lite."
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
 
@@ -857,91 +919,91 @@
 msgid "There is no function named `%s'"
 msgstr "Det finnes ingen funksjon ved navn «%s»"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "unøyaktig antall argumenter"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "Kan ikke åpne inputfilen «%s»"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "Kunne ikke opprette outputfila «%s»"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "feil ved skriving til «%s»"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "Feil ved lukking av outputfila «%s»"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "tastesekvensen er for lang"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "manglende tastesekvens"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NULL-tegn (\\000) er ikke tillatt"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NULL-tegn (^%c) er ikke tillatt"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "manglende handlingsnavn"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "avdeling for lang"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "Ukjent handling «%s»"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "handlingsnavn for langt"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "ekstra tegn følger handlingen «%s»"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "manglende variabelnavn"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "manglende «=» umiddelbart etter variabelnavn"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "variabelnavn for langt"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "verdi for lang"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "«%s», linje %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1046,7 +1108,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Sette skjermhøyde til (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1055,7 +1117,7 @@
 "   Kildefiler søkt gjennom for å lage denne filen inkluderer:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunne ikke manipulere filen %s.\n"
@@ -1122,7 +1184,7 @@
 msgid "Move to the start of the line"
 msgstr "Flytte til starten av linjen"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "neste"
 
@@ -1608,7 +1670,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Brukt internt av \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Tomt for virtuelt minne!\n"
@@ -1700,186 +1762,139 @@
 msgid " Subfile: %s"
 msgstr " Delfil: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: valget «%s» er flertydig\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: valget «--%s» tillater ikke et argument\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: valget «%c%s» tillater ikke et argument\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: valget «%s» krever et argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ukjent valg «--%s»\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ukjent valg «%c%s»\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ulovlig valg -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ugyldig valg -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: valget krever et argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: valget «-W %s» er flertydig\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: valget «-W %s» tillater ikke et argument\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "Ugyldig argument til %c%s"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "januar"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "februar"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "mai"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "august"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "desember"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "usannsynlig tegn %c i @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc-argument med store bokstaver, dermed ingen effekt"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "«{» forventet, men så «%c»"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "slutt-på-fila inne i verb-blokk"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "«{» forventet, men så «%c»"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s er utgått"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp krever et positivt numerisk argument, ikke `%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Ugyldig argument til %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "Ugyldig argument til %c%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "insert"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Ugyldig argument til %c%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1917,12 +1932,12 @@
 msgstr "Metode"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "av"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "på"
 
@@ -1955,8 +1970,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Se "
@@ -1979,7 +1994,7 @@
 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:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Fotnoter"
 
@@ -1988,64 +2003,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: kunne ikke åpne --css-file: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-file endte i en kommentar"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Uten navn"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[uforventet] kunne ikke poppe neste htmltagg"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[uforventet] ugyldig nodenavn: «%s»"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Ukjent indeks «%s»"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indeksen «%s» eksisterer allerede"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Ukjent indeks «%s» i @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Innslag for indeksen «%s» utenfor node"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(utenfor noder)"
 
@@ -2149,37 +2164,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx er meningsløs innenfor en «%s»-blokk"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s funnet utenfor en innsettingsblokk"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "ugjenkjennelig kodingsnavn «%s»"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "beklager, kodingen «%s» er ikke støttet"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "Ugyldig kodet tegn «%s»"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2194,56 +2214,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "her er den tidligere definisjonen av «%s»"
 
-#: makeinfo/macro.c:356
+#: 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"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend macro ikke funnet"
 
-#: makeinfo/macro.c:625
-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:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "umatchet @end %s med @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "For mange feil!  Ga opp.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: advarsel: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Feilplassert %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prøv «%s --help» for mer informasjon.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2251,7 +2275,7 @@
 "Oversette Texinfodokumentasjon til forskjellige andre formater:\n"
 "Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2278,7 +2302,7 @@
 "  -v, --verbose               forklare hva som blir gjort.\n"
 "      --version               vise programversjon og avslutte.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2292,7 +2316,7 @@
 "      --html                generere HTML i stedet for Info.\n"
 "      --xml                 generere Texinfo XML i stedet for Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2328,7 +2352,7 @@
 "splittet HTML),\n"
 
 # Denne mangler oversettelse, må rettes snarest.
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2368,7 +2392,7 @@
 "      --split-size=ANT        splitte Infofilene ved lengde ANT (standard %"
 "d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2382,7 +2406,7 @@
 "      --css-include=FIL         inkluder FIL i HTML <style>-taggen;\n"
 "                                  les stdin dersom FIL er -.\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2395,7 +2419,7 @@
 "      --css-include=FIL         inkluder FIL i HTML <style>-taggen;\n"
 "                                  les stdin dersom FIL er -.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2415,7 +2439,7 @@
 "  -U VAR                         udefiner variabelen VAR, som om @clear "
 "brukes.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2449,7 +2473,7 @@
 "  --no-iftex         ikke behandle @iftex og @tex.\n"
 "  --no-ifxml         ikke behandle @ifxml og @xml.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2463,7 +2487,7 @@
 "  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:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2490,81 +2514,76 @@
 "  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:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "Kunne ikke åpne filen «%s» for utskrift av makroekspansjon"
 
-#: makeinfo/makeinfo.c:681
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "Kunne ikke åpne filen «%s» for utskrift av makroekspansjon"
 
-#: makeinfo/makeinfo.c:728
+#: 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"
 
-#: makeinfo/makeinfo.c:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: mangler filargument.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Forventet «%s»"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan ikke opprette katalogen «%s»: %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Ingen «%s» funnet i «%s»"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Lager %s-filen «%s» fra «%s».\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2572,114 +2591,119 @@
 "%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å "
 "bevare.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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"
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Ukjent kommando «%s»"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s forventet krøllparanteser"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Umatchet }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "INTET_NAVN!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s mangler avsluttende krøllparentes"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "«%s» er ingen fil"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image mangler filnavn"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "udefinert flagg: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Ingen verdi for «%s»}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s krever et navn"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Traff slutt-på-filen før matchende @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Manglende «}» i @multitable-mal"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignorerer løs tekst «%s» etter @multitable"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "For mange kolonner i multitabellrad (maks %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[uforventet] kan ikke velge kolonne #%d i multitabell"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerer @tab utenfor multitabell"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Multikolonne-output fra siste rad:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolonne #%d output = %s\n"
@@ -2704,7 +2728,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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"
@@ -2714,7 +2738,7 @@
 msgstr ""
 "Denne @anchor-kommandoen ble ignorert, referanser til den vil ikke virke"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget"
 
@@ -2735,84 +2759,84 @@
 msgid "Up:"
 msgstr "Opp:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Meny"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Kryss"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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?)"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Denne noden (%s) har den dårlige forrigepekeren"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "forrige"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Forrigefeltet til noden «%s» er ikke pekt på"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Denne noden (%s) har den dårlige nestepekeren"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "`%s' har ingen Up-felt (kanskje feil inndeling?)"
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "opp"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "noden «%s» har blitt referert %d ganger"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ureferert node «%s»"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kan ikke opprette katalogen «%s»: %s"
@@ -2852,20 +2876,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-fil «%s» er uleselig: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2907,30 +2923,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "Det første argumentet til @inforef kan ikke være tomt"
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: advarsel: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " for %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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"
 
-#: util/install-info.c:434
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2951,11 +2967,18 @@
 "                     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"
@@ -2992,7 +3015,7 @@
 "                     fra informasjon i selve Infofilen.\n"
 " --version         vise programversjon og avslutte.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3028,99 +3051,101 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: tom fil"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Spesifiser infofilen bare en gang.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "overflødig argument på kommandolinjen «%s»"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Ingen innfil angitt; prøv --help for mer informasjon."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "ingen info-dir-oppføring i «%s»"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menypunktet «%s» eksisterer allerede for filen «%s»"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "vise denne hjelpen og avslutte"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "bevar midlertidige filer etter behandling"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ikke bevar midlertidige filer etter behandling (standard)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "sende utdata til FILE"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "vise programversjon og avslutte"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Bruksmåte: %s [VALG]... FIL...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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"
 
-#: util/texindex.c:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3129,27 +3154,54 @@
 "\n"
 "Valg:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ikke en texinfo-indeksfil"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "feil ved gjenåpning av %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ikke en texinfo-indeksfil"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Ingen sidenummer i %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, 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"
 
+#, 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)"
+
 # This translation is connected to the next one
 #~ msgid ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
Index: po/pl.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/pl.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- po/pl.po    8 Jun 2006 22:42:22 -0000       1.12
+++ po/pl.po    1 Jul 2007 18:43:36 -0000       1.13
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.90\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2004-12-05 12:24+0100\n"
 "Last-Translator: Jakub Bogusz <address@hidden>\n"
 "Language-Team: Polish <address@hidden>\n"
@@ -15,6 +15,71 @@
 "Content-Type: text/plain; charset=ISO-8859-2\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opcja `%s' jest niejednoznaczna\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: opcja `--%s' nie przyjmuje argumentów\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: opcja `%c%s' nie przyjmuje argumentów\n"
+
+#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opcja `%s' wymaga argumentu\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: nierozpoznana opcja `--%s'\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: nierozpoznana opcja `%c%s'\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: nieprawid³owa opcja -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: b³êdna opcja -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opcja wymaga argumentu -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: opcja `-W %s' nie przyjmuje argumentu\n"
+
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Przesuniêcie do przodu o znak"
@@ -224,38 +289,33 @@
 "\n"
 "* Menu: Wêz³y, których indeksy zawieraj± `%s':\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Wiêcej informacji mo¿na uzyskaæ przez --help.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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"
-"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"
 
-#: info/info.c:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "nie znaleziono wpisów w indeksie dla `%s'\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr "  -b, --speech-friendly        tryb przyjazny dla syntezatorów mowy.\n"
 
-#: info/info.c:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -291,6 +351,7 @@
 "  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 ""
 "Sk³adnia: %s [OPCJA]... [ELEMENT-MENU...]\n"
@@ -339,8 +400,8 @@
 "  info -f ./foo.info         pokazanie pliku ./foo.info, z pominiêciem "
 "katalogu\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -352,72 +413,72 @@
 "address@hidden, ogólne pytania i dyskusjê na address@hidden"
 "Strona domowa texinfo: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Nie mo¿na znale¼æ wêz³a `%s'."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Nie mo¿na znale¼æ wêz³a `(%s)%s'."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Nie mo¿na znale¼æ okna!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Kropka nie wystêpuje w wê¼le z tego okna!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Nie mo¿na usun±æ ostatniego okna."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Brak menu w tym wê¼le."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Brak przypisów w tym wê¼le."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Brak odsy³aczy w tym wê¼le."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Brak wska¼nika `%s' dla tego wêz³a."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Nieznane polecenie Info `%c'; `?' przywo³uje pomoc."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "To ju¿ jest ostatnia strona tego wêz³a."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "To ju¿ jest pierwsza strona tego wêz³a."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Tylko jedno okno."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Wynikowe okno by³oby zbyt ma³e."
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "Za ma³o miejsca na okno pomocy, proszê usun±æ okno."
 
@@ -857,91 +918,91 @@
 msgid "There is no function named `%s'"
 msgstr "Nie ma funkcji o nazwie `%s'"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "b³êdna liczba argumentów"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "nie mo¿na otworzyæ pliku wej¶ciowego `%s'"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "nie mo¿na utworzyæ pliku wyj¶ciowego `%s'"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "b³±d podczas zapisu do `%s'"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "b³±d podczas zamykania pliku wyj¶ciowego `%s'"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "sekwencja klawiszy zbyt d³uga"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "brak sekwencji klawiszy"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "znak NUL (\\000) nie jest dozwolony"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "znak NUL (^%c) nie jest dozwolony"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "brakuj±ca nazwa akcji"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "sekcja zbyt d³uga"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "nieznana akcja `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "nazwa akcji zbyt d³uga"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "nadmiarowe znaki po akcji `%s'"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "brakuj±ca nazwa zmiennej"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "brakuj±cy `=' bezpo¶rednio po nazwie zmiennej"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "nazwa zmiennej zbyt d³uga"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "warto¶æ zbyt d³uga"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", linia %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1045,7 +1106,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Ustawienie wysoko¶ci ekranu na (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1054,7 +1115,7 @@
 "   Pliki ¼ród³owe przeszukane, aby ten plik zawiera³:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Nie mo¿na obrabiaæ pliku %s.\n"
@@ -1122,7 +1183,7 @@
 msgid "Move to the start of the line"
 msgstr "Przej¶cie na pocz±tek linii"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Nastêpny"
 
@@ -1605,7 +1666,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Wewnêtrznie u¿ywane przez \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Zabrak³o pamiêci wirtualnej!\n"
@@ -1695,138 +1756,91 @@
 msgid " Subfile: %s"
 msgstr " Podplik: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opcja `%s' jest niejednoznaczna\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opcja `--%s' nie przyjmuje argumentów\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opcja `%c%s' nie przyjmuje argumentów\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opcja `%s' wymaga argumentu\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: nierozpoznana opcja `--%s'\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: nierozpoznana opcja `%c%s'\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: nieprawid³owa opcja -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: b³êdna opcja -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opcja wymaga argumentu -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opcja `-W %s' jest niejednoznaczna\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opcja `-W %s' nie przyjmuje argumentu\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "zignorowano argumenty dla @%s"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "stycznia"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "lutego"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "marca"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "kwietnia"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "maja"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "czerwca"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "lipca"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "sierpnia"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "wrze¶nia"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "pa¼dziernika"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "listopada"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "grudnia"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "niechciany znak %c w @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argument @sc zawiera same wielkie litery, wiêc brak efektu"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "oczekiwano `{', ale napotkano `%c'"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "koniec pliku wewn±trz bloku verb"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "oczekiwano `}', ale napotkano `%c'"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1834,49 +1848,49 @@
 "@string{Note...} tworzy nieprawdziwe odniesienia w Info; nale¿y "
 "przeredagowaæ aby zapobiec temu"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s jest przestarza³e"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, 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:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Z³y argument dla %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "zachowaj"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "brak"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Z³y argument dla @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "wstaw"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Z³y argument dla @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1914,12 +1928,12 @@
 msgstr "Metoda"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "typu"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "na"
 
@@ -1952,8 +1966,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Patrz "
@@ -1976,7 +1990,7 @@
 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:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Przypisy"
 
@@ -1985,64 +1999,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: plik css zakoñczy³ siê wewn±trz komentarza"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Bez tytu³u"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[nieoczekiwane] brak znacznika html do zdjêcia"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[nieoczekiwane] b³êdna nazwa wêz³a: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Nieznany indeks `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indeks `%s' ju¿ istnieje"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr "(linia )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(linia %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Nieznany indeks `%s' w @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Wpis dla indeksu `%s' poza jakimkolwiek wêz³em"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(poza jakimkolwiek wêz³em)"
 
@@ -2145,37 +2159,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx nic nie znaczy wewn±trz bloku `%s'"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "znaleziono %c%s na zewn±trz bloku wstawki"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nierozpoznana nazwa kodowania `%s'"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "niestety kodowanie `%s' nie jest obs³ugiwane"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "b³êdnie zakodowany znak `%s'"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2190,56 +2209,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "oto poprzednia definicja `%s'"
 
-#: makeinfo/macro.c:356
+#: 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"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "nie znaleziono makra %cend"
 
-#: makeinfo/macro.c:625
-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 ""
 
-#: makeinfo/macro.c:661
+#: 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 "niedopasowane @end %s do @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Zbyt du¿o b³êdów! Poddajê siê.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: uwaga: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "¬le umieszczone %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Polecenie `%s --help' poda wiêcej informacji.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Sk³adnia: %s [OPCJA]... PLIK-TEXINFO...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2249,7 +2272,7 @@
 "samodzielnym\n"
 "GNU Info.\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2277,7 +2300,7 @@
 "      --version               wy¶wietlenie informacji o wersji i "
 "zakoñczenie.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2292,7 +2315,7 @@
 "      --xml                 wyprodukowanie Texinfo XML zamiast Info.\n"
 "      --plaintext           wyprodukowanie czystego tekstu zamiast Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2325,7 +2348,7 @@
 "dzielonego\n"
 "                              HTML), ignoruj±c wszelkie @setfilename.\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2366,7 +2389,7 @@
 "      --split-size=ROZMIAR    podzia³ Info na pliki o ROZMIARZE (domy¶lnie %"
 "d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2381,7 +2404,7 @@
 "                                  je¶li PLIK to -, czytane jest standardowe\n"
 "                                  wej¶cie\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2397,7 +2420,7 @@
 "s±\n"
 "                                  usuwane.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2416,7 +2439,7 @@
 "  -U ZMIENNA                    usuniêcie definicji ZMIENNEJ, tak jak "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2457,7 +2480,7 @@
 "\n"
 "  Ponadto opcje --no-ifFORMAT powoduj± przetwarzanie tekstu @ifnotFORMAT.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2472,7 +2495,7 @@
 "wy³±czone;\n"
 "  je¶li generowany jest XML, --ifxml jest w³±czone, a reszta wy³±czona.\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2506,81 +2529,76 @@
 "  makeinfo --no-split foo.texi          zapisanie jednego wielkiego pliku "
 "Info\n"
 
-#: makeinfo/makeinfo.c:615
+#: 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:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: brakuj±cy argument plikowy.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Niew³a¶ciwie u¿yte wieloliniowe polecenie %c%s"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Oczekiwano `%s'"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Nie mo¿na utworzyæ katalogu `%s': %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Nie znaleziono `%s' w `%s'"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Tworzenie pliku %s `%s' z `%s'.\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2588,115 +2606,120 @@
 "%s: Usuwanie pliku wyj¶cia makr `%s' z powodu b³êdów; --force pozwoli "
 "zachowaæ.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Nieznane polecenie `%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s oczekiwa³o nawiasów klamrowych"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Niedopasowany }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "BEZ_NAZWY!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "w %c%s brakuje klamry zamykaj±cej"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "Plik @image `%s' (dla HTML) nieczytelny: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Nie ma pliku `%s'"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "Plik @image `%s' (dla tekstu) nieczytelny: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "Po @image brakuje argumentu plikowego"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "niezdefiniowana flaga: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Brak warto¶ci dla `%s'}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s wymaga nazwy"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Osi±gniêto koniec pliku przed znalezieniem @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' jest zbyt d³ugie do rozwiniêcia; nie rozwiniêto"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Brakuj±cy } we wzorcu @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "zignorowano zab³±kany tekst `%s' po @multitable"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Zbyt du¿o kolumn w elemencie multitable (maksymalnie %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[nieoczekiwane] nie mo¿na wybraæ kolumny #%d w multitable"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "zignorowano @tab poza multitable"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Wielokolumnowe wyj¶cie z ostatniego wiersza:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolumna #%d: wyj¶cie = %s\n"
@@ -2721,7 +2744,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Nie podano nazwy wêz³a dla polecenia `%c%s'"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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"
@@ -2730,7 +2753,7 @@
 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:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Nale¿y zmieniæ ten znacznik lub u¿yæ opcji `--no-split'"
 
@@ -2751,85 +2774,85 @@
 msgid "Up:"
 msgstr "W górê:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 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:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menu"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Odsy³acz"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Ten wêze³ (%s) ma z³e pole Poprzedni"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Poprzedni"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Pole Poprzedni wêz³a `%s' nie wskazywane"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Ten wêze³ (%s) ma z³e pole Nastêpny"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, 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:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "W górê"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "wêze³ `%s' by³ wskazywany %d razy"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "nie wskazywany wêze³ `%s'"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "Usuwanie %s\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Nie mo¿na usun±æ pliku `%s': %s"
@@ -2869,20 +2892,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Plik @image `%s' nieczytelny: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2927,30 +2942,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: uwaga: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " dla %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2971,11 +2986,18 @@
 "                     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 ""
 "Sk³adnia: %s [OPCJA]... [PLIK-INFO [PLIK-KATALOGU]]\n"
@@ -3014,7 +3036,7 @@
 "                     informacji w samym pliku Info.\n"
 " --version         wy¶wietlenie informacji o wersji i zakoñczenie.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3050,100 +3072,102 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: pusty plik"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY bez odpowiadaj±cego START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: plik katalogu ju¿ istnieje: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Nale¿y podaæ plik Info tylko raz.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "nadmiarowy argument linii poleceñ `%s'"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Nie podano pliku wej¶ciowego; --help mo¿e podaæ wiêcej informacji."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "Nie podano pliku katalogu; --help mo¿e podaæ wiêcej informacji."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "brak wpisu do katalogu info w `%s'"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "element menu `%s' ju¿ istnieje, dla pliku `%s'"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "nie znaleziono wpisów dla `%s'; nic nie usuniêto"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "wy¶wietlenie tego opisu i zakoñczenie"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "zachowanie plików tymczasowych po przetwarzaniu"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "nie zachowywanie plików tymczasowych po przetwarzaniu (domy¶lne)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "zapisanie wyj¶cia do PLIKU"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "wy¶wietlenie informacji o wersji i zakoñczenie"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Sk³adnia: %s [OPCJA]... PLIK...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3152,27 +3176,55 @@
 "\n"
 "Opcje:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: nie jest plikiem indeksu texinfo"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "b³±d podczas ponownego otwierania %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: nie jest plikiem indeksu texinfo"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Brak numeru strony w %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "wpis %s wyst±pi³ po wpisie z dodatkow± nazw±"
 
+#, 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"
+#~ "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"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote-arg jest u¿yteczne tylko do makr jednoargumentowych"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Spis tre¶ci"
+
+#~ msgid "Short Contents"
+#~ msgstr "Skrót tre¶ci"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "zachowanie plików tymczasowych po przetwarzaniu"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "nie zachowywanie plików tymczasowych po przetwarzaniu (domy¶lne)"
+
 #~ msgid ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
Index: po/ro.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/ro.po,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- po/ro.po    8 Jun 2006 22:42:22 -0000       1.20
+++ po/ro.po    1 Jul 2007 18:43:36 -0000       1.21
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2005-05-03 12:00+05\n"
 "Last-Translator: Laurentiu Buzdugan <address@hidden>\n"
 "Language-Team: Romanian <address@hidden>\n"
@@ -17,6 +17,71 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: opþiunea `%s' este ambiguã\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: opþiunea `%s' necesitã un argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: opþiune nerecunoscutã `--%s'\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: opþiune nerecunoscutã `%c%s'\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: opþiune ilegalã -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: opþiune invalidã -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: opþiunea necesitã un argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: opþiunea `-W %s' este ambiguã\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Mergi înainte un caracter"
@@ -228,39 +293,35 @@
 "\n"
 "* Meniu: Noduri a cãror indexurile conþin `%s':\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Încercaþi --help pentru informaþii suplimentare.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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"
-"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:501
+#: info/info.c:503
 #, 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:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "  -b, --speech-friendly        fii prietenos cu sintetizatoarele de "
 "vorbire.\n"
 
-#: info/info.c:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -296,6 +357,7 @@
 "  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"
@@ -343,8 +405,8 @@
 "                               comandã pentru emacs\n"
 "  info -f ./foo.info        aratã fiºierul ./foo.info, nu cãuta dir\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -356,72 +418,72 @@
 "întrebãri generale ºi discuþii la address@hidden"
 "Texinfo homepage: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Nu pot gãsi nodul `%s'."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Nu pot gãsi nodul `(%s)%s'."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Nu pot gãsi o fereastrã!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Punctul nu apare în interiorul nodului acestei ferestre!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Nu pot ºterge ultima fereastrã."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Nici un meniu în acest nod"
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Nici o notã de subsol în acest nod."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Nici un pointer `%s' pentru acest nod."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Comandã Info necunoscutã `%c';încercaþi `?' pentru ajutor."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "Sunteþi deja la ultima paginã a acestui nod."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "Sunteþi deja la prima paginã a acestui nod."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "O singurã fereastrã."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Fereastra rezultantã ar fi prea micã."
 
-#: info/info.c:687
+#: info/info.c:690
 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ã."
 
@@ -862,91 +924,91 @@
 msgid "There is no function named `%s'"
 msgstr "Nu existã nii o funcþie numitã `%s'"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "numãr incorect de argumente"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "nu pot deschide fiºierul de intrare `%s'"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "nu pot crea fiºierul de ieºire `%s'"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "eroare la scrierea în `%s'"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "eroare la închiderea fiºierului de ieºire `%s'"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "secvenþã de taste prea lungã"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "secvenþã de taste inexistentã"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "caracterul NUL (\\000) nu este permis"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "caracterul NUL (^%c) nu este permis"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "nume de acþiune inexistent"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "secþiune prea lungã"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "acþiune necunoscutã `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "nume de acþiune prea lung"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "extra caractere dupã acþiunea `%s'"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "nume de variabilã inexistent"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "caracterul `=' lipseºte imediat dupã numele de variabilã"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "nume de variabilã prea lung"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "valoare prea lungã"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", linia %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1055,7 +1117,7 @@
 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:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1064,7 +1126,7 @@
 "   Fiºierele sursã (groveled) pentru a include acest fiºier:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Nu ap putut manipula fiºierul %s.\n"
@@ -1134,7 +1196,7 @@
 msgid "Move to the start of the line"
 msgstr "Mergi la începutul liniei"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Urmãtor"
 
@@ -1621,7 +1683,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Folosit intern de \\[argument-universal]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Nu mai am memorie virtualã!\n"
@@ -1717,138 +1779,91 @@
 msgid " Subfile: %s"
 msgstr " Subfiºier: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: opþiunea `%s' este ambiguã\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: opþiunea `--%s' nu permite un argument\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: opþiunea `%c%s' nu permite un argument\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: opþiunea `%s' necesitã un argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: opþiune nerecunoscutã `--%s'\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: opþiune nerecunoscutã `%c%s'\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: opþiune ilegalã -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: opþiune invalidã -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: opþiunea necesitã un argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: opþiunea `-W %s' este ambiguã\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: opþiunea `-W %s' nu permite un argument\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "argumentele pentru @%s ignorate"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Ianuarie"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "Februarie"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "Martie"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "Aprilie"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "Mai"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "Iunie"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "Iulie"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "August"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "Septembrie"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "Octombrie"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "Noiembrie"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "Decembrie"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "caracter neverosimil %c în @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "argumentul @sc în litere mari, prin urmare fãrã efect"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{' aºteptat, dar am vãzut `%c'"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "sfârºit de fiºier în interiorul blocului de verb"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}' aºteptat, dar am vãzut `%c'"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1856,49 +1871,49 @@
 "@strong{Notã...] produce o referinþã încruciºatã falsã în Info; reformulaþi "
 "pentru a o evita"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s este depãsit"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp necesitã un argument numeric pozitiv, nu `%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Argument nepotrivit pentru %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "aºacume"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "nimic"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Argument nepotrivit pentru @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "insereazã"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Argument nepotrivit pentru @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1936,12 +1951,12 @@
 msgstr "Metodã"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "din"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "pe"
 
@@ -1974,8 +1989,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Vezi "
@@ -1998,7 +2013,7 @@
 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:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Note de subsol"
 
@@ -2007,64 +2022,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: nu am putut deschide --css-file: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-file s-a terminat cu un comentariu"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Fãrã titlu"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[neaºteptat] nici un tag html de ridicat"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[neaºteptat] nume de nod invalid: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Index necunoscut `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indez-ul `%s' existã deja"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr "(linie )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(linia %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Index necunoscut `%s' în @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, 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:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(în afara oricãrui nod)"
 
@@ -2169,37 +2184,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx nu are sens în interiorul blocului `%s'"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, 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:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "nume de codare nerecunoscut `%s'"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "ne pare rãu, codarea `%s' nu este suportatã"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "caracter codat invalid `%s'"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2214,56 +2234,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "aici este definiþia anterioarã a lui `%s'"
 
-#: makeinfo/macro.c:356
+#: 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"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cend macro nu a fost gãsit"
 
-#: makeinfo/macro.c:625
-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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "nepotrivire @end %s cu @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Prea multe erori!  Am renunþat.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: avertisment: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "%c nelalocul lui"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2271,7 +2295,7 @@
 "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:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2299,7 +2323,7 @@
 "      --version               afiºeazã informaþii despre versiune ºi "
 "terminã.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2314,7 +2338,7 @@
 "      --xml                 ieºire Texinfo XML în loc de Info.\n"
 "      --plaintext           ieºire text simplu în loc de Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2346,7 +2370,7 @@
 "      --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:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2385,7 +2409,7 @@
 "      --split-size=NUM        împarte fiºierele Info de dimens. NUM "
 "(implicit %d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2399,7 +2423,7 @@
 "      --css-include=FIªIER      include FIªIER în HTML <stil> ieºire;\n"
 "                                  citeºte stdin dacã FIªIER este -.\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2414,7 +2438,7 @@
 "                                  dacã VAL e 0, spaþiile goale ce pot fi "
 "ignorate nu sunt afiºate.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2430,7 +2454,7 @@
 "  -P DIR                        prepend DIR la calea de cãutare @include.\n"
 "  -U VAR                        nedefineºte variabila VAR, ca ºi @clear.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2469,7 +2493,7 @@
 "  De asemenea, pentru opþiunile --no-ifFORMAT, proceseazã text "
 "@ifnotFORMAT.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2484,7 +2508,7 @@
 "  dacã generaþi text simplu, --ifplaintext este selectat iar restul sunt "
 "deselectate;\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2515,81 +2539,76 @@
 "  makeinfo --no-split foo.texi          scrie un singur fiºier Info "
 "indiferent cât de mare\n"
 
-#: makeinfo/makeinfo.c:615
+#: 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:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: lipseºte fiºierul argument.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Comandã pe multiple linii %c%s folositã incorect"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Am aºteptat `%s'"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Nu pot crea directorul `%s': %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Nici un `%s' nu a fost gãsit în `%s'"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Creez fiºierul %s `%s' din `%s'.\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2597,114 +2616,119 @@
 "%s: ªterg fiºierul de ieºire macro `%s' din cauza erorilor; folosiþi --force "
 "pentru a-l pãstra.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Comandã necunoscutã `%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s am aºteptat paranteze"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "} fãrã pereche"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "NICI_UN_NUME!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s lipseºte paranteza de închidere"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, 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:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Nici un fiºier `%s'"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, 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:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image lipseºte fiºierul argument."
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "marcaj nedefinit: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Nici o valoare pentru `%s'}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s necesitã un nume"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Am ajuns la eof înainte de a potrivi @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' este prea lung pentru expansiune; nu a fost expandat"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "} lipsã în ºablonul @multitable"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignor text aiurea `%s' dupã @multitable"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Prea multe coloane în articol multitabel (max %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[neaºteptat] nu pot selecta coloana #%d în multitabel"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "ignor @tab în afara multitabelului"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Ieºirea multitabel din ultimul rând:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* coloana #%d: ieºire = %s\n"
@@ -2729,7 +2753,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Nici un nume specificat pentru comanda `%c%s'"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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"
@@ -2739,7 +2763,7 @@
 msgstr ""
 "Aceastã comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Redenumeºte acest ancoraj sau foloseºte opþiunea `--no-split'"
 
@@ -2760,84 +2784,84 @@
 msgid "Up:"
 msgstr "Sus:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 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:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Meniu"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Traverseazã"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Acest nod (%s) are un Prec incorect"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Prec"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Câmpul Prec al nodului `%s' nu este referit"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Acest nod (%s) are referinþa Urmãtor incorectã"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, 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:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Sus"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "nodul `%s' a fost referit de %d ori"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "nod nereferit `%s'"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "ªterg %s\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Nu pot ºterge fisierul `%s': %s"
@@ -2877,20 +2901,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2935,30 +2951,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: avertisment: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " pentru %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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"
 
-#: util/install-info.c:434
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2979,11 +2995,18 @@
 "                     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"
@@ -3022,7 +3045,7 @@
 "                     determinate din informaþiile din fiºierul Info.\n"
 " --version         afiºeazã informaþii depre versiune ºi terminã.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3059,104 +3082,106 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: fiºier gol"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: are deja fiºier dir: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, 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:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "argument suplimentar în linia de comandã `%s'"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 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."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 "Nici un fiºier dir specificat; încercaþi --help pentru informaþii "
 "suplimentare."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "nici o intrare dir info în `%s'"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "articol meniu `%s' existã deja, pentru fiºier `%s'"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "nici o intrare gãsitã pentru `%s'; n-am ºters nimic"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "afiºeazã acest mesaj ºi terminã"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "pãstreazã fiºierele temporare dupã procesare"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "nu pãstra fiºierele temporare dupã procesare (implicit)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "trimite ieºire în FIªIER"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "afiºeazã informaþii despre versiune ºi terminã"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Folosire: %s [OPÞIUNI]... FIªIER...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3165,27 +3190,54 @@
 "\n"
 "Opþiuni:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: nu este un fiºier index texinfo"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "am eºuat sã redeschid %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: nu este un fiºier index texinfo"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Nici un numãr de paginã în %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "intrarea %s urmeazã o intrare cu nume secundar"
 
+#, 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
Index: po/ru.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/ru.po,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- po/ru.po    8 Jun 2006 22:42:22 -0000       1.42
+++ po/ru.po    1 Jul 2007 18:43:37 -0000       1.43
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2005-02-07 09:27+0300\n"
 "Last-Translator: Oleg S. Tihonov <address@hidden>\n"
 "Language-Team: Russian <address@hidden>\n"
@@ -14,6 +14,71 @@
 "Content-Type: text/plain; charset=koi8-r\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+
+#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ×ÐÅÒÅÄ"
@@ -226,40 +291,35 @@
 "\n"
 "* Menu: îÏÄÙ, ÞØÉ ÁÌÆÁ×ÉÔÎÙÅ ÕËÁÚÁÔÅÌÉ ÓÏÄÅÒÖÁÔ `%s':\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ --help ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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.\n"
-"äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n"
-"ÆÁÊÌ COPYING.\n"
 
-#: info/info.c:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ÄÌÑ `%s' ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ × ÉÍÅÎÎÏÍ ÕËÁÚÁÔÅÌÅ\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "  -b, --speech-friendly       ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ, ÕÄÏÂÎÏÍ ÄÌÑ ÓÉÎÔÅÚÁÔÏÒÏ× "
 "ÒÅÞÉ.\n"
 
-#: info/info.c:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -295,6 +355,7 @@
 "  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"
@@ -339,8 +400,8 @@
 "  info --show-options emacs  ÎÁÞÁÔØ Ó ÎÏÄÙ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ emacs\n"
 "  info -f ./foo.info         ÐÏËÁÚÁÔØ ÆÁÊÌ ./foo.info, ÎÅ ÉÓËÁÔØ dir\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -352,73 +413,73 @@
 "ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ address@hidden"
 "äÏÍÁÛÎÁÑ ÓÔÒÁÎÉÃÁ Texinfo: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `%s'."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `(%s)%s'."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÏËÎÏ!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "ôÏÞËÁ ÎÁÈÏÄÉÔÓÑ ×ÎÅ ÎÏÄÙ ÜÔÏÇÏ ÏËÎÁ!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÅÅ ÏËÎÏ."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÍÅÎÀ."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `%s'."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "ëÏÍÁÎÄÁ Info `%c' ÎÅÉÚ×ÅÓÔÎÁ; ÐÏÐÒÏÂÕÊÔÅ `?' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÒÁ×ËÉ."
 
-#: info/info.c:682
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr ""
 "ôÅÒÍÉÎÁÌ ÔÉÐÁ `%s' ÎÅ ÏÂÌÁÄÁÅÔ ÄÏÓÔÁÔÏÞÎÙÍÉ ×ÏÚÍÏÖÎÏÓÔÑÍÉ ÄÌÑ ÚÁÐÕÓËÁ Info."
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "ôÏÌØËÏ ÏÄÎÏ ÏËÎÏ."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "ðÏÌÕÞÉ×ÛÅÅÓÑ ÏËÎÏ ÂÙÌÏ ÂÙ ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÍ."
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr ""
 "îÅ È×ÁÔÁÅÔ ÍÅÓÔÁ ÄÌÑ ÓÐÒÁ×ÏÞÎÏÇÏ ÏËÎÁ, ÐÏÖÁÌÕÊÓÔÁ, ÕÄÁÌÉÔÅ ËÁËÏÅ-ÎÉÂÕÄØ ÏËÎÏ."
@@ -849,91 +910,91 @@
 msgid "There is no function named `%s'"
 msgstr "æÕÎËÃÉÉ Ó ÉÍÅÎÅÍ `%s' ÎÅÔ"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ ÁÒÇÕÍÅÎÔÏ×"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ × `%s'"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÀÞÅÊ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "ÐÒÏÐÕÝÅÎÁ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÀÞÅÊ"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "ÚÎÁË NUL (\\000) ÎÅÄÏÐÕÓÔÉÍ"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "ÚÎÁË NUL (^%c) ÎÅÄÏÐÕÓÔÉÍ"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "ÐÒÏÐÕÝÅÎÏ ÉÍÑ ÄÅÊÓÔ×ÉÑ"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "ÒÁÚÄÅÌ ÓÌÉÛËÏÍ ×ÅÌÉË"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÄÅÊÓÔ×ÉÅ `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "ÉÍÑ ÄÅÊÓÔ×ÉÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "ÌÉÛÎÉÅ ÚÎÁËÉ ÐÏÓÌÅ ÄÅÊÓÔ×ÉÑ `%s'"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "ÐÒÏÐÕÝÅÎÏ ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "ÐÒÏÐÕÝÅÎ ÚÎÁË `=' ÓÒÁÚÕ ÐÏÓÌÅ ÉÍÅÎÉ ÐÅÒÅÍÅÎÎÏÊ"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "ÚÎÁÞÅÎÉÅ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", ÓÔÒÏËÁ %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1042,7 +1103,7 @@
 msgid "Set screen height to (%d): "
 msgstr "õÓÔÁÎÏ×ÉÔØ ×ÙÓÏÔÕ ÜËÒÁÎÁ ÒÁ×ÎÏÊ (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1051,7 +1112,7 @@
 "   üÔÏÔ ÆÁÊÌ ×ËÌÀÞÁÅÔ:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ ÆÁÊÌ %s.\n"
@@ -1118,7 +1179,7 @@
 msgid "Move to the start of the line"
 msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "óÌÅÄÕÀÝÁÑ"
 
@@ -1601,7 +1662,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÆÕÎËÃÉÅÊ \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ÷ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ!\n"
@@ -1693,138 +1754,91 @@
 msgid " Subfile: %s"
 msgstr " æÁÊÌ: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ @%s ÉÇÎÏÒÉÒÏ×ÁÎÙ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "ÑÎ×ÁÒÑ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "ÆÅ×ÒÁÌÑ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "ÍÁÒÔÁ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "ÁÐÒÅÌÑ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "ÍÁÑ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "ÉÀÎÑ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "ÉÀÌÑ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "Á×ÇÕÓÔÁ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "ÓÅÎÔÑÂÒÑ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "ÏËÔÑÂÒÑ"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "ÎÏÑÂÒÑ"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "ÄÅËÁÂÒÑ"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "ÍÁÌÏ×ÅÒÏÑÔÎÙÊ ÚÎÁË %c × @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "×ÅÓØ ÁÒÇÕÍÅÎÔ @sc ÎÁÂÒÁÎ ÚÁÇÌÁ×ÎÙÍÉ ÂÕË×ÁÍÉ, ÒÅÚÕÌØÔÁÔÁ ÎÅ ÂÕÄÅÔ"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "ÏÖÉÄÁÌÏÓØ `{', ×ÓÔÒÅÞÅÎÏ `%c'"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "ÏÖÉÄÁÌÏÓØ `}', ×ÓÔÒÅÞÅÎÏ `%c'"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1832,50 +1846,50 @@
 "@strong{Note...} ÓÏÚÄÁÅÔ × Info ÌÏÖÎÕÀ ÐÅÒÅËÒÅÓÔÎÕÀ ÓÓÙÌËÕ; ÐÅÒÅÆÒÁÚÉÒÕÊÔÅ "
 "ÔÅËÓÔ, ÞÔÏÂÙ ÉÚÂÅÖÁÔØ ÜÔÏÇÏ"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "ËÏÍÁÎÄÅ @sp ÎÕÖÎÏ ÕËÁÚÁÔØ ÐÏÌÏÖÉÔÅÌØÎÙÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ, Á ÎÅ `%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
 
 # ???
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "insert"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1913,12 +1927,12 @@
 msgstr "íÅÔÏÄ"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "ÉÚ"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "ÎÁÄ"
 
@@ -1951,8 +1965,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "óÍÏÔÒÉÔÅ "
@@ -1975,7 +1989,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "óÎÏÓËÉ ÉÚ ÓÎÏÓÏË ÚÁÐÒÅÝÅÎÙ"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "óÎÏÓËÉ"
 
@@ -1984,66 +1998,66 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: css-ÆÁÊÌ ÏÂÒÙ×ÁÅÔÓÑ × ËÏÍÍÅÎÔÁÒÉÉ"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "âÅÚ ÚÁÇÏÌÏ×ËÁ"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] × ÓÔÅËÅ html-ÔÅÇÏ× ÎÅÔ ÜÌÅÍÅÎÔÁ ÄÌÑ ×ÙÔÁÌËÉ×ÁÎÉÑ"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÅÒÎÏÅ ÉÍÑ ÎÏÄÙ: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÎÅÉÚ×ÅÓÔÅÎ"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 "Info ÎÅ ÍÏÖÅÔ ÏÂÒÁÂÏÔÁÔØ ÚÎÁË `:' ×Ï ×ÈÏÖÄÅÎÉÉ ÁÌÆÁ×ÉÔÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s'"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' É/ÉÌÉ `%s' × @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr "(ÓÔÒÏËÁ )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(ÓÔÒÏËÁ %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' × @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "÷ÈÏÖÄÅÎÉÅ ÄÌÑ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s' ×ÎÅ ÎÏÄÙ"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(×ÎÅ ËÁËÏÊ-ÌÉÂÏ ÎÏÄÙ)"
 
@@ -2147,37 +2161,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `%s'"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s ×ÓÔÒÅÞÅÎÁ ×ÎÅ ÂÌÏËÁ ×ÓÔÁ×ËÉ"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ÑÚÙËÁ ÉÚ ISO 639"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "ÉÍÑ ËÏÄÉÒÏ×ËÉ `%s' ÎÅ ÒÁÓÐÏÚÎÁÎÏ"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "ÉÚ×ÉÎÉÔÅ, ËÏÄÉÒÏ×ËÁ `%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ÎÅÐÒÁ×ÉÌØÎÏ ÚÁËÏÄÉÒÏ×ÁÎÎÙÊ ÚÎÁË `%s'"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ `i' ÉÌÉ `j', Á ÎÅ `%c'"
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ÏÄÉÎ ÓÉÍ×ÏÌ `i' ÉÌÉ `j'"
@@ -2192,56 +2211,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "ÍÅÓÔÏ ÐÒÅÄÙÄÕÝÅÇÏ ÏÐÒÅÄÅÌÅÎÉÑ `%s'"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ ÉÍÑ ÐÁÒÁÍÅÔÒÁ"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "íÁËÒÏ `%s' ×ÙÚ×ÁÎÏ ÎÁ ÓÔÒÏËÅ %d Ó ÉÚÌÉÛÎÉÍÉ ÁÒÇÕÍÅÎÔÁÍÉ"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "ÎÅ ×ÓÔÒÅÞÅÎÏ %cend macro"
 
-#: makeinfo/macro.c:625
-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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "ÎÅÐÁÒÎÙÅ @end %s É @%s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË! ïÓÔÁÎÏ×ËÁ.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "úÄÅÓØ ÎÅ ÄÏÌÖÎÏ ÂÙÔØ %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2250,7 +2273,7 @@
 "ÕÍÏÌÞÁÎÉÀ × Info-ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÞÉÔÁÔØ Ó ÐÏÍÏÝØÀ Emacs ÉÌÉ\n"
 "ÏÔÄÅÌØÎÏÊ ÐÒÏÇÒÁÍÍÙ GNU Info.\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2280,7 +2303,7 @@
 "  -v, --verbose                 ÐÏÑÓÎÑÔØ ÄÅÊÓÔ×ÉÑ.\n"
 "      --version                 ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2295,7 +2318,7 @@
 "      --xml                 ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ Texinfo XML, Á ÎÅ × Info.\n"
 "      --plaintext           ×Ù×ÏÄÉÔØ ÐÒÏÓÔÏÊ ÔÅËÓÔ, Á ÎÅ Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2329,7 +2352,7 @@
 " -o, --output=æáêì         ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì (ËÁÔÁÌÏÇ ÄÌÑ HTML Ó \n"
 "                           ÒÁÚÂÉÅÎÉÅÍ).\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2369,7 +2392,7 @@
 "      --split-size=òáúíåò     ÒÁÚÂÉ×ÁÔØ ÎÁ ÆÁÊÌÙ ÚÁÄÁÎÎÏÇÏ òáúíåòá (ÐÏ\n"
 "                                ÕÍÏÌÞÁÎÉÀ %d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2384,7 +2407,7 @@
 "                                ÞÉÔÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ, ÅÓÌÉ æáêì ÚÁÄÁÎ ËÁË "
 "-.\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2400,7 +2423,7 @@
 "                                åÓÌÉ þéóìï ÒÁ×ÎÏ ÎÕÌÀ, ÎÅÚÎÁÞÁÝÉÅ ÐÒÏÂÅÌÙ "
 "ÏÐÕÓËÁÀÔÓÑ.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2421,7 +2444,7 @@
 " -U ðåòåíåîîáñ           ÓÄÅÌÁÔØ ðåòåíåîîõà ÎÅÏÐÒÅÄÅÌÅÎÎÏÊ, ÁÎÁÌÏÇÉÞÎÏ\n"
 "                           ÉÓÐÏÌØÚÏ×ÁÎÉÀ @clear.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2458,7 +2481,7 @@
 "\n"
 "  ëÒÏÍÅ ÔÏÇÏ, ÄÌÑ ËÌÀÞÅÊ --no-ifæïòíáô, ÏÂÒÁÂÁÔÙ×ÁÔØ ÂÌÏËÉ @ifnotæïòíáô.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2472,7 +2495,7 @@
 "  ÐÒÉ ×Ù×ÏÄÅ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ ×ËÌÀÞÅÎ --ifplaintext, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ;\n"
 "  ÐÒÉ ×Ù×ÏÄÅ XML ×ËÌÀÞÅÎ --ifxml, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ.\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2502,83 +2525,78 @@
 "ÒÁÚÄÅÌÁÍÉ\n"
 "  makeinfo --no-split foo.texi         ÚÁÐÉÓÁÔØ ÏÄÉÎ ÂÏÌØÛÏÊ Info-ÆÁÊÌ\n"
 
-#: makeinfo/makeinfo.c:615
+#: 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:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n"
 
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'"
 
-#: makeinfo/makeinfo.c:681
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s: ×ÔÏÒÏÊ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s' ÉÇÎÏÒÉÒÏ×ÁÎ.\n"
 
-#: makeinfo/makeinfo.c:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ, ÚÁÄÁÀÝÉÊ ÆÁÊÌ.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "îÅÐÒÁ×ÉÌØÎÏ ÉÓÐÏÌØÚÏ×ÁÎÁ ÍÎÏÇÏÓÔÒÏÞÎÁÑ ËÏÍÁÎÄÁ %c%s"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "ïÖÉÄÁÅÔÓÑ `%s'"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' ÎÅ ÎÁÊÄÅÎ × `%s'"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: òÁÓËÒÙÔÉÅ ÍÁËÒÏÓÏ× × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ,\n"
 "ÔÁË ËÁË ÔÕÄÁ ÎÁÐÒÁ×ÌÅÎ ×Ù×ÏÄ × ÆÏÒÍÁÔÅ Info.\n"
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "óÏÚÄÁÎÉÅ %s-ÆÁÊÌÁ `%s' ÉÚ `%s'.\n"
 
-#: makeinfo/makeinfo.c:1697
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "üÔÏ %s, ÓÏÚÄÁÎÎÙÊ makeinfo ×ÅÒÓÉÉ %s ÉÚ %s.\n"
-
-#: makeinfo/makeinfo.c:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2586,115 +2604,120 @@
 "%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÊ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
 "ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr ""
 "éÓÐÏÌØÚÕÊÔÅ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ, ÞÔÏÂÙ ÐÅÒÅÄÁÔØ @%s ËÏÍÁÎÄÕ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ"
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ÐÏÄÒÁÚÕÍÅ×ÁÅÔ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "îÅÐÁÒÎÁÑ }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "âåú_éíåîé!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÓËÏÂËÁ"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "üÔÏ %s, ÓÏÚÄÁÎÎÙÊ makeinfo ×ÅÒÓÉÉ %s ÉÚ %s.\n"
+
+#: makeinfo/makeinfo.c:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ HTML): %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "æÁÊÌ `%s' ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ ÔÅËÓÔÁ): %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "ÐÏÓÌÅ @image ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ ÚÁÄÁÀÝÉÊ ÆÁÊÌ "
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ÆÌÁÇ: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{úÎÁÞÅÎÉÅ `%s' ÎÅ ÚÁÄÁÎÏ}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "ËÏÍÁÎÄÅ %c%s ÎÕÖÎÏ ÕËÁÚÁÔØ ÉÍÑ"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "ëÏÎÅà ÆÁÊÌÁ ÒÁÎØÛÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ËÏÍÁÎÄÙ @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' ÓÌÉÛËÏÍ ×ÅÌÉËÏ; ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "÷ ÛÁÂÌÏÎÅ @multitable ÐÒÏÐÕÝÅÎÁ `}'"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ÔÅËÓÔ `%s' ÐÏÓÌÅ @multitable ÉÇÎÏÒÉÒÏ×ÁÎ"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ËÏÌÏÎÏË × ÜÌÅÍÅÎÔÅ ÔÁÂÌÉÃÙ (ÍÁËÓÉÍÕÍ %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÏÚÍÏÖÎÏ ×ÙÂÒÁÔØ ËÏÌÏÎËÕ #%d × ÔÁÂÌÉÃÅ"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "@tab ×ÎÅ ÔÁÂÌÉÃÙ ÉÇÎÏÒÉÒÏ×ÁÎ"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** íÎÏÇÏËÏÌÏÎÏÞÎÙÊ ×Ù×ÏÄ ÉÚ ÐÏÓÌÅÄÎÅÊ ÓÔÒÏËÉ:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* ËÏÌÏÎËÁ %d: ×Ù×ÏÄ = %s\n"
@@ -2719,7 +2742,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "äÌÑ ËÏÍÁÎÄÙ `%c%s' ÎÅ ÚÁÄÁÎÏ ÉÍÑ ÎÏÄÙ"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "íÁÒËÅÒ `%s' É ÎÏÄÁ `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
@@ -2728,7 +2751,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "äÁÎÎÁÑ ËÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "ðÅÒÅÉÍÅÎÕÊÔÅ ÜÔÏÔ ÍÁÒËÅÒ ÉÌÉ ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ `--no-split'"
 
@@ -2749,88 +2772,88 @@
 msgid "Up:"
 msgstr "÷×ÅÒÈ:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "íÁÒËÅÒÙ `%s' É `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "ëÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ"
 
 #  ÚÄÅÓØ %s ÍÏÖÅÔ ÂÙÔØ `cross' ÉÌÉ `menu'
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr ""
 "%s ÎÁ ÎÅÓÕÝÅÓÔ×ÕÀÝÕÀ ÎÏÄÕ `%s' (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ "
 "ÇÌÁ×?)"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "óÓÙÌËÁ ÉÚ ÍÅÎÀ"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "ðÅÒÅËÒÅÓÔÎÁÑ ÓÓÙÌËÁ"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 "îÁ ÐÏÌÅ Next ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ "
 "ÇÌÁ×?)"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Prev"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "ðÒÅÄÙÄÕÝÁÑ"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "îÁ ÐÏÌÅ Prev ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Next"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 "÷ ÎÏÄÅ `%s' ÎÅÔ ÐÏÌÑ Up (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ ÇÌÁ×?)"
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "÷×ÅÒÈ"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "îÏÄÁ `%s' ÎÅ ÉÍÅÅÔ ÐÕÎËÔÁ ÍÅÎÀ ÄÌÑ `%s', ÈÏÔÑ ÎÁ ÎÅÅ ÓÓÙÌÁÅÔÓÑ ÐÏÌÅ Up"
 
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "ÎÁ ÎÏÄÕ `%s' ÐÏÑ×ÉÌÏÓØ %d ÓÓÙÌÏË"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "õÄÁÌÅÎÉÅ %s\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÆÁÊÌ `%s': %s"
@@ -2870,20 +2893,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2928,30 +2943,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " ÄÌÑ %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2972,11 +2987,18 @@
 "                     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"
@@ -3015,7 +3037,7 @@
 "                   × ÓÅËÃÉÉ, ÚÁÄÁÎÎÙÅ × Info-ÆÁÊÌÅ.\n"
 " --version         ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3050,104 +3072,106 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ (%s) É ÓÏÚÄÁÔØ (%s)\n"
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ ÆÁÊÌ dir: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ Info-ÆÁÊÌ.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "ÉÚÌÉÛÎÉÊ ÁÒÇÕÍÅÎÔ `%s'"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr ""
 "îÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ.\n"
 "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr ""
 "îÅ ÚÁÄÁÎ ÆÁÊÌ ËÁÔÁÌÏÇÁ.\n"
 "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "× `%s' ÎÅÔ ×ÈÏÖÄÅÎÉÑ ÄÌÑ ËÁÔÁÌÏÇÁ Info"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "ÐÕÎËÔ ÍÅÎÀ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ, ÄÌÑ ÆÁÊÌÁ `%s'"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ ÄÌÑ `%s'; ÎÉÞÅÇÏ ÎÅ ÕÄÁÌÅÎÏ"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ ÐÏÓÌÅ ÒÁÂÏÔÙ"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ÎÅ ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ (ÐÏ ÕÍÏÌÞÁÎÉÀ)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × æáêì"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr ""
 "óÏÚÄÁÅÔ ÓÏÒÔÉÒÏ×ÁÎÎÙÊ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ ÄÌÑ\n"
 "ËÁÖÄÏÇÏ ×ÙÈÏÄÎÏÇÏ TeX-ÆÁÊÌÁ.\n"
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3156,27 +3180,57 @@
 "\n"
 "ëÌÀÞÉ:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: ÎÅ texinfo-ÆÁÊÌ Ó ÁÌÆÁ×ÉÔÎÙÍ ÕËÁÚÁÔÅÌÅÍ"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "ÏÛÉÂËÁ ÐÏ×ÔÏÒÎÏÇÏ ÏÔËÒÙÔÉÑ %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: ÎÅ texinfo-ÆÁÊÌ Ó ÁÌÆÁ×ÉÔÎÙÍ ÕËÁÚÁÔÅÌÅÍ"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "÷ %s ÎÅÔ ÎÏÍÅÒÁ ÓÔÒÁÎÉÃÙ"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "ÚÁ ×ÈÏÖÄÅÎÉÅÍ %s ÓÌÅÄÕÅÔ ×ÈÏÖÄÅÎÉÅ Ó ×ÔÏÒÉÞÎÙÍ ÉÍÅÎÅÍ"
 
+#, 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
Index: po/rw.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/rw.po,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- po/rw.po    8 Jun 2006 22:42:22 -0000       1.4
+++ po/rw.po    1 Jul 2007 18:43:37 -0000       1.5
@@ -16,7 +16,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.94\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2005-04-04 10:55-0700\n"
 "Last-Translator: Steven Michael Murphy <address@hidden>\n"
 "Language-Team: Kinyarwanda <address@hidden>\n"
@@ -24,6 +24,71 @@
 "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:531 gnulib/lib/getopt.c:547
+#, fuzzy, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s:Ihitamo ni"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, fuzzy, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, fuzzy, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
+
+#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, fuzzy, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, fuzzy, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, fuzzy, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, fuzzy, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, fuzzy, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s:Sibyo Ihitamo"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, fuzzy, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s:Ihitamo"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, fuzzy, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s:Ihitamo ni"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, fuzzy, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s:Ihitamo Kwemerera"
+
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 #, fuzzy
 msgid "Move forward a character"
@@ -269,33 +334,33 @@
 "* Menu: Nodes whose indices contain `%s':\n"
 msgstr "*bya ibimenyetso"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, fuzzy, c-format
 msgid "Try --help for more information.\n"
 msgstr "Ifashayobora kugirango Birenzeho Ibisobanuro"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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:501
+#: info/info.c:503
 #, fuzzy, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
 
-#: info/info.c:593
+#: info/info.c:595
 #, fuzzy
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr "-B Kuri"
 
-#: info/info.c:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -332,6 +397,7 @@
 "  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 "
@@ -350,8 +416,8 @@
 "Amahitamo Gutangira ku Na: Komandi: Umurongo Ibisobanuro F Ibisobanuro "
 "Garagaza IDOSIYE Ibisobanuro OYA Ishakisha"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 #, fuzzy
 msgid ""
 "\n"
@@ -360,82 +426,82 @@
 "Texinfo home page: http://www.gnu.org/software/texinfo/";
 msgstr "org."
 
-#: info/info.c:672
+#: info/info.c:675
 #, fuzzy, c-format
 msgid "Cannot find node `%s'."
 msgstr "Gushaka"
 
-#: info/info.c:673
+#: info/info.c:676
 #, fuzzy, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Gushaka"
 
-#: info/info.c:674
+#: info/info.c:677
 #, fuzzy
 msgid "Cannot find a window!"
 msgstr "Gushaka a Idirishya"
 
-#: info/info.c:675
+#: info/info.c:678
 #, fuzzy
 msgid "Point doesn't appear within this window's node!"
 msgstr "Kugaragara muri iyi"
 
-#: info/info.c:676
+#: info/info.c:679
 #, fuzzy
 msgid "Cannot delete the last window."
 msgstr "Gusiba i Iheruka Idirishya"
 
-#: info/info.c:677
+#: info/info.c:680
 #, fuzzy
 msgid "No menu in this node."
 msgstr "Ibikubiyemo in iyi"
 
-#: info/info.c:678
+#: info/info.c:681
 #, fuzzy
 msgid "No footnotes in this node."
 msgstr "Ubusobanuro mpezarupapuro in iyi"
 
-#: info/info.c:679
+#: info/info.c:682
 #, fuzzy
 msgid "No cross references in this node."
 msgstr "Kwambukiranya Indango in iyi"
 
-#: info/info.c:680
+#: info/info.c:683
 #, fuzzy, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Mweretsi kugirango iyi"
 
-#: info/info.c:681
+#: info/info.c:684
 #, fuzzy, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Komandi: kugirango Ifashayobora"
 
-#: info/info.c:682
+#: info/info.c:685
 #, fuzzy, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Ubwoko ni OYA Cyiza Kuri Gukoresha"
 
-#: info/info.c:683
+#: info/info.c:686
 #, fuzzy
 msgid "You are already at the last page of this node."
 msgstr "ku i Iheruka Ipaji Bya iyi"
 
-#: info/info.c:684
+#: info/info.c:687
 #, fuzzy
 msgid "You are already at the first page of this node."
 msgstr "ku i Itangira Ipaji Bya iyi"
 
-#: info/info.c:685
+#: info/info.c:688
 #, fuzzy
 msgid "Only one window."
 msgstr "Idirishya"
 
-#: info/info.c:686
+#: info/info.c:689
 #, fuzzy
 msgid "Resulting window would be too small."
 msgstr "Idirishya Gitoya"
 
-#: info/info.c:687
+#: info/info.c:690
 #, fuzzy
 msgid "Not enough room for a help window, please delete a window."
 msgstr "kugirango a Ifashayobora Idirishya Gusiba a Idirishya"
@@ -886,102 +952,102 @@
 msgid "There is no function named `%s'"
 msgstr "ni Oya Umumaro"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 #, fuzzy
 msgid "incorrect number of arguments"
 msgstr "Umubare Bya ingingo"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, fuzzy, c-format
 msgid "cannot open input file `%s'"
 msgstr "Gufungura Iyinjiza IDOSIYE"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, fuzzy, c-format
 msgid "cannot create output file `%s'"
 msgstr "Kurema Ibisohoka IDOSIYE"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, fuzzy, c-format
 msgid "error writing to `%s'"
 msgstr "Ikosa Kuri"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, fuzzy, c-format
 msgid "error closing output file `%s'"
 msgstr "Ikosa Ibisohoka IDOSIYE"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 #, fuzzy
 msgid "key sequence too long"
 msgstr "Urufunguzo"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 #, fuzzy
 msgid "missing key sequence"
 msgstr "Ibuze Urufunguzo"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 #, fuzzy
 msgid "NUL character (\\000) not permitted"
 msgstr "Inyuguti OYA"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, fuzzy, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "Inyuguti OYA"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 #, fuzzy
 msgid "missing action name"
 msgstr "Ibuze Igikorwa Izina:"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 #, fuzzy
 msgid "section too long"
 msgstr "Icyiciro"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, fuzzy, c-format
 msgid "unknown action `%s'"
 msgstr "Kitazwi Igikorwa"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 #, fuzzy
 msgid "action name too long"
 msgstr "Igikorwa Izina:"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, fuzzy, c-format
 msgid "extra characters following action `%s'"
 msgstr "Birenga Inyuguti Igikorwa"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 #, fuzzy
 msgid "missing variable name"
 msgstr "Ibuze IMPINDURAGACIRO Izina:"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 #, fuzzy
 msgid "missing `=' immediately after variable name"
 msgstr "Ibuze Ako kanya Nyuma IMPINDURAGACIRO Izina:"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 #, fuzzy
 msgid "variable name too long"
 msgstr "IMPINDURAGACIRO Izina:"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 #, fuzzy
 msgid "value too long"
 msgstr "Agaciro"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, fuzzy, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\",Umurongo"
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1078,14 +1144,14 @@
 msgid "Set screen height to (%d): "
 msgstr "Mugaragaza Ubuhagarike Kuri"
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, fuzzy, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr "Idosiye Kuri Ubwoko iyi IDOSIYE Gushyiramo"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, fuzzy, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "i IDOSIYE"
@@ -1156,7 +1222,7 @@
 msgid "Move to the start of the line"
 msgstr "Kuri i Gutangira Bya i Umurongo"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Ikurikira"
 
@@ -1719,7 +1785,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "ku Ky'isi yose"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, fuzzy, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "Bya Kitaboneka Ububiko"
@@ -1825,191 +1891,144 @@
 msgid " Subfile: %s"
 msgstr ""
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, fuzzy, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s:Ihitamo ni"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, fuzzy, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, fuzzy, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, fuzzy, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s:Ihitamo"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, fuzzy, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s:Ihitamo"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, fuzzy, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s:Ihitamo"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, fuzzy, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s:Ihitamo"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, fuzzy, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s:Sibyo Ihitamo"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, fuzzy, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s:Ihitamo"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, fuzzy, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s:Ihitamo ni"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, fuzzy, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s:Ihitamo Kwemerera"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "ingingo Kuri"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Mutarama"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "Gashyantare"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "Werurwe"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "Mata"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "Gicurasi"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "Kamena"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "Nyakanga"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "Kanama"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "Nzeri"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "Ukwakira"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "Ugushyingo"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "Ukuboza"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, fuzzy, c-format
 msgid "unlikely character %c in @var"
 msgstr "Inyuguti in VAR"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 #, fuzzy
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@Byose Inyuguti nkuru Oya INGARUKA"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, fuzzy, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{'Ikitezwe:"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 #, fuzzy
 msgid "end of file inside verb block"
 msgstr "Impera Bya IDOSIYE Mo Imbere Ishinga Funga"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, fuzzy, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}'Ikitezwe:"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 #, fuzzy
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr "@a Kwambukiranya Indango in Kuri"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, fuzzy, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%sni"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, fuzzy, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@SP a Bikurikije umubare OYA"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, fuzzy, c-format
 msgid "Bad argument to %c%s"
 msgstr "Kuri"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "ntacyo"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "Kuri"
 
 # basctl/source\basicide\basidesh.src:RID_POPUP_TABBAR.RID_INSERT.text
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 #, fuzzy
 msgid "insert"
 msgstr "Kongeramo"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Kuri"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -2049,12 +2068,12 @@
 msgstr "Uburyo"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "ya"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "kuri"
 
@@ -2088,8 +2107,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr ""
@@ -2113,7 +2132,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Mo Imbere Ubusobanuro mpezarupapuro OYA"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Ubusobanuro mpezarupapuro"
 
@@ -2122,67 +2141,67 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s:OYA Gufungura IDOSIYE"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, fuzzy, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d:--IDOSIYE in Icyo wongeraho"
 
 # filter/source\xsltdialog\xmlfilterdialogstrings.src:STR_DEFAULT_UI_NAME.text
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Nta mutwe"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 #, fuzzy
 msgid "[unexpected] no html tag to pop"
 msgstr "[Oya HTML Itagi: Kuri"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[Sibyo Izina:"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, fuzzy, c-format
 msgid "Unknown index `%s'"
 msgstr "Umubarendanga"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, fuzzy, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "in Umubarendanga Icyinjijwe"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr ""
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, fuzzy, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Umubarendanga Na Cyangwa in"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 #, fuzzy
 msgid "(line )"
 msgstr "(Umurongo"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, fuzzy, c-format
 msgid "(line %*d)"
 msgstr "(Umurongo"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, fuzzy, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Umubarendanga in"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, fuzzy, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "kugirango Umubarendanga Hanze Bya"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 #, fuzzy
 msgid "(outside of any node)"
 msgstr "(Hanze Bya"
@@ -2293,37 +2312,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@OYA Mo Imbere Funga"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, fuzzy, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%sByabonetse Hanze Bya Iyinjizamo Funga"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, fuzzy, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "Imisobekere: Izina:"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, fuzzy, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "Imisobekere: OYA"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, fuzzy, c-format
 msgid "invalid encoded character `%s'"
 msgstr "Sibyo Inyuguti"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, fuzzy, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%sCyangwa Nka OYA"
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, fuzzy, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%sa UMWE Inyuguti Cyangwa Nka"
@@ -2338,57 +2362,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "ni i Ibanjirije Insobanuro Bya"
 
-#: makeinfo/macro.c:356
+#: 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:402
+#: 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:587
+#: makeinfo/macro.c:580
 #, fuzzy, c-format
 msgid "%cend macro not found"
 msgstr "%cendMakoro OYA Byabonetse"
 
-#: makeinfo/macro.c:625
-#, fuzzy
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@Gushyiraho akugarizo kugirango UMWE Makoro"
+#: 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:661
+#: makeinfo/macro.c:649
 #, fuzzy, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "Impera Na:"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, fuzzy, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Amakosa Hejuru"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, fuzzy, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d:Iburira"
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr ""
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, fuzzy, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "kugirango Birenzeho Ibisobanuro"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 #, fuzzy
 msgid ""
 "Translate Texinfo source documentation to various other formats, by default\n"
@@ -2397,7 +2424,7 @@
 "Inkomoko Kuri Ikindi Imiterere ku Idosiye kugirango kiri kuri interineti Na: "
 "Cyangwa"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2419,7 +2446,7 @@
 "Indango Mburabuzi v ni Byakozwe Verisiyo Kugaragaza Verisiyo Ibisobanuro Na "
 "Gusohoka"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2429,7 +2456,7 @@
 "      --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:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2453,7 +2480,7 @@
 "Cyangwa Ibisohoka Ibisohoka IDOSIYE Umubare Ibyatoranyijwe Ibisohoka Umutwe "
 "Na Imibare o Ibisohoka Ibisohoka Kuri bushyinguro NIBA Gutandukanya"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2480,7 +2507,7 @@
 "Mburabuzi Igika Ikurura Ikurura Ibika ku Imyanya Mburabuzi ni OYA Ikurura "
 "NIBA Gutandukanya Ingano Gutandukanya Idosiye ku Ingano Mburabuzi"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2491,7 +2518,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr "kugirango Gushyiramo Gushyiramo in IMISUSIRE Ibisohoka Gusoma NIBA ni"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2502,7 +2529,7 @@
 msgstr ""
 "kugirango Na Ibisohoka Ikurura Ikurura Ibintu ku Imyanya Mburabuzi ni 0 ni"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2517,7 +2544,7 @@
 "Gushyiramo Gushaka Inzira Kuri i Gushyiramo Gushaka Inzira U i "
 "IMPINDURAGACIRO Nka Na: Gusiba"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2543,7 +2570,7 @@
 "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:450
+#: makeinfo/makeinfo.c:454
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2556,7 +2583,7 @@
 "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:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2577,159 +2604,159 @@
 "Kwandika HTML Imirongo Umubare Ibyatoranyijwe Kwandika Na: Iriho Imibare Oya "
 "Gutandukanya Kwandika IDOSIYE"
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, fuzzy, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr "%s:Kwirengagiza Agaciro"
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, fuzzy, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s:%sBikurikije umubare OYA"
 
-#: makeinfo/makeinfo.c:676
+#: 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:681
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "%s:ISEGONDA Makoro Ibisohoka"
 
-#: makeinfo/makeinfo.c:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, fuzzy, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s:Ibuze IDOSIYE"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, fuzzy, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Komandi:"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, fuzzy, c-format
 msgid "Expected `%s'"
 msgstr "Ikitezwe:"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, fuzzy, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kurema bushyinguro"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, fuzzy, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Byabonetse in"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, fuzzy, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "IDOSIYE Bivuye"
 
-#: makeinfo/makeinfo.c:1697
-#, fuzzy, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "ni ku Verisiyo Bivuye"
-
-#: makeinfo/makeinfo.c:1733
+#: makeinfo/makeinfo.c:1728
 #, 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:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, fuzzy, c-format
 msgid "Unknown command `%s'"
 msgstr "Komandi:"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%sIkitezwe: Ingirwadusodeko"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr ""
 
 # 4203
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 #, fuzzy
 msgid "NO_NAME!"
 msgstr "nta zina"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, fuzzy, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%sIbuze Gufunga"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, fuzzy, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "ni ku Verisiyo Bivuye"
+
+#: makeinfo/makeinfo.c:3443
 #, fuzzy, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@Ishusho IDOSIYE kugirango OYA"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "IDOSIYE"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, fuzzy, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@Ishusho IDOSIYE kugirango Umwandiko"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 #, fuzzy
 msgid "@image missing filename argument"
 msgstr "@Ishusho Ibuze Izina ry'idosiye:"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, fuzzy, c-format
 msgid "undefined flag: %s"
 msgstr "kidasobanuye Ibendera"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, fuzzy, c-format
 msgid "{No value for `%s'}"
 msgstr "{Agaciro kugirango"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, fuzzy, c-format
 msgid "%c%s requires a name"
 msgstr "%c%sa Izina:"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, fuzzy, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Mbere Impera"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, fuzzy, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
@@ -2742,37 +2769,37 @@
 "X- Generator: KBabel 1. 0\n"
 "."
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 #, fuzzy
 msgid "Missing } in @multitable template"
 msgstr "in Inyandikorugero"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, fuzzy, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "Umwandiko Nyuma"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, fuzzy, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Inkingi in Ikintu KININI"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[Guhitamo Inkingi in"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 #, fuzzy
 msgid "ignoring @tab outside of multitable"
 msgstr "Isunika Hanze Bya"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, fuzzy, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "**Ibisohoka Bivuye Iheruka Urubariro"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, fuzzy, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "*Inkingi Ibisohoka"
@@ -2797,7 +2824,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Izina: kugirango Komandi:"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, fuzzy, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Na Kuri i IDOSIYE Izina:"
@@ -2807,7 +2834,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "Agafashi Komandi: Indango Kuri OYA Akazi"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 #, fuzzy
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "iyi Agafashi Cyangwa Gukoresha i Oya Ihitamo"
@@ -2838,84 +2865,84 @@
 msgid "Up:"
 msgstr "Hejuru"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, fuzzy, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Na Kuri i IDOSIYE Izina:"
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 #, fuzzy
 msgid "@anchor command ignored; references to it will not work"
 msgstr "@Agafashi Komandi: Indango Kuri OYA Akazi"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%sIndango Kuri"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Ibikubiyemo"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Kwambukiranya"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "Umwanya Bya OYA Kuri"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, fuzzy, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "i"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 #, fuzzy
 msgid "Prev"
 msgstr "Ibanjirije"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, fuzzy, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Umwanya Bya OYA Kuri"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, fuzzy, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "i"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, fuzzy, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "`%s'Oya Umwanya"
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Hejuru"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, fuzzy, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "Ibikubiyemo Ikintu kugirango Intego"
 
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, fuzzy, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "Times"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr ""
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Gukuraho... IDOSIYE"
@@ -2955,21 +2982,12 @@
 msgid "%ctop used before %cnode, defaulting to %s"
 msgstr "%ctopMbere Kuri"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Ishakiro"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-#, fuzzy
-msgid "Short Contents"
-msgstr "Ishakiro"
-
-#: makeinfo/xml.c:1628
+#: makeinfo/xml.c:1655
 #, fuzzy, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@Ishusho IDOSIYE"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 #, fuzzy
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
@@ -3012,30 +3030,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, fuzzy, c-format
 msgid "%s: warning: "
 msgstr "%s:Iburira"
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, fuzzy, c-format
 msgid " for %s"
 msgstr "ya:"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, fuzzy, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr "kugirango a Byuzuye Urutonde Bya Amahitamo"
 
-#: util/install-info.c:434
+#: util/install-info.c:453
 #, 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"
+"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"
@@ -3056,11 +3074,18 @@
 "                     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 "
@@ -3077,7 +3102,7 @@
 "Bivuye Ibisobanuro in i IDOSIYE Verisiyo Kugaragaza Verisiyo Ibisobanuro Na "
 "Gusohoka"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3101,105 +3126,105 @@
 "kugirango Itangira i Bikorwa Kanda Imbeba Akabuto 2. ku a Ibikubiyemo Ikintu "
 "Cyangwa Kwambukiranya Kuri Guhitamo"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, fuzzy, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s:OYA Gusoma Na OYA Kurema"
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, fuzzy, c-format
 msgid "%s: empty file"
 msgstr "%s:ubusa IDOSIYE"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:948
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr ""
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, fuzzy, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s:IDOSIYE"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, fuzzy, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s:i IDOSIYE Rimwe"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, fuzzy, c-format
 msgid "excess command line argument `%s'"
 msgstr "Komandi: Umurongo"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 #, fuzzy
 msgid "No input file specified; try --help for more information."
 msgstr "Iyinjiza IDOSIYE Ifashayobora kugirango Birenzeho Ibisobanuro"
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 #, fuzzy
 msgid "No dir file specified; try --help for more information."
 msgstr "IDOSIYE Ifashayobora kugirango Birenzeho Ibisobanuro"
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, fuzzy, c-format
 msgid "no info dir entry in `%s'"
 msgstr "Oya Ibisobanuro Icyinjijwe in"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, fuzzy, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "Ibikubiyemo Ikintu kugirango IDOSIYE"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, fuzzy, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "Oya Ibyinjijwe Byabonetse kugirango Cyasibwe"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 #, fuzzy
 msgid "display this help and exit"
 msgstr "Kugaragaza iyi Ifashayobora Na Gusohoka"
 
-#: util/texindex.c:262
-#, fuzzy
-msgid "keep temporary files around after processing"
-msgstr "Gumana: By'igihe gito Idosiye Nyuma Inonosora"
-
-#: util/texindex.c:264
-#, fuzzy
-msgid "do not keep temporary files around after processing (default)"
-msgstr "OYA Gumana: By'igihe gito Idosiye Nyuma Inonosora Mburabuzi"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 #, fuzzy
 msgid "send output to FILE"
 msgstr "Kohereza Ibisohoka Kuri"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 #, fuzzy
 msgid "display version information and exit"
 msgstr "Kugaragaza Verisiyo Ibisobanuro Na Gusohoka"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr ""
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, fuzzy, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "a bishunguwe Umubarendanga kugirango Ibisohoka"
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3208,29 +3233,57 @@
 "\n"
 "Amahitamo:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, fuzzy, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s:OYA a Umubarendanga IDOSIYE"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr ""
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, fuzzy, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s:OYA a Umubarendanga IDOSIYE"
+
+#: util/texindex.c:994
 #, fuzzy, c-format
 msgid "No page number in %s"
 msgstr "Ipaji Umubare in"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, fuzzy, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "Icyinjijwe Icyinjijwe Na: a Izina:"
 
 #, 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
 #~ "%-10skugirango a Ikurikiranyanyuguti in i Umubarendanga Ibyinjijwe Bya iyi"
Index: po/sv.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/sv.po,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- po/sv.po    8 Jun 2006 22:42:22 -0000       1.40
+++ po/sv.po    1 Jul 2007 18:43:37 -0000       1.41
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.7.91\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2004-12-12 22:41+0100\n"
 "Last-Translator: Christian Rose <address@hidden>\n"
 "Language-Team: Swedish <address@hidden>\n"
@@ -14,6 +14,72 @@
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: flaggan \"%s\" är flertydig\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: flaggan \"%s\" kräver ett argument\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: okänd flagga \"--%s\"\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: okänd flagga \"%c%s\"\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: otillåten flagga -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: ogiltig flagga -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: flaggan kräver ett argument -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: flaggan \"-W %s\" är flertydig\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "virtuellt minne slut"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Gå ett tecken framåt"
@@ -231,37 +297,33 @@
 "\n"
 "* Meny: Noder vars index innehåller \"%s\":\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Prova --help för mer information.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
-"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"
+"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "inga indexposter för \"%s\" hittades\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr " -b, --speech-friendly        var vänlig mot talsyntesprogram.\n"
 
-#: info/info.c:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -297,6 +359,7 @@
 "  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"
@@ -338,8 +401,8 @@
 "  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:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -352,72 +415,72 @@
 "och synpunkter på översättningen till address@hidden"
 "Hemsida för texinfo: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Kan inte hitta noden \"%s\"."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Kan inte hitta noden \"(%s)%s\"."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Kan inte hitta ett fönster!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Punkten finns inte inom detta fönsters nod!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Kan inte ta bort det sista fönstret."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Ingen meny i denna nod."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Inga fotnoter i denna nod."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Inga korsreferenser i denna nod."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Ingen \"%s\"-pekare för denna nod."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Okänt Info-kommando \"%c\". Prova \"?\" för hjälp."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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."
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "Du är redan på sista sidan för denna nod."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "Du är redan på första sidan för denna nod."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Endast ett fönster."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Resulterande fönstret skulle bli för litet."
 
-#: info/info.c:687
+#: info/info.c:690
 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."
@@ -864,91 +927,91 @@
 msgid "There is no function named `%s'"
 msgstr "Det finns ingen funktion med namnet \"%s\""
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "felaktigt antal argument"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "kan inte öppna indatafilen \"%s\""
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "kan inte skapa utdatafilen \"%s\""
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "fel vid skrivning till \"%s\""
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "fel vid stängning av utdatafilen \"%s\""
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "nyckelsekvensen är för lång"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "nyckelsekvens saknas"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL-tecknet (\\000) är inte tillåtet"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL-tecknet (^%c) är inte tillåtet"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "åtgärdsnamn saknas"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "avsnittet är för långt"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "okänd åtgärd \"%s\""
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "åtgärdsnamnet är för långt"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "extra tecken följer på åtgärden \"%s\""
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "variabelnamn saknas"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "\"=\" saknas direkt efter variabelnamnet"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "variabelnamnet är för långt"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "värdet är för långt"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", rad %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1055,7 +1118,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Ställ in skärmhöjden till (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1064,7 +1127,7 @@
 "   Källkodsfiler som grävdes igenom för att göra att denna fil inkluderar:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Kunde inte manipulera filen %s.\n"
@@ -1134,7 +1197,7 @@
 msgstr "Gå till början på raden"
 
 # src/menus.c:332
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Nästa"
 
@@ -1636,7 +1699,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Används internt av \\[universal-argument]"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: Slut på virtuellt minne!\n"
@@ -1729,62 +1792,15 @@
 msgid " Subfile: %s"
 msgstr " Underfil: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: flaggan \"%s\" är flertydig\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"--%s\" tillåter inget argument\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"%c%s\" tillåter inget argument\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: flaggan \"%s\" kräver ett argument\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: okänd flagga \"--%s\"\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: okänd flagga \"%c%s\"\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: otillåten flagga -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: ogiltig flagga -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: flaggan kräver ett argument -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: flaggan \"-W %s\" är flertydig\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: flaggan \"-W %s\" tillåter inget argument\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "argument till @%s ignorerades"
@@ -1794,81 +1810,81 @@
 # 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:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "januari"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "februari"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "mars"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "april"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "maj"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "juni"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "juli"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "augusti"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "september"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "oktober"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "november"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "december"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "osannolikt tecken %c i @var"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr ""
 "@sc-argumentet är enbart med stora bokstäver, därför har det ingen effekt"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "\"{\" förväntades, men såg \"%c\""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "filslut inuti verb-block"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "\"}\" förväntades, men såg \"%c\""
 
 # Är det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt som
 # orsakar problem?
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1876,49 +1892,49 @@
 "@strong{Obs...} skapar en falsk korsreferens i Info; formulera om för att "
 "undvika detta"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s är föråldrat"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp kräver ett positivt numeriskt argument, inte \"%s\""
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Felaktigt argument till %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "oförändrad"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "ingen"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Felaktigt argument till @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "infoga"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Felaktigt argument till @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1956,12 +1972,12 @@
 msgstr "Metod"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "av"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "på"
 
@@ -1994,8 +2010,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Se "
@@ -2018,7 +2034,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "Fotnoter inuti fotnoter är inte tillåtet"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Fotnoter"
 
@@ -2027,65 +2043,65 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: kunde inte öppna --css-fil: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-fil slutade med kommentar"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Namnlös"
 
 # to pop?
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[oväntat] ingen html-tagg att poppa"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[oväntat] ogiltigt nodnamn: \"%s\""
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Okänt index \"%s\""
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Indexet \"%s\" finns redan"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Okänt index \"%s\" och/eller \"%s\" i @synindex"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr "(rad )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(rad %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Okänt index \"%s\" i @printindex"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Posten för index \"%s\" är utanför alla noder"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(utanför alla noder)"
 
@@ -2189,37 +2205,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "@itemx är inte meningsfullt inuti \"%s\"-block"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s hittades utanför ett insättningsblock"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s är inte en giltig landskod enligt ISO 639"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "okänt kodningsnamn \"%s\""
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "tyvärr, kodningen \"%s\" stöds inte"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ogiltigt kodat tecken \"%s\""
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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\""
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2234,56 +2255,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "här är den tidigare definitionen av \"%s\""
 
-#: makeinfo/macro.c:356
+#: 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"
 
-#: makeinfo/macro.c:402
+#: 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"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "Makrot %cend hittades inte"
 
-#: makeinfo/macro.c:625
-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 ""
 
-#: makeinfo/macro.c:661
+#: 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 och @%s passar inte"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "För många fel! Gav upp.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: varning: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Felplacerat %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Prova \"%s --help\" för mer information.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2291,7 +2316,7 @@
 "Ö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:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2318,7 +2343,7 @@
 "  -v, --verbose               förklara vad som görs.\n"
 "      --version               visa versionsinformation och avsluta.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2333,7 +2358,7 @@
 "      --xml                 generera Texinfo XML istället för Info.\n"
 "      --plaintext           generera vanlig text istället för Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2364,7 +2389,7 @@
 "      --number-sections     generera kapitel- och avsnittsnummer.\n"
 "  -o, --output=FIL          generera till FIL (katalog om delad HTML),\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2403,7 +2428,7 @@
 "      --split-size=ANTAL      dela upp Info-filer vid storleken ANTAL\n"
 "                                (standardvärde %d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2417,7 +2442,7 @@
 "      --css-include=FIL          inkludera FIL i HTML <style>-utdata;\n"
 "                                   läs standard in om FIL är -.\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2431,7 +2456,7 @@
 "                                  (standard %d). Om VÄRDE är 0 kastas\n"
 "                                  mellanrum som kan ignoreras.\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2450,7 +2475,7 @@
 "  -U VARIABEL                    odefiniera variabeln VARIABEL, som med "
 "@clear.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2487,7 +2512,7 @@
 "\n"
 "  Dessutom, för flaggorna --no-ifFORMAT, behandla @ifnotFORMAT-text.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2501,7 +2526,7 @@
 "  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:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2528,67 +2553,67 @@
 "  makeinfo --no-split apa.texi          skriv en Info-fil hur stor den än "
 "är\n"
 
-#: makeinfo/makeinfo.c:615
+#: 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"
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n"
 
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:680
 #, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "%s: kunde inte öppna makroexpansionsutdata \"%s\""
 
-#: makeinfo/makeinfo.c:681
+#: 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:728
+#: 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\", "
 "inte \"%s\".\n"
 
-#: makeinfo/makeinfo.c:753
+#: makeinfo/makeinfo.c:757
 #, 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\".\n"
 
-#: makeinfo/makeinfo.c:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: filargument saknas.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Flerradskommandot %c%s används felaktigt"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "\"%s\" förväntades"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Kan inte skapa katalogen \"%s\": %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Inget \"%s\" hittades i \"%s\""
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
@@ -2599,17 +2624,12 @@
 #         no_headers ? "text" : (html ? "HTML" : "info"),
 #         output_filename, input_filename);
 #
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "Skapar %s-fil \"%s\" från \"%s\".\n"
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2617,114 +2637,119 @@
 "%s: Tar bort makroutdatafilen \"%s\" på grund av fel; använd --force för att "
 "bevara.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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 "
 "bevara.\n"
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Okänt kommando \"%s\""
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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"
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s förväntade klamrar"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Ensam }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "INGET_NAMN!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s saknar avslutande klammer"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image-filen \"%s\" (för HTML) är oläslig: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Det finns ingen sådan fil \"%s\""
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image-filen \"%s\" (för text) är oläslig: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image saknar filnamnsargument"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "odefinierad flagga: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Inget värde för \"%s\"}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s kräver ett namn"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Nådde filslut innan matchande @end %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "\"%.40s...\" är för lång för expansion; inte expanderad"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Ett } saknas i @multitable-mall"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ignorerar lös text \"%s\" efter @multitable"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "För många kolumner i multitabellsobjekt (max %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[oväntat] kan inte välja kolumn %d i multitabell"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "ignorerar @tab utanför multitabell"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Utdata på flera kolumner från senaste raden:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* kolumn %d: utdata = %s\n"
@@ -2749,7 +2774,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "Inget nodnamn angivet för kommandot \"%c%s\""
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Ankaret \"%s\" och noden \"%s\" mappas till samma filnamn"
@@ -2759,7 +2784,7 @@
 msgstr ""
 "Detta @anchor-kommando ignoreras; referenser till det kommer inte att fungera"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "Byt namn på detta ankare eller använd flaggan \"--no-split\""
 
@@ -2781,87 +2806,87 @@
 msgid "Up:"
 msgstr "Upp:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 "@anchor-kommandot ignoreras; referenser till det kommer inte att fungera"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Meny"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Kors"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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 "
 "avsnittsindelning?)"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Denna nod (%s) har den felaktiga föregående-noden"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Föreg"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Föregående-fältet i noden \"%s\" pekas inte till"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Denna nod (%s) har den felaktiga nästa-noden"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr "\"%s\" har inget upp-fält (kanske felaktig avsnittsindelning?)"
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Upp"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "noden \"%s\" har refererats %d gånger"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "orefererad nod \"%s\""
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "Tar bort %s\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Kan inte ta bort filen \"%s\": %s"
@@ -2901,20 +2926,12 @@
 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"
-
-#: makeinfo/xml.c:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image-filen \"%s\" är oläslig: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2958,32 +2975,32 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "Första argumentet till @inforef kan inte vara tomt"
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: varning: "
 
 # char *s = concat ("", strerror (errno), _(" for %s"));
 #
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " för %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -3004,11 +3021,18 @@
 "                     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"
@@ -3042,7 +3066,7 @@
 "                     information i själva Info-filen.\n"
 " --version         visa versionsinformation och avsluta.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3077,99 +3101,101 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: tom fil"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "END-INFO-DIR-ENTRY utan matchande START-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: har redan katalogfilen: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Ange Info-filen endast en gång.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "för många kommandoradsargument \"%s\""
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Ingen indatafil angiven; prova --help för mer information."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "Ingen katalogfil angiven; prova --help för mer information."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "ingen info-katalogpost i \"%s\""
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "menyposten \"%s\" finns redan, för filen \"%s\""
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "inga poster hittades för \"%s\"; ingenting togs bort"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "visa denna hjälptext och avsluta"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "behåll temporära filer efter behandling"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "behåll inte temporära filer efter behandling (standardalternativ)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "skicka utdata till FIL"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "visa versionsinformation och avsluta"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Användning: %s [FLAGGA]... FIL...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Generera ett sorterat index för varje TeX-utdataFIL.\n"
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, 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"
 
-#: util/texindex.c:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3178,27 +3204,54 @@
 "\n"
 "Flaggor:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: inte en texinfo-indexfil"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "misslyckande vid återöppnande av %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: inte en texinfo-indexfil"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Inget sidnummer i %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, 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"
 
+#, 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"
+#~ "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 "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)"
+
 # This is broken
 #
 #  N_("  %-10s  Search for a specified string in the index entries of this 
Info\n"),
@@ -3290,9 +3343,6 @@
 #~ 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"
-
 #~ msgid "No `%s.png' or `.jpg', and no extension supplied"
 #~ msgstr "Ingen \"%s.png\" eller \".jpg\" och ingen filändelse angiven"
 
Index: po/tr.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/tr.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- po/tr.po    8 Jun 2006 22:42:22 -0000       1.34
+++ po/tr.po    1 Jul 2007 18:43:37 -0000       1.35
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texinfo-4.7.94\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2005-02-04 18:34+0200\n"
 "Last-Translator: Eyüp Hakan Duran <address@hidden>\n"
 "Language-Team: Turkish <address@hidden>\n"
@@ -16,6 +16,71 @@
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.3\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: `%s' seçeneði belirsiz\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, 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:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: `--%s' seçeneði bilinmiyor\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: `%c%s' seçeneði bilinmiyor\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: kuraldýþý seçenek -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: geçersiz seçenek -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, 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:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: `-W %s' seçeneði belirsiz\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Bir karakter ileri gider"
@@ -227,38 +292,34 @@
 "\n"
 "* Menü: `%s' indislerini içeren düðümler:\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, 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:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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 ""
-"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"
+"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "`%s' için indeks girdisi yok.\n"
 
-#: info/info.c:593
+#: info/info.c:595
 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:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -294,6 +355,7 @@
 "  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"
@@ -335,8 +397,8 @@
 "baþla\n"
 "  info -f ./foo.info         dir'i aramadan ./foo.info dosyasýný göster\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -348,72 +410,72 @@
 "genel soru ve tartýþmalarý address@hidden'a gönderiniz.\n"
 "Texinfo anasayfasý: http://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "`%s' düðümü bulunamadý."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "`(%s)%s' düðümü bulunamadý."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Bir pencere bulunamadý!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Orasý bu pencerenin düðümü gibi görünmüyor!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Son pencere silinemez."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Bu düðümde menü yok."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Bu düðümde dipnot yok."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Bu düðümde çapraz baþvuru yok."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Bu düðüm için `%s' yer gösterici yok."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Info komutu `%c' bilinmiyor; yardým almak için `?' deneyin."
 
-#: info/info.c:682
+#: info/info.c:685
 #, 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:683
+#: info/info.c:686
 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:684
+#: info/info.c:687
 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:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Sadece bir pencere."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Pencere çok küçük olacaktý."
 
-#: info/info.c:687
+#: info/info.c:690
 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."
 
@@ -847,91 +909,91 @@
 msgid "There is no function named `%s'"
 msgstr "`%s' isimli bir iþlev yok"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "argüman sayýsý yanlýþ"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "`%s' girdi dosyasý açýlamýyor"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "`%s' çýktý dosyasý oluþturulamýyor"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "`%s''e yazma hatasý"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "`%s' çýktý dosyasýný kapatmada hata"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "anahtar sýralamasý çok uzun"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "anahtar sýralamasý kayýp"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "NUL karakterine (\\000) izin verilmiyor"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "NUL karakterine (^%c) izin verilmiyor"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "kayýp eylem adý"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "bölüm çok uzun"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "bilinmeyen eylem `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "eylem adý çok uzun"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "`%s' eylemini izleyen fazladan karakterler"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "kayýp deðiþken adý"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "deðiþken adýndan hemen sonra kayýp `=' "
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "deðiþken adý çok uzun"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "deðer çok uzun"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "\"%s\", satýr %u: "
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1037,7 +1099,7 @@
 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:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1047,7 +1109,7 @@
 "dosyalar:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "%s dosyasý manipüle edilemedi.\n"
@@ -1116,7 +1178,7 @@
 msgid "Move to the start of the line"
 msgstr "Satýr baþýna gider"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Sonraki"
 
@@ -1599,7 +1661,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Dahili olarak \\[universal argument] tarafýndan kullanýlýyor"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "okuma-satýrý: Sanal bellek tükendi!\n"
@@ -1694,138 +1756,91 @@
 msgid " Subfile: %s"
 msgstr " Altdosya: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: `%s' seçeneði belirsiz\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, 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"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, 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"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: `%s' seçeneði bir argümanla kullanýlýr\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: `--%s' seçeneði bilinmiyor\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: `%c%s' seçeneði bilinmiyor\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: kuraldýþý seçenek -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: geçersiz seçenek -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: seçenek bir argümanla kullanýlýr -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: `-W %s' seçeneði belirsiz\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, 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"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "@%s'ye argümanlar yok sayýldý"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Ocak"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "Þubat"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "Mart"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "Nisan"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "Mayýs"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "Haziran"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "Temmuz"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "Aðustos"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "Eylül"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "Ekim"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "Kasým"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "Aralýk"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var içinde düþük olasýlýklý karakter %c"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc argümaný tamamen büyükharf(le yazýlmýþ), etkisiz"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "`{' beklenirdi, `%c' görüldü"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "fiil bloðu içinde dosya sonu"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "`}' beklenirdi, `%c' görüldü"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1833,49 +1848,49 @@
 "@strong{Not...} Info'da sahte bir çapraz-baþvuru oluþturur; bundan kaçýnmak "
 "için yazýmý deðiþtirin"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s kullanýmdan kalkmýþ"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, 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:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s'ye hatalý argüman"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "yok"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "@%s'ye hatalý argüman"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "ekle"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "@%s'ye hatalý argüman"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1913,12 +1928,12 @@
 msgstr "Yöntem"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "kapalý"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "açýk"
 
@@ -1951,8 +1966,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Bkz "
@@ -1975,7 +1990,7 @@
 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:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Dipnotlar"
 
@@ -1984,64 +1999,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: açýlamayan --css-dosyasý: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: --css-dosyasý yorum içinde sonlandý"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Adsýz"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "hayýr :"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[beklenmeyen] geçersiz düðüm ismi: `%s'"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Bilinmeyen indeks `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, 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:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Ýndeks `%s' zaten mevcut"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, 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:662
 msgid "(line )"
 msgstr "(satýr )"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(satýr %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex içinde bilinmeyen indeks `%s'"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "`%s' indeks girdisi tüm düðümlerin dýþýnda"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(tüm düðümlerin dýþýnda)"
 
@@ -2146,37 +2161,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' bloðunun içinde @itemx anlamlý deðil"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "%c%s, bir ekleme bloðunun dýþýnda bulundu"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, 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:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "tanýnmayan kodlama adý `%s'"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "üzgünüm, `%s' kodlamasý desteklenmiyor"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "geçersiz kodlanmýþ karakter `%s'"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, 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:1131
+#: makeinfo/lang.c:1476
 #, 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"
@@ -2191,56 +2211,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "iþte `%s''nin önceki tanýmý"
 
-#: makeinfo/macro.c:356
+#: 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"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 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:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "%cson makrosu bulunamadý"
 
-#: makeinfo/macro.c:625
-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 ""
+
+#: makeinfo/macro.c:606
+msgid "@quote-arg is deprecated; arguments are quoted by default"
+msgstr ""
 
-#: makeinfo/macro.c:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@%s ile eþleþmeyen @end %s"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Çok sayýda hata!  Vazgeçildi.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: uyarý: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Yanlýþ yerleþtirilmiþ %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Daha fazla bilgi için `%s --help' yazýn.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Kullaným: %s [SEÇENEK]... TEXINFO-DOSYASI...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2249,7 +2273,7 @@
 "Info dosyalarý çevrimiçi Emacs ya da tek baþýna GNU Info'yla okunmak için "
 "uygundur.\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2275,7 +2299,7 @@
 "  -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:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2290,7 +2314,7 @@
 "      --xml                  Info yerine XML (TexinfoML) çýktýsý üretir.\n"
 "      --plaintext            Info yerine salt metin çýktýsý üretir.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2324,7 +2348,7 @@
 "  -o, --output=DOSYA         çýktýyý DOSYA'ya yazar (bölünmüþ HTML ise "
 "dizine).\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2362,7 +2386,7 @@
 "      --spilt-size=NUM        Info dosyalarýný NUM boyutuna böler (öntanýmlý "
 "%d).\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2376,7 +2400,7 @@
 "      --css-include=DOSYA        DOSYA'yý HTML <style> çýktýsýnda içer;\n"
 "                                   eðer DOSYA - ise stdin'i oku.\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2391,7 +2415,7 @@
 "                                     eðer DEÐER 0 ise yok sayýlabilen beyaz "
 "boþluk silinir..\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2409,7 +2433,7 @@
 "  -U VAR                         VAR deðiþkeninin tanýmýný, @clear ile "
 "olduðu gibi geri alýr.\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2445,7 +2469,7 @@
 "\n"
 "  Ayrýca --no-ifFORMAT seçenekleri için ifnotFORMAT metnini iþler.\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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,7 +2483,7 @@
 "  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:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2488,83 +2512,78 @@
 "  makeinfo --no-split foo.texi          ne büyüklükte olursa olsun tek Info "
 "dosyasý yazar\n"
 
-#: makeinfo/makeinfo.c:615
+#: 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:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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:681
+#: 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:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: dosya argümaný eksik.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Çok satýrlý komut %c%s uygunsuz kullanýldý"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "`%s' gerekir"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "`%1$s' dizini oluþturulamýyor: %2$s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%2$s' içinde `%1$s' yok"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, 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:1662
+#: makeinfo/makeinfo.c:1664
 #, 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:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2572,114 +2591,119 @@
 "%1$s: Makro çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --"
 "force kullanýnýz.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Bilinmeyen komut `%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s küme parantezi bekledi"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Eþleþmemiþ }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "ÝSÝMSÝZ!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s eksik kapama }"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, 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:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "`%s' adýnda dosya yok"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, 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:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image eksik dosyaadý argümaný"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "tanýmlanmamýþ bayrak: %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "(`%s' için deðer yok)"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s bir isim gerektirir"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "Eþleþen @end %s'den önce dosya sonuna ulaþýldý"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "`%.40s...' geniþleme için çok uzun; geniþletilmedi"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "@multitable þablonunda eksik }"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "@multitable'dan sonraki baþýboþ metin `%s' yoksayýlýyor"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "Çok-tablolu öðede, çok fazla sütun (maks %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[beklenmeyen] çok-tabloluda sütun #%d seçilemiyor"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "çok-tablolunun dýþýndaki @tab yoksayýlýyor"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "**Son satýrdan çok-sütunlu çýktý:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* sütun #%d: çýktý = %s\n"
@@ -2704,7 +2728,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "`%c%s' komutu için bir düðüm adý belirtilmedi"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, 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"
@@ -2713,7 +2737,7 @@
 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:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 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"
 
@@ -2734,86 +2758,86 @@
 msgid "Up:"
 msgstr "Yukarý:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, 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:1154
+#: makeinfo/node.c:1164
 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:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Menü"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Çapraz"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, 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:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Bu düðüm (%s) hatalý Önceki'ne sahip"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Önceki"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, 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:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Bu düðüm (%s) hatalý Sonraki'ne sahip"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, 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:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Yukarý"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "düðüm `%s''e %d kez baþvuruldu"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "baþvurulmamýþ düðüm `%s'"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "%s siliniyor\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "`%s' dosyasý silinemiyor: %s"
@@ -2853,20 +2877,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image dosyasý `%1$s' okunamýyor: %2$s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr "@multitable'ýn son öðesi @headitem geçersiz Docbook belgeleri üretiyor"
@@ -2908,30 +2924,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "@inforef'e ilk argüman boþ olmayabilir"
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: uyarý: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " %s için"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2952,11 +2968,18 @@
 "                     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"
@@ -2994,7 +3017,7 @@
 "                     belirlenir.\n"
 " --version           sürüm bilgisini görüntüler ve çýkar.\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3030,100 +3053,102 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: boþ dosya"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
 msgstr "Eþleþen START-INFO-DIR-ENTRY'siz END-INFO-DIR-ENTRY"
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: zaten dir dosyasý var: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: Info dosyasýný yalnýzca bir kez belirtin.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "fazladan komut satýrý argümaný `%s'"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "Girdi dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 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:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "`%s' içinde info dizin girdisi yok"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "`%2$s' dosyasý için menü öðesi `%1$s' zaten mevcut"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "`%s' için girdi bulunamadý; hiçbir þey silinmedi"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "bu yardýmý görüntüler ve çýkar"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "iþlemden sonra geçici dosyalarý etrafta bulundurur"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "iþlemden sonra geçici dosyalarý etrafta bulundurmaz (öntanýmlý)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "çýktýyý DOSYA'ya gönderir"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "sürüm bilgisini görüntüler ve çýkar"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Kullaným: %s [SEÇENEK]... DOSYA...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3132,27 +3157,54 @@
 "\n"
 "Seçenekler:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: bir texinfo indeks dosyasý deðil"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "%s'i yeniden açmada hata"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: bir texinfo indeks dosyasý deðil"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "%s'de sayfa numarasý yok"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "%s girdisi, ikincil isimli bir girdiyi takip ediyor"
 
+#, 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 ""
+#~ "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"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr "@quote arg.ý yalnýzca tek argümanlý makrolarda yararlý"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Ýçindekiler Tablosu"
+
+#~ msgid "Short Contents"
+#~ msgstr "Kýsa Ýçerik"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "iþlemden sonra geçici dosyalarý etrafta bulundurur"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "iþlemden sonra geçici dosyalarý etrafta bulundurmaz (öntanýmlý)"
+
 #~ msgid ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr ""
Index: po/vi.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/vi.po,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- po/vi.po    8 Jun 2006 22:42:22 -0000       1.3
+++ po/vi.po    1 Jul 2007 18:43:37 -0000       1.4
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: texinfo-4.7.94\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2006-01-13 19:30+1030\n"
 "Last-Translator: Clytie Siddall <address@hidden>\n"
 "Language-Team: Vietnamese <address@hidden>\n"
@@ -16,6 +16,71 @@
 "Plural-Forms: nplurals=1; plural=0\n"
 "X-Generator: LocFactoryEditor 1.6b23\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: tùy chọn « %s » là mơ hồ\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, 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:593 gnulib/lib/getopt.c:598
+#, 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:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, 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:698 gnulib/lib/getopt.c:701
+#, 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:709 gnulib/lib/getopt.c:712
+#, 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:764 gnulib/lib/getopt.c:767
+#, 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:773 gnulib/lib/getopt.c:776
+#, 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:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, 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:897 gnulib/lib/getopt.c:913
+#, 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:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+msgid "memory exhausted"
+msgstr ""
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "Đi tiếp một ký tự"
@@ -230,38 +295,34 @@
 "\n"
 "* Trình đơn: nút có chỉ mục chứa « %s »:\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "Hãy thử lệnh « --help » (trợ giúp) để xem thông tin 
thêm.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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 ""
-"Bản quyền © %s Tổ chức Phần mềm Tự do.\n"
-"Không bảo đảm gì cả. Bạn có thể phân phối lại phần mềm 
này\n"
-"với điều kiện của Quyền công chung Gnu (GPL).\n"
-"Để gọi thông tin thêm về chủ đề này thì hãy xem tập tin 
có tên 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:501
+#: info/info.c:503
 #, 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:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 "  -b, --speech-friendly        _chấp nhận_ thiết bị tổng hợp 
_tiếng nói_.\n"
 
-#: info/info.c:600
-#, c-format
+#: info/info.c:602
+#, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
 "\n"
@@ -297,6 +358,7 @@
 "  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 ""
 "Cách sử dụng: %s [TÙY_CHỌN]... [MỤC_TRÌNH_ĐƠN...]\n"
@@ -346,8 +408,8 @@
 "  info -f ./phu.info         hiện tập tin <./phu.info>, mà không tìm 
kiếm « "
 "dir »\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -359,72 +421,72 @@
 "và gởi câu hỏi chung v.v. cho <address@hidden>.\n"
 "Trang chủ texinfo: <http://www.gnu.org/software/texinfo/>."
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "Không tìm thấy nút « %s »."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "Không tìm thấy nút « (%s)%s »."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "Không tìm thấy cửa sổ."
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "Điểm không xuất hiện ở trong cái nút thông tin của 
cửa sổ này."
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "Không thể xóa bỏ cửa sổ cuối cùng."
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "Không có trình đơn trong nút này."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "Không có cước chú trong nút này."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "Không có tham chiếu chéo trong nút này."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "Không có con trỏ « %s » cho nút này."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "Không biết lệnh « %c »: bạn hãy thử lệnh « ? » (trợ 
giúp)."
 
-#: info/info.c:682
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "Kiểu thiết bị cuối « %s » không đủ thông minh để 
chạy « info »."
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "Bạn đạng ở trang cuối cùng của nút này."
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "Bạn đạng ở trang đầu tiên của nút này."
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Chỉ một cửa sổ."
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "Cửa sổ kết quả sẽ quá nhỏ."
 
-#: info/info.c:687
+#: info/info.c:690
 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 bỏ một 
cửa sổ."
 
@@ -883,91 +945,91 @@
 msgid "There is no function named `%s'"
 msgstr "Không có chức năng tên « %s »"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "có số đối số không đúng"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "Không thể mở tập tin nhập « %s »"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "không thể tạo tập tin xuất « %s »"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "gặp lỗi khi ghi vào « %s »"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "gặp lỗi khi đóng tập tin xuất « %s »"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "chuỗi phím quá dài"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "thiếu chuỗi phím"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "Không cho phép ký tự trống (\\000)"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "Không cho phép ký tự trống (^%c)"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "thiếu tên hành động"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "phần quá dài"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "không biết hành động « %s »"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "Tên hành động quá dài"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "có ký tự thêm sau hành động « %s »"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "thiếu tên biến"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "thiếu ký tự bằng « = » ngay sau tên biến"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "tên biến quá dài"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "giá trị quá dài"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "« %s », dòng %u:"
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1077,7 +1139,7 @@
 msgid "Set screen height to (%d): "
 msgstr "Lập độ cao của màn hình thành (%d):"
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1086,7 +1148,7 @@
 "   Các tập tin mã nguồn được grep với nhau để tạo tập tin 
này bao gồm:\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "Không thể thao tác tập tin %s.\n"
@@ -1155,7 +1217,7 @@
 msgid "Move to the start of the line"
 msgstr "Về đầu dòng"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "Kế"
 
@@ -1642,7 +1704,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "Dùng bên trong bởi « \\[universal-argument] » (đối số toàn 
thể)"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: hết bộ nhớ ảo.\n"
@@ -1732,138 +1794,91 @@
 msgid " Subfile: %s"
 msgstr " Tập tin con: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: tùy chọn « %s » là mơ hồ\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, 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"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, 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"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: tùy chọn « %s » cần đến đối số\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: không nhận ra tùy chọn « --%s »\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: không nhận ra tùy chọn « %c%s »\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: không cho phép tùy chọn « -- %c »\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: tùy chọn không hợp lệ « -- %c »\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: tùy chọn cần đến đối số « -- %c »\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: tùy chọn « -W %s » là mơ hồ\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, 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"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, c-format
 msgid "arguments to @%s ignored"
 msgstr "đối số tới « @%s » bị bỏ qua"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Tháng Giêng"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "Tháng Hai"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "Tháng Ba"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "Tháng Tư"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "Tháng Năm"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "Tháng Sáu"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "Tháng Bảy"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "Tháng Tám"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "Tháng Chín"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "Tháng Mười"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "Tháng Mười Một"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "Tháng Chạp"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "gặp ký tự không thường %c trong « @var »"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "đối số « @sc » toàn chữ hoa nên không có tác động"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "ngờ « { » còn gặp « %c »"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "kết thức tập tin ở trong khối động từ"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "ngờ « } » còn gặp « %c »"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
@@ -1871,49 +1886,49 @@
 "« @strong{Note...} » gây ra tham chiếu chéo giả trong Info; hãy 
sửa đổi để "
 "tránh nó"
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s quá cũ"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "« @sp » cần đến một đối số thuộc số, không phải 
'%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "Đối số sai tới %c%s"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "như thế"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "không có"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, c-format
 msgid "Bad argument to @%s"
 msgstr "Đối số sai tới @%s"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr "chèn"
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "Đối số sai tới @%s"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1951,12 +1966,12 @@
 msgstr "Phương pháp"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr "trên"
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr "trên"
 
@@ -1989,8 +2004,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "Xem"
@@ -2016,7 +2031,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "không cho phép cước chú ở trong cước chú (lồng nhau)"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "Cước chú"
 
@@ -2025,64 +2040,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr "%s: không thể mở tập tin « --css-file »: %s"
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr "%s:%d: tập tin « --css-file » kết thức với ghi chú"
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "Không tên"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr "[bất ngờ] không có thẻ html cần bật"
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "[bất ngờ] tên nút không hợp lệ: « %s »"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "Không biết chỉ mục « %s »"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info không thể xử lý dấu hai chấm « : » trong điều 
chỉ mục « %s »"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Chỉ mục « %s » đã có."
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "Không biết chỉ mục « %s » và/hay « %s » trong « @synindex 
»"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr "(dòng)"
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr "(dòng %*d)"
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "Không biết chỉ mục « %s » trong « @printindex »"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "Điều nhập cho chỉ mục « %s » ở ngoại nút nào"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(ở ngoại nút nào)"
 
@@ -2195,37 +2210,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "« @itemx » không có nghĩa ở trong khối « %s »"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "gặp « %c%s » ở ngoại một khối chèn"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s không phải là một mã ngôn ngữ kiểu ISO 639 hợp lệ"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "không nhận ra tên mã hóa « %s »"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "tiếc là không hỗ trợ mã hóa « %s »"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ký tự đã mã hóa không hợp lệ: « %s »"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "« %c%s » ngờ « i » hay « j » là đối số, không phải « 
%c »"
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "« %c%s » ngờ một ký tự riêng lẻ « i » hay « j » là 
đối số"
@@ -2240,59 +2260,63 @@
 msgid "here is the previous definition of `%s'"
 msgstr "đây là lời định nghĩa trước của « %s »"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 "« \\ » trong lời mở rộng bộ lệnh có « %s » theo sau, thay vào 
tên tham số"
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "Bộ lệnh « %s » được gọi trên dòng %d với quá nhiều 
đối số"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "Không tìm thấy bộ lệnh « %cend »"
 
-#: makeinfo/macro.c:625
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "« @quote-arg » (đối số trích dẫn) chỉ hữu ích cho bộ 
lệnh đối số đơn"
+#: 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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "khớp sai « @end » « %s » với « @%s »"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "Quá nhiều lỗi nên thôi.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: cảnh báo : "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "Định vị sai %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "Hãy thử lệnh « %s --help » (trợ giúp) để xem thông tin 
thêm.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr ""
 "Cách sử dụng: %s [TÙY_CHỌN]... TTT...\n"
 "\t[TTT\t\tTập Tin Texinfo]\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2300,7 +2324,7 @@
 "Dịch tài liệu nguồn Texinfo sang nhiều khuôn 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:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2333,7 +2357,7 @@
 "  -v, --verbose               \tdiễn tả cái gì xảy ra (_chi 
tiết_).\n"
 "      --version               \t\thiện thông tin _phiên bản_ rồi 
thoát.\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2348,7 +2372,7 @@
 "      --xml                 \txuất Texinfo XML hơn là Info.\n"
 "      --plaintext           \txuất _văn bản thô_ hơn là Info.\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2384,7 +2408,7 @@
 "  -o, --output=TẬP_TIN\n"
 "\t\t_xuất_ ra tập tin tên này (ra thư mục nếu xuất HTML đã chi 
tách)\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2428,7 +2452,7 @@
 "\t\tchia tách tập tin Info tại kích cỡ SỐ này (mặc định là 
%d).\n"
 "\t\t\t(_chia tách kích cỡ_)\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 #, fuzzy
 msgid ""
 "Options for HTML:\n"
@@ -2444,7 +2468,7 @@
 "            \tđọc thiết bị nhập chuẩn nếu tập tin này là « 
- » .\n"
 "\t\t\t(_bao gồm CSS_)\n"
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, fuzzy, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2459,7 +2483,7 @@
 "\t\tnếu giá trị này là 0, xóa bỏ các dấu cách có thể bỏ 
qua.\n"
 "\t\t\t(_xuất thụt lề_)\n"
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2481,7 +2505,7 @@
 "  -U GIÁ_TRỊ\n"
 "\t\tbỏ xác định giá trị này, như với « @clear » (xóa).\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2533,7 +2557,7 @@
 "  Hơn nữa, cho những tùy chọn « --no-ifFORMAT »,\n"
 "  có phải xử lý văn bản « @ifnotFORMAT ».\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2549,7 +2573,7 @@
 " \tvăn bản thô \t\t--ifplaintext\tcác điều khác\n"
 "  \tXML\t\t\t\t--ifxml\t\tcác điều khác\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2580,30 +2604,30 @@
 "  makeinfo --no-split foo.texi\n"
 "\t\tghi chỉ một tập tin Info, bất chấp kích cỡ (_không chia 
tách_)\n"
 
-#: makeinfo/makeinfo.c:615
+#: 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 » (khuôn "
 "dạng xuất Texinfo) « %s ».\n"
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, 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:676
+#: 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 bộ lệnh « %s »"
 
-#: makeinfo/makeinfo.c:681
+#: 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 bộ lệnh thứ hai « 
%s ».\n"
 
-#: makeinfo/makeinfo.c:728
+#: makeinfo/makeinfo.c:732
 #, c-format
 msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
 msgstr ""
@@ -2613,7 +2637,7 @@
 " • asis\t\tnhư thế\n"
 "không phải « %s ».\n"
 
-#: makeinfo/makeinfo.c:753
+#: makeinfo/makeinfo.c:757
 #, c-format
 msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
 msgstr ""
@@ -2622,49 +2646,44 @@
 " • end\t\tkết thúc\n"
 "không phải « %s ».\n"
 
-#: makeinfo/makeinfo.c:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: thiếu đối số tập tin.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr "Lệnh đa dòng %c%s được dùng một cách không đúng"
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Ngờ « %s »"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "Không thể tạo thư mục « %s »: %s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "Không tìm thấy « %s » trong « %s »."
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 "%s: Đang nhảy qua việc mở rộng bộ lệnh ra thiết bị xuất 
chuẩn vì kết xuất "
 "Info đang đi ra đó.\n"
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, 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:1697
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "Đây là %s, được tạo bởi makinfo phiên bản %s từ %s.\n"
-
-#: makeinfo/makeinfo.c:1733
+#: makeinfo/makeinfo.c:1728
 #, c-format
 msgid ""
 "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2672,114 +2691,119 @@
 "%s: Đang gỡ bỏ tập tin xuất bộ lệnh « %s » vì gặp lỗi; 
hãy dùng tùy chọn « --"
 "force » (buộc) để bảo tồn nó.\n"
 
-#: makeinfo/makeinfo.c:1788
+#: makeinfo/makeinfo.c:1783
 #, 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 » vì gặp lỗi; hãy dùng 
tùy chọn « --force "
 "» (buộc) để bảo tồn nó.\n"
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "Không biết lệnh « %s »"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, 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:2361
+#: makeinfo/makeinfo.c:2358
 #, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ngờ dấu ngoặc móc {}"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "Chưa khớp }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "Không có tên."
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s: thiếu dấu ngoặc móc đóng « } »"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "Đây là %s, được tạo bởi makinfo phiên bản %s từ %s.\n"
+
+#: makeinfo/makeinfo.c:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "Tập tin « @image » (ảnh) « %s » (cho HTML) không đọc 
được: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, c-format
 msgid "No such file `%s'"
 msgstr "Không có tập tin như vậy « %s »"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "Tập tin « @image » (ảnh) « %s » (cho văn bản) không đọc 
được: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "« @image » (ảnh) thiếu đối số tên tập tin"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr "chưa định nghĩa cờ : %s"
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{Không có giá trị cho « %s »}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s cần đến tên"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, 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 » (kết 
thúc) %s"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, 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
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "Thiếu « } » trong biểu mẫu « @multitable » (đa bảng)"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "Đang bỏ qua chữ rải rác « %s » sau « @multitable » (đa 
bảng)"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, 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:556
+#: makeinfo/multi.c:564
 #, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "[bất ngờ] không thể chọn cột số %d trong đa bảng"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "đang bỏ qua « @tab » bên ngoài đa bảng"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** Kết xuất đa cột từ hàng cuối cùng:\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* cột số %d; kết xuất = %s\n"
@@ -2804,7 +2828,7 @@
 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:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Neo « %s » và nút « %s » có ánh xạ tới cùng một tên 
tập tin"
@@ -2814,7 +2838,7 @@
 msgstr ""
 "Lệnh « @anchor » (neo) bị bỏ qua nên tham chiếu đến nó sẽ 
không hoạt động"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 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)"
@@ -2836,89 +2860,89 @@
 msgid "Up:"
 msgstr "Lên:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Neo cả « %s » lẫn « %s » đều ánh xạ tới cùng một 
tên tập tin"
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 "Lệnh « @anchor » (neo) bị bỏ qua nên tham chiếu đến nó sẽ 
không hoạt động"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, 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:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "Trình đơn"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "Chéo"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 "Không có điều 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:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "Nút này (%s) có Trước sai"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "Trước"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "Không có điều chỉ tới trường trước của nút « %s »"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "Nút này (%s) có Kế sai"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, 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:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Lên"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, 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:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "nút « %s » đã được tham chiếu %d lần"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "nút chưa được tham chiếu « %s »"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr "Đang gỡ bỏ %s...\n"
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "Không thể gỡ bỏ tập tin « %s »: %s"
@@ -2958,20 +2982,12 @@
 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 là %s"
 
-#: makeinfo/toc.c:197 makeinfo/toc.c:271 makeinfo/toc.c:273
-msgid "Table of Contents"
-msgstr "Mục lục"
-
-#: makeinfo/toc.c:304 makeinfo/toc.c:337 makeinfo/toc.c:339
-msgid "Short Contents"
-msgstr "Mục lục ngắn"
-
-#: makeinfo/xml.c:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "Không thể đọc tập tin « @image » (ảnh) « %s »: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -3016,31 +3032,31 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: cảnh báo :"
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr " cho %s"
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, c-format
 msgid "\tTry `%s --help' for a complete list of options.\n"
 msgstr ""
 "Hãy thử lệnh « %s --help » (trợ giúp) để xem danh sách tùy 
chọn hoàn toàn.\n"
 
-#: util/install-info.c:434
-#, c-format
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -3061,11 +3077,18 @@
 "                     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 ""
 "Cách sử dụng: %s [TÙY_CHỌN]... [TI [TTM]]\n"
@@ -3104,7 +3127,7 @@
 "\t\t\tcó quyết định chúng từ thông tin trong tập tin Info chính 
nó.\n"
 " --version         \thiện thông tin _phiên bản_ rồi thoát\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -3141,107 +3164,109 @@
 "\n"
 "%s\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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"
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: tập tin rỗng"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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) khớp"
 
-#: util/install-info.c:948
+#: util/install-info.c:979
 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) khớp"
 
-#: util/install-info.c:1191 util/install-info.c:1201
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr "%s: đã có tập tin thư mục: %s\n"
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, 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 thôi.\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "đối số dòng lệnh thừa « %s »"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr ""
 "Chưa ghi rõ tập tin nhập. Hãy chạy lệnh « --help » (trợ giúp) 
để xem thông "
 "tin thêm."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 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 « --help » (trợ 
giúp) để xem "
 "thông tin thêm."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "không có mục nhập thư mục Info trong « %s »"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "mục trình đơn « %s » đã có, cho tập tin « %s »"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "không tìm thấy mục nhập cho « %s »; không xóa bỏ gì"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "hiển thị trợ giúp này rồi thoát"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "giữ lại các tập tin tạm thời sau khi xử lý"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "không giữ lại các tập tin tạm thời sau khi xử lý (mặc 
định)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "xuất ra tập tin này"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "hiển thị thông tin phiên bản rồi thoát"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, 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:279
+#: util/texindex.c:239
 #, 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:282
+#: util/texindex.c:242
 #, 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 <foo.%c%c> cho tài liệu 
dạng <foo.texi>.\n"
 
-#: util/texindex.c:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3250,27 +3275,55 @@
 "\n"
 "Tùy chọn:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: không phải là tập tin chỉ mục texinfo"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "lỗi mở lại %s"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: không phải là tập tin chỉ mục texinfo"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "Không có số thứ tự trang trong %s"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "mục nhập %s đi theo một mục nhập có tên phụ"
 
+#, 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 ""
+#~ "Bản quyền © %s Tổ chức Phần mềm Tự do.\n"
+#~ "Không bảo đảm gì cả. Bạn có thể phân phối lại phần 
mềm này\n"
+#~ "với điều kiện của Quyền công chung Gnu (GPL).\n"
+#~ "Để gọi thông tin thêm về chủ đề này thì hãy xem tập tin 
có tên COPYING.\n"
+
+#~ msgid "@quote-arg only useful for single-argument macros"
+#~ msgstr ""
+#~ "« @quote-arg » (đối số trích dẫn) chỉ hữu ích cho bộ 
lệnh đối số đơn"
+
+#~ msgid "Table of Contents"
+#~ msgstr "Mục lục"
+
+#~ msgid "Short Contents"
+#~ msgstr "Mục lục ngắn"
+
+#~ msgid "keep temporary files around after processing"
+#~ msgstr "giữ lại các tập tin tạm thời sau khi xử lý"
+
+#~ msgid "do not keep temporary files around after processing (default)"
+#~ msgstr "không giữ lại các tập tin tạm thời sau khi xử lý 
(mặc định)"
+
 #~ msgid ""
 #~ "There is NO warranty.  You may redistribute this software\n"
 #~ "under the terms of the GNU General Public License.\n"
Index: po/zh_CN.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/zh_CN.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- po/zh_CN.po 8 Jun 2006 22:42:22 -0000       1.29
+++ po/zh_CN.po 1 Jul 2007 18:43:37 -0000       1.30
@@ -7,7 +7,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.2\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2002-05-06 16:10+0800\n"
 "Last-Translator: Wang Li <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
@@ -15,6 +15,72 @@
 "Content-Type: text/plain; charset=gb2312\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s£ºÑ¡Ïî¡°%s¡±º¬Òå²»Ã÷È·\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°--%s¡±²»½ÓÊܲÎÊý\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°%c%s¡±²»½ÓÊܲÎÊý\n"
+
+#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°%s¡±ÐèÒªÒ»¸ö²ÎÊý\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°--%s¡±\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°%c%s¡±\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s£º·Ç·¨Ñ¡Ïî -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s£ºÎÞЧѡÏî -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s£ºÑ¡ÏîÐèÒªÒ»¸ö²ÎÊý -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s£ºÑ¡Ïî¡°-W %s¡±µÄº¬Òå²»Çå\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, c-format
+msgid "%s: option `-W %s' doesn't allow an argument\n"
+msgstr "%s£ºÑ¡Ïî¡°-W %s¡±²»½ÓÊܲÎÊý\n"
+
+#: gnulib/lib/xalloc-die.c:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "ÐéÄâÄÚ´æºÄ¾¡"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "ÏòÇ°Òƶ¯Ò»¸ö×Ö·û"
@@ -223,36 +289,32 @@
 "\n"
 "* ²Ëµ¥£ºÆäË÷Òýº¬ÓС°%s¡±µÄ½Úµã£º\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "³¢ÊÔ --¸ü¶àµÄÇóÖúÐÅÏ¢¡£\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
+"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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "ÕÒ²»µ½º¬ÓС°%s¡±µÄË÷Òý\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -289,6 +351,7 @@
 "  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"
@@ -323,8 +386,8 @@
 "  info --show-options emacs  ´Ó emacs µÄÃüÁîÐÐÑ¡Ïî½Úµã¿ªÊ¼\n"
 "  info -f ./foo.info         ÏÔʾÎļþ ./foo.info£¬¶ø²»ÊÇËÑË÷Ŀ¼\n"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 msgid ""
 "\n"
 "Email bug reports to address@hidden,\n"
@@ -336,72 +399,72 @@
 "Ò»°ãµÄÎÊÌâºÍÌÖÂÛÇë·¢Ë͵½ address@hidden"
 "Texinfo Ö÷Ò³£ºhttp://www.gnu.org/software/texinfo/";
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "ÎÞ·¨ÕÒµ½½Úµã¡°%s¡±¡£"
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "ÎÞ·¨ÕÒµ½½Úµã¡°(%s)%s¡±¡£"
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "ÎÞ·¨ÕÒµ½Ò»¸ö´°¿Ú£¡"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "¹â±êûÓгöÏÖÔڸô°¿ÚµÄ½ÚµãÖ®ÖУ¡"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "ÎÞ·¨É¾³ý×îºóµÄ´°¿Ú¡£"
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "¸Ã½ÚµãÖÐûÓв˵¥¡£"
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "¸Ã½ÚµãÖÐûÓнÅ×¢¡£"
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "¸Ã½ÚµãÖÐûÓн»²æÒýÓá£"
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "¸Ã½ÚµãÖÐûÓС°%s¡±Ö¸Õë"
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "δ֪µÄ Info ÃüÁî¡°%c¡±£»ÇëÒÔ¡°?¡±»ñµÃ°ïÖú¡£"
 
-#: info/info.c:682
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "ÖÕ¶ËÀàÐÍ¡°%s¡±µÄÄÜÁ¦²»×ãÒÔÖ§³Ö Info µÄÔËÐС£"
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "ÄúÒѾ­ÔڸýڵãµÄ×îºóÒ»¸öÒ³ÃæÖÐÁË¡£"
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "ÄúÒѾ­ÔڸýڵãµÄµÚÒ»Ò³ÖÐÁË¡£"
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "Ö»ÓÐÒ»¸ö´°¿Ú¡£"
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "½á¹û´°¿Ú½«»á̫С¡£"
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "ûÓÐ×ã¹»µÄ¿Õ¼äÓÃÓÚÇóÖú´°¿Ú£¬Çëɾ³ýÒ»¸ö´°¿Ú¡£"
 
@@ -824,91 +887,91 @@
 msgid "There is no function named `%s'"
 msgstr "ûÓÐÃûΪ¡°%s¡±µÄº¯Êý"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr "´íÎóµÄ²ÎÊýÊý"
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, c-format
 msgid "cannot open input file `%s'"
 msgstr "ÎÞ·¨´ò¿ªÊäÈëÎļþ¡°%s¡±"
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, c-format
 msgid "cannot create output file `%s'"
 msgstr "ÎÞ·¨´´½¨Êä³öÎļþ¡°%s¡±"
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr "дÈë¡°%s¡±Ê±³ö´í"
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, c-format
 msgid "error closing output file `%s'"
 msgstr "¹Ø±ÕÊä³öÎļþ¡°%s¡±Ê±³ö´í"
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr "°´¼üÐòÁйý³¤"
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr "ÒÅ©°´¼üÐòÁÐ"
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr "²»ÔÊÐíµÄ¿Õ×Ö·û (\\\\000)"
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr "²»ÔÊÐíµÄ¿Õ×Ö·û (^%c)"
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 msgid "missing action name"
 msgstr "ÒÅ©¶¯×÷Ãû³Æ"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr "½ÚÌ«³¤"
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, c-format
 msgid "unknown action `%s'"
 msgstr "δ֪µÄ¶¯×÷¡°%s¡±"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr "¶¯×÷Ãû¹ý³¤"
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr "¶¯×÷¡°%s¡±Ö®ºó³öÏÖ¶îÍâµÄ×Ö·û"
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 msgid "missing variable name"
 msgstr "ÒÅ©±äÁ¿Ãû"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr "±äÁ¿ÃûÖ®ºóÒÅ©ÁË¡°=¡±"
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr "±äÁ¿Ãû¹ý³¤"
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr "Öµ¹ý³¤"
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr "¡°%s¡±£¬ÐÐ %u£º"
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1007,7 +1070,7 @@
 msgid "Set screen height to (%d): "
 msgstr "½«ÆÁÄ»¸ß¶ÈÉèÖÃΪ (%d)£º"
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
@@ -1016,7 +1079,7 @@
 "   ÕûÀíÔ´ÎļþÒÔʹ±¾Îļþ°üÀ¨£º\n"
 "\n"
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "ÎÞ·¨²Ù×÷Îļþ %s¡£\n"
@@ -1083,7 +1146,7 @@
 msgid "Move to the start of the line"
 msgstr "Òƶ¯µ½ÐеĿªÍ·"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "ÏÂÒ»¸ö"
 
@@ -1562,7 +1625,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "ÓÉ \\[universal-argument] ÄÚ²¿Ê¹ÓÃ"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline£ºÐéÄâÄÚ´æºÄ¾¡£¡\n"
@@ -1652,186 +1715,139 @@
 msgid " Subfile: %s"
 msgstr " ×ÓÎļþ£º%s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s£ºÑ¡Ïî¡°%s¡±º¬Òå²»Ã÷È·\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s£ºÑ¡Ïî¡°--%s¡±²»½ÓÊܲÎÊý\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s£ºÑ¡Ïî¡°%c%s¡±²»½ÓÊܲÎÊý\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s£ºÑ¡Ïî¡°%s¡±ÐèÒªÒ»¸ö²ÎÊý\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°--%s¡±\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s£º²»ÄÜʶ±ðµÄÑ¡Ïî¡°%c%s¡±\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s£º·Ç·¨Ñ¡Ïî -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s£ºÎÞЧѡÏî -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s£ºÑ¡ÏîÐèÒªÒ»¸ö²ÎÊý -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s£ºÑ¡Ïî¡°-W %s¡±µÄº¬Òå²»Çå\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s£ºÑ¡Ïî¡°-W %s¡±²»½ÓÊܲÎÊý\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "%c%s µÄ´íÎó²ÎÊý"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "Ò»ÔÂ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "¶þÔÂ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "ÈýÔÂ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "ËÄÔÂ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "ÎåÔÂ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "ÁùÔÂ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "ÆßÔÂ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "°ËÔÂ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "¾ÅÔÂ"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "Ê®ÔÂ"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "ʮһÔÂ"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "Ê®¶þÔÂ"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr "@var Öв»¿É¿¿µÄ×Ö·û %c"
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc µÄ²ÎÊýÈ«²¿Îª´óд£¬Òò´ËÎÞЧ"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr "ӦΪ¡°{¡±£¬µ«¿´µ½ÁË¡°%c¡±"
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr "ÎļþÔÚÔ­ÎÄ¿éÖнáÊø"
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr "ӦΪ¡°}¡±£¬µ«¿´µ½ÁË¡°%c¡±"
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s Òѹýʱ"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp ÐèÒªÕýÊý²ÎÊý£¬¶ø²»ÊÇ¡°%s¡±"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "%c%s µÄ´íÎó²ÎÊý"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr "asis"
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr "none"
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "%c%s µÄ´íÎó²ÎÊý"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr ""
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "%c%s µÄ´íÎó²ÎÊý"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1869,12 +1885,12 @@
 msgstr "·½·¨"
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr ""
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr ""
 
@@ -1907,8 +1923,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr "²ÎÔÄ "
@@ -1931,7 +1947,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "½Å×¢ÄڵĽÅ×¢ÊDz»ÔÊÐíµÄ"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "½Å×¢"
 
@@ -1940,64 +1956,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr "ÎÞ±êÌâ"
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "ÎÞЧµÄ½Å×¢Ãû£º¡°%s¡±"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "δ֪µÄË÷Òý¡°%s¡±"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr "Info ÎÞ·¨´¦ÀíË÷ÒýÌõÄ¿¡°%s¡±Öеġ°:¡±"
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "Ë÷Òý¡°%s¡±ÒѾ­´æÔÚ"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "@synindex ÖеÄδ֪Ë÷Òý¡°%s¡±ºÍ/»ò¡°%s¡±"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex ÖеÄδ֪Ë÷Òý¡°%s¡±"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "¹ØÓÚË÷Òý¡°%s¡±µÄÌõÄ¿³¬³öÁËËùÓнڵã"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(³¬³öÈκνڵã)"
 
@@ -2100,37 +2116,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "ÔÚ¡°%s¡±¿éÖÐ @itemx ÊÇûÓÐÒâÒåµÄ"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr "ÔÚ²åÈë¿éÖ®Íâ·¢ÏÖÁË %c%s"
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s ÔÚ ISO 639 ÓïÑÔ±àÂëÖÐÊÇÎÞЧµÄ"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "²»ÄÜʶ±ðµÄ±àÂëÃû³Æ¡°%s¡±"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr "±§Ç¸£¬²»Ö§³Ö±àÂë¡°%s¡±"
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr "ÎÞЧµÄ±àÂë×Ö·û¡°%s¡±"
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s µÄ²ÎÊýӦΪ¡°i¡±»ò¡°j¡±£¬¶ø²»ÊÇ¡°%c¡±"
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s ÐèÒªÒÔµ¥¸ö×Ö·û¡°i¡±»ò¡°j¡±Îª²ÎÊý"
@@ -2145,56 +2166,60 @@
 msgid "here is the previous definition of `%s'"
 msgstr "ÕâÀïÊÇ¡°%s¡±Ç°ÃæµÄ¶¨Òå"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "ÔÚµÚ %2$d ÐÐÖÐÒÔ¹ý¶àµÄ²ÎÊýµ÷Óúꡰ%1$s¡±"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr "ÕÒ²»µ½ºê %cend"
 
-#: makeinfo/macro.c:625
-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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s ºÍ @%s ²»Æ¥Åä"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "¹ý¶àµÄ´íÎ󣡷ÅÆú¡£\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s£º%d£º¾¯¸æ£º"
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "´íÎó·ÅÖÃµÄ %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "ÊÔÓá°%s --help¡±ÒÔ»ñÈ¡¸ü¶àÐÅÏ¢¡£\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "Ó÷¨£º%s [Ñ¡Ïî]... TEXINFO-Îļþ...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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"
@@ -2202,7 +2227,7 @@
 "½« Texinfo Ô´Îļþת»»ÎªÆäËü¸÷ÖÖ¸ñʽ£¬Ä¬ÈÏת»»ÎªÊÊÓÚ\n"
 "ÓÉ Emacs »ò¶ÀÁ¢ GNU Info ÔÚÏßä¯ÀÀµÄ Info Îļþ¡£\n"
 
-#: makeinfo/makeinfo.c:351
+#: makeinfo/makeinfo.c:355
 #, fuzzy, c-format
 msgid ""
 "General options:\n"
@@ -2228,7 +2253,7 @@
 "  -v, --verbose               ½âÊͶ¼×öÁËЩʲô¡£\n"
 "      --version               ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, fuzzy, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2242,7 +2267,7 @@
 "      --html                Êä³ö HTML ¶ø²»ÊÇ Info¡£\n"
 "      --xml                 Êä³ö XML (TexinfoML) ¶ø²»ÊÇ Info¡£\n"
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 #, fuzzy
 msgid ""
 "General output options:\n"
@@ -2272,7 +2297,7 @@
 "      --number-sections     Êä³öÕ½ڱàºÅ¡£\n"
 "  -o, --output=FILE         Êä³öµ½Îļþ FILE (Èç¹ûÊÇ·Ö¸îµÄ HTML ÔòΪĿ¼)£¬\n"
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, fuzzy, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2304,7 +2329,7 @@
 "                                ¡°asis¡±£¬±£ÁôÏÖÓеĶÔÆë¡£\n"
 "      --split-size=NUM        ÔÚ´óС NUM µÄʱºò²ð·Ö Info Îļþ (ĬÈÏΪ %d)¡£\n"
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2314,7 +2339,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2324,7 +2349,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 #, fuzzy
 msgid ""
 "Input file options:\n"
@@ -2341,7 +2366,7 @@
 "  -P DIR                         ½« DIR ×·¼Óµ½ @include ËÑË÷·¾¶Ö®Ç°¡£\n"
 "  -U VAR                         È¡Ïû±äÁ¿ VAR µÄ¶¨Ò壬¾ÍÏó @clear¡£\n"
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 #, fuzzy
 msgid ""
 "Conditional processing in input:\n"
@@ -2371,7 +2396,7 @@
 "  --no-ifplaintext  ²»Òª´¦Àí @ifplaintext Îı¾¡£\n"
 "  --no-iftex        ²»Òª´¦Àí @iftex ºÍ @tex Îı¾¡£\n"
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 #, fuzzy
 msgid ""
 "  The defaults for the @if... conditionals depend on the output format:\n"
@@ -2385,7 +2410,7 @@
 "  Èç¹ûÉú³É Info£¬Ôò --ifinfo ĬÈÏ¿ªÆô¶øÆäËüµÄĬÈϹرգ»\n"
 "  Èç¹ûÉú³ÉÆÕͨÎı¾£¬Ôò --ifplaintext ĬÈÏ¿ªÆô¶øÆäËüĬÈϹرգ»\n"
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2412,191 +2437,191 @@
 "  makeinfo --number-sections foo.texi   Êä³ö´øÓбàºÅµÄ½ÚµÄ Info\n"
 "  makeinfo --no-split foo.texi          Êä³öµ¥¸ö Info Îļþ¶ø²»ÂÛ´óС\n"
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s£º%s ²ÎÊý±ØÐëΪÊýÖµ£¬¶ø²»ÊÇ¡°%s¡±¡£\n"
 
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "ÎÞ·¨´ò¿ªºêÀ©Õ¹Êä³ö¡°%s¡±"
 
-#: makeinfo/makeinfo.c:681
+#: makeinfo/makeinfo.c:685
 #, fuzzy, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr "ÎÞ·¨´ò¿ªºêÀ©Õ¹Êä³ö¡°%s¡±"
 
-#: makeinfo/makeinfo.c:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s£ºÒÅ©Îļþ²ÎÊý¡£\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "ӦΪ¡°%s¡±"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr "ÎÞ·¨´´½¨Ä¿Â¼¡°%s¡±£º%s"
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "ÔÚ¡°%2$s¡±ÖÐÕÒ²»µ½¡°%1$s¡±"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr "´Ó¡°%3$s¡±´´½¨ %1$s Îļþ¡°%2$s¡±¡£\n"
 
-#: makeinfo/makeinfo.c:1697
-#, c-format
-msgid "This is %s, produced by makeinfo version %s from %s.\n"
-msgstr "ÕâÊÇ %s£¬ÓÉ makeinfo °æ±¾ %s ´Ó %s Éú³É¡£\n"
-
-#: makeinfo/makeinfo.c:1733
+#: makeinfo/makeinfo.c:1728
 #, 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:1788
+#: makeinfo/makeinfo.c:1783
 #, c-format
 msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
 msgstr "%s£ºÓÉÓÚ´íÎóɾ³ýºêÊä³öÎļþ¡°%s¡±£»Óà --force ±£ÁôºêÊä³ö¡£\n"
 
-#: makeinfo/makeinfo.c:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "δ֪µÄÃüÁî¡°%s¡±"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "ʹÓû¨À¨ºÅ½«Ò»¸öÃüÁîÓÃ×÷ @%s µÄ²ÎÊý"
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ÐèÒª¡°{...}¡±"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "²»Æ¥ÅäµÄ }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "ÎÞÃû×Ö£¡"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ÒÅ©±ÕºÏ»¨À¨ºÅ"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, c-format
+msgid "This is %s, produced by makeinfo version %s from %s.\n"
+msgstr "ÕâÊÇ %s£¬ÓÉ makeinfo °æ±¾ %s ´Ó %s Éú³É¡£\n"
+
+#: makeinfo/makeinfo.c:3443
 #, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image Îļþ¡°%s¡±(¶Ô HTML)²»¿É¶Á£º%s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "ÔÚ¡°%2$s¡±ÖÐÕÒ²»µ½¡°%1$s¡±"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image Îļþ¡°%s¡±(¶ÔÎı¾)²»¿É¶Á£º%s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image ÒÅ©ÎļþÃû²ÎÊý"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr "{ûÓС°%s¡±µÄÖµ}"
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s ÐèÒªÒ»¸öÃû×Ö"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "ÎļþÔÚÓöµ½Æ¥ÅäµÄ @end %s Ç°¾Í½áÊøÁË"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr "¡°%.40s...¡±À©Õ¹ÆðÀ´Ì«³¤£»Î´À©Õ¹"
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "@multitable Ä£°åÖÐÒÅ©ÁË }"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr "ºöÂÔ @multitable Ö®ºóµÄ¹ýÊ£Îı¾¡°%s¡±"
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "ÔÚ¶àÁбí¸ñÏîÄ¿Öк¬ÓÐÌ«¶àµÄÁÐ (×î´óΪ %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "ÎÞ·¨ÔÚ¶àÁбí¸ñÖÐÑ¡ÔñµÚ %d ÁÐ"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "ºöÂÔ¶àÁбí¸ñÍâµÄ @tab"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr "** ×îºóÒ»ÐеĶàÁÐÊä³ö£º\n"
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* ÁÐ #%d£ºÊä³ö = %s\n"
@@ -2621,7 +2646,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "ûÓÐΪ¡°%c%s¡±ÃüÁîÖ¸¶¨½ÚÃû³Æ"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr "Anchor¡°%s¡±ºÍ½Úµã¡°%s¡±Ó³É䵽ͬһ¸öÎļþÃû"
@@ -2630,7 +2655,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr "ºöÂԸà @anchor ÃüÁ¶ÔËüµÄÒýÓý«ÎÞ·¨¹¤×÷"
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr "ÖØÃüÃû anchor »òʹÓá°--no-split¡±Ñ¡Ïî"
 
@@ -2651,82 +2676,82 @@
 msgid "Up:"
 msgstr "Éϲ㣺"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr "Anchor¡°%s¡±ºÍ¡°%s¡±Ó³É䵽ͬһ¸öÎļþÃû"
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr "ºöÂÔ @anchor ÃüÁ¶ÔËüµÄÒýÓý«²»Äܹ¤×÷"
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%sÒýÓõ½²»´æÔڵĽڵ㡰%s¡±"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "²Ëµ¥"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr "½»²æÒýÓÃ"
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, fuzzy, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr "½Úµã¡°%s¡±µÄÏÂÒ»¸öÓòûÓÐÖ¸Ïò"
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "¸Ã½Úµã (%s) º¬ÓдíÎóµÄÉÏÒ»¸ö"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "ÉÏÒ»¸ö"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr "½Úµã¡°%s¡±µÄÉÏÒ»¸öÓòûÓÐÖ¸Ïò"
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "¸Ã½Úµã (%s) º¬ÓдíÎóµÄÏÂÒ»¸ö"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "Éϲã"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr "¾¡¹Ü½Úµã¡°%s¡±ÊÇ¡°%s¡±µÄÉϲã½Úµã£¬µ«È±ÉÙÏà¹ØµÄ²Ëµ¥Ïî"
 
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "½Úµã¡°%s¡±Òѱ»ÒýÓÃÁË %d ´Î"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "δÒýÓõĽڵ㡰%s¡±"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "ÎÞ·¨´´½¨Ä¿Â¼¡°%s¡±£º%s"
@@ -2766,20 +2791,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image Îļþ¡°%s¡±²»¿É¶Á£º%s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2821,30 +2838,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr "@inforef µÄµÚÒ»¸ö²ÎÊý²»ÄÜΪ¿Õ"
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s£º¾¯¸æ£º"
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr ""
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
+#: util/install-info.c:453
+#, 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"
+"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"
@@ -2865,11 +2882,18 @@
 "                     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"
@@ -2903,7 +2927,7 @@
 "                     Îļþ×ÔÉíµÄÐÅÏ¢À´ÅжÏËüÃÇ¡£\n"
 " --version         ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö¡£\n"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2938,98 +2962,100 @@
 "\n"
 "* ²Ëµ¥£º\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, c-format
 msgid "%s: could not read (%s) and could not create (%s)\n"
 msgstr "%s£º¼´ÎÞ·¨¶ÁÈë (%s) Ò²ÎÞ·¨´´½¨ (%s)\n"
 
-#: util/install-info.c:600
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s£º¿ÕÎļþ"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s£ºInfo ÎļþÖ»Ó¦¸ÃÖ¸¶¨Ò»´Î¡£\n"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "¶àÓàµÄÃüÁîÐвÎÊý¡°%s¡±"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "ûÓÐÖ¸¶¨Êä³öÎļþ£»ÊÔÓà --help ÒÔ»ñµÃ¸ü¶àÐÅÏ¢¡£"
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "ûÓÐÖ¸¶¨Ä¿Â¼Îļþ£»ÊÔÓà --help ÒÔ»ñµÃ¸ü¶àÐÅÏ¢¡£"
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "¡°%s¡±ÖÐûÓÐ info Ŀ¼ÌõÄ¿"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "ÔÚÎļþ¡°%2$s¡±Öв˵¥Ïî¡°%1$s¡±ÒÑ´æÔÚ"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "ÕÒ²»µ½¹ØÓÚ¡°%s¡±µÄÌõÄ¿£»Î´É¾³ý"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "ÏÔʾ¸ÃÇóÖúÐÅÏ¢²¢Í˳ö"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "ÔÚ´¦ÀíÖ®ºó±£ÁôÁÙʱÎļþ"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "ÔÚ´¦ÀíÖ®ºóɾ³ýÁÙʱÎļþ (ĬÈÏ)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "½«Êä³öËÍÈë FILE"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "ÏÔʾ°æ±¾ÐÅÏ¢²¢Í˳ö"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "Ó÷¨£º%s [Ñ¡Ïî]... Îļþ...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "Ϊÿ¸ö TeX Êä³öÎļþÉú³ÉÅÅÐòµÄË÷Òý¡£\n"
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -3038,27 +3064,54 @@
 "\n"
 "Ñ¡Ï\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s£º²»ÊÇ texinfo Ë÷ÒýÎļþ"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "ÖØдò¿ª %s ʧ°Ü"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s£º²»ÊÇ texinfo Ë÷ÒýÎļþ"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "%s ÖÐûÓÐÒ³Âë"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr "ÌõÄ¿ %s ³öÏÖÔÚ¾ßÓдÎÒªÃû³ÆµÄÌõÄ¿Ö®ºó"
 
+#, 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr "  %-10s  ÔÚ±¾ Info ÎļþÖеÄË÷ÒýÌõÄ¿ÖÐËÑË÷Ö¸¶¨µÄ×Ö·û´®£¬\n"
@@ -3103,9 +3156,6 @@
 #~ 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¡±£¬¶øÇÒûÓиø³öÀ©Õ¹Ãû"
 
Index: po/zh_TW.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/zh_TW.po,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- po/zh_TW.po 8 Jun 2006 22:42:22 -0000       1.29
+++ po/zh_TW.po 1 Jul 2007 18:43:37 -0000       1.30
@@ -6,7 +6,7 @@
 msgstr ""
 "Project-Id-Version: texinfo 4.1\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2006-06-08 15:36-0700\n"
+"POT-Creation-Date: 2007-07-01 11:07-0700\n"
 "PO-Revision-Date: 2002-03-08 04:56+0800\n"
 "Last-Translator: Abel Cheung <address@hidden>\n"
 "Language-Team: Chinese (traditional) <address@hidden>\n"
@@ -14,6 +14,72 @@
 "Content-Type: text/plain; charset=Big5\n"
 "Content-Transfer-Encoding: 8bit\n"
 
+#: gnulib/lib/error.c:125
+msgid "Unknown system error"
+msgstr ""
+
+#: gnulib/lib/getopt.c:531 gnulib/lib/getopt.c:547
+#, c-format
+msgid "%s: option `%s' is ambiguous\n"
+msgstr "%s: ¿ï¶µ `%s' ¤£©ú\n"
+
+#: gnulib/lib/getopt.c:580 gnulib/lib/getopt.c:584
+#, c-format
+msgid "%s: option `--%s' doesn't allow an argument\n"
+msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n"
+
+#: gnulib/lib/getopt.c:593 gnulib/lib/getopt.c:598
+#, c-format
+msgid "%s: option `%c%s' doesn't allow an argument\n"
+msgstr "%s: ¿ï¶µ `%c%s' ¤£¥i§t¦³¤Þ¼Æ\n"
+
+#: gnulib/lib/getopt.c:641 gnulib/lib/getopt.c:660 gnulib/lib/getopt.c:976
+#: gnulib/lib/getopt.c:995
+#, c-format
+msgid "%s: option `%s' requires an argument\n"
+msgstr "%s: ¿ï¶µ `%s' ¥²¶·§t¦³¤Þ¼Æ\n"
+
+#: gnulib/lib/getopt.c:698 gnulib/lib/getopt.c:701
+#, c-format
+msgid "%s: unrecognized option `--%s'\n"
+msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
+
+#: gnulib/lib/getopt.c:709 gnulib/lib/getopt.c:712
+#, c-format
+msgid "%s: unrecognized option `%c%s'\n"
+msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
+
+#: gnulib/lib/getopt.c:764 gnulib/lib/getopt.c:767
+#, c-format
+msgid "%s: illegal option -- %c\n"
+msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n"
+
+#: gnulib/lib/getopt.c:773 gnulib/lib/getopt.c:776
+#, c-format
+msgid "%s: invalid option -- %c\n"
+msgstr "%s: µL®Äªº¿ï¶µ -- %c\n"
+
+#: gnulib/lib/getopt.c:828 gnulib/lib/getopt.c:844 gnulib/lib/getopt.c:1048
+#: gnulib/lib/getopt.c:1066
+#, c-format
+msgid "%s: option requires an argument -- %c\n"
+msgstr "%s: ¿ï¶µ¥²¶·§t¦³¤Þ¼Æ -- %c\n"
+
+#: gnulib/lib/getopt.c:897 gnulib/lib/getopt.c:913
+#, c-format
+msgid "%s: option `-W %s' is ambiguous\n"
+msgstr "%s: ¿ï¶µ `-W %s' ¤£©ú½T\n"
+
+#: gnulib/lib/getopt.c:937 gnulib/lib/getopt.c:955
+#, 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:35 gnulib/lib/xsetenv.c:39
+#, fuzzy
+msgid "memory exhausted"
+msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
+
 #: info/echo-area.c:284 info/session.c:689
 msgid "Move forward a character"
 msgstr "address@hidden"
@@ -222,36 +288,32 @@
 "\n"
 "* Menu: ¨ä¯Á¤Þ¤¤¥]§t \"%s\" ªº¸`ÂI:\n"
 
-#: info/info.c:275 info/infokey.c:902
+#: info/info.c:279 info/infokey.c:900
 #, c-format
 msgid "Try --help for more information.\n"
 msgstr "¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T.\n"
 
-#: info/info.c:294 info/infokey.c:146 makeinfo/makeinfo.c:786
-#: util/install-info.c:1265 util/texindex.c:350
-#, fuzzy, c-format
+#: info/info.c:298 info/infokey.c:146 makeinfo/makeinfo.c:790
+#: util/install-info.c:1329 util/texindex.c:296
+#, c-format
 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"
-"address@hidden ±z¥i¦b GNU address@hidden \n"
-"(GNU General Public License) ªº±ø´Ú¤U´²§G¥»³nÅé.\n"
-"±ýª¾§ó¦hªº¸Ô±¡, ½Ð¬ÝÀɦW¬° 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:501
+#: info/info.c:503
 #, c-format
 msgid "no index entries found for `%s'\n"
 msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
 
-#: info/info.c:593
+#: info/info.c:595
 msgid "  -b, --speech-friendly        be friendly to speech synthesizers.\n"
 msgstr ""
 
-#: info/info.c:600
+#: info/info.c:602
 #, fuzzy, c-format
 msgid ""
 "Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -288,6 +350,7 @@
 "  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"
@@ -324,8 +387,8 @@
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü address@hidden,\n"
 "address@hidden, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì address@hidden"
 
-#: info/info.c:638 info/infokey.c:921 makeinfo/makeinfo.c:471
-#: util/install-info.c:466 util/texindex.c:300
+#: info/info.c:641 info/infokey.c:919 makeinfo/makeinfo.c:475
+#: util/install-info.c:492 util/texindex.c:260
 #, fuzzy
 msgid ""
 "\n"
@@ -337,72 +400,72 @@
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü address@hidden,\n"
 "address@hidden, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì address@hidden"
 
-#: info/info.c:672
+#: info/info.c:675
 #, c-format
 msgid "Cannot find node `%s'."
 msgstr "§ä¤£¨ì `%s' ¸`ÂI."
 
-#: info/info.c:673
+#: info/info.c:676
 #, c-format
 msgid "Cannot find node `(%s)%s'."
 msgstr "§ä¤£¨ì `(%s)%s' ¸`ÂI."
 
-#: info/info.c:674
+#: info/info.c:677
 msgid "Cannot find a window!"
 msgstr "§ä¤£¨ì¤À¹jµøµ¡!"
 
-#: info/info.c:675
+#: info/info.c:678
 msgid "Point doesn't appear within this window's node!"
 msgstr "´å¼Ð¦ì¸m¤£¦b¥»¤À¹jµøµ¡ªº¸`ÂI¤º!"
 
-#: info/info.c:676
+#: info/info.c:679
 msgid "Cannot delete the last window."
 msgstr "address@hidden"
 
-#: info/info.c:677
+#: info/info.c:680
 msgid "No menu in this node."
 msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
 
-#: info/info.c:678
+#: info/info.c:681
 msgid "No footnotes in this node."
 msgstr "¥»¸`ÂI¨S¦³µù¸}."
 
-#: info/info.c:679
+#: info/info.c:682
 msgid "No cross references in this node."
 msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
 
-#: info/info.c:680
+#: info/info.c:683
 #, c-format
 msgid "No `%s' pointer for this node."
 msgstr "¥»¸`ÂI¨S¦³ `%s' pointer."
 
-#: info/info.c:681
+#: info/info.c:684
 #, c-format
 msgid "Unknown Info command `%c'; try `?' for help."
 msgstr "¥¼ª¾ªº Info ©R¥O `%c'; ¸Õ¸Õ `?' ¥H¨ú±o¨D§U¸ê°T."
 
-#: info/info.c:682
+#: info/info.c:685
 #, c-format
 msgid "Terminal type `%s' is not smart enough to run Info."
 msgstr "²×ºÝ¾÷Ãþ«¬ `%s' µLªk¤ä´©°õ¦æ Info ©Ò»Ýªº»Ý¨D."
 
-#: info/info.c:683
+#: info/info.c:686
 msgid "You are already at the last page of this node."
 msgstr "address@hidden"
 
-#: info/info.c:684
+#: info/info.c:687
 msgid "You are already at the first page of this node."
 msgstr "address@hidden"
 
-#: info/info.c:685
+#: info/info.c:688
 msgid "Only one window."
 msgstr "address@hidden"
 
-#: info/info.c:686
+#: info/info.c:689
 msgid "Resulting window would be too small."
 msgstr "²£¥Íªº¤À¹jµøµ¡·|¤Ó¤p."
 
-#: info/info.c:687
+#: info/info.c:690
 msgid "Not enough room for a help window, please delete a window."
 msgstr "³Ñ¤UªºªÅ¶¡¤Ó¤p, µLªk®e¯Ç¨D§U¤À¹jµøµ¡, address@hidden"
 
@@ -831,93 +894,93 @@
 msgid "There is no function named `%s'"
 msgstr "¨S¦³¦W¬° `%s' ªº¨ç¦¡"
 
-#: info/infokey.c:173
+#: info/infokey.c:171
 msgid "incorrect number of arguments"
 msgstr ""
 
-#: info/infokey.c:204
+#: info/infokey.c:202
 #, fuzzy, c-format
 msgid "cannot open input file `%s'"
 msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
 
-#: info/infokey.c:218
+#: info/infokey.c:216
 #, fuzzy, c-format
 msgid "cannot create output file `%s'"
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: info/infokey.c:229
+#: info/infokey.c:227
 #, c-format
 msgid "error writing to `%s'"
 msgstr ""
 
-#: info/infokey.c:235
+#: info/infokey.c:233
 #, fuzzy, c-format
 msgid "error closing output file `%s'"
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: info/infokey.c:453
+#: info/infokey.c:451
 msgid "key sequence too long"
 msgstr ""
 
-#: info/infokey.c:532
+#: info/infokey.c:530
 msgid "missing key sequence"
 msgstr ""
 
-#: info/infokey.c:613
+#: info/infokey.c:611
 msgid "NUL character (\\000) not permitted"
 msgstr ""
 
-#: info/infokey.c:644
+#: info/infokey.c:642
 #, c-format
 msgid "NUL character (^%c) not permitted"
 msgstr ""
 
-#: info/infokey.c:668
+#: info/infokey.c:666
 #, fuzzy
 msgid "missing action name"
 msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
 
-#: info/infokey.c:684 info/infokey.c:759
+#: info/infokey.c:682 info/infokey.c:757
 msgid "section too long"
 msgstr ""
 
-#: info/infokey.c:691
+#: info/infokey.c:689
 #, fuzzy, c-format
 msgid "unknown action `%s'"
 msgstr "¥¼ª¾ªº©R¥O `%s'"
 
-#: info/infokey.c:701
+#: info/infokey.c:699
 msgid "action name too long"
 msgstr ""
 
-#: info/infokey.c:715
+#: info/infokey.c:713
 #, c-format
 msgid "extra characters following action `%s'"
 msgstr ""
 
-#: info/infokey.c:726
+#: info/infokey.c:724
 #, fuzzy
 msgid "missing variable name"
 msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
 
-#: info/infokey.c:736
+#: info/infokey.c:734
 msgid "missing `=' immediately after variable name"
 msgstr ""
 
-#: info/infokey.c:744
+#: info/infokey.c:742
 msgid "variable name too long"
 msgstr ""
 
-#: info/infokey.c:768
+#: info/infokey.c:766
 msgid "value too long"
 msgstr ""
 
-#: info/infokey.c:893
+#: info/infokey.c:891
 #, c-format
 msgid "\"%s\", line %u: "
 msgstr ""
 
-#: info/infokey.c:909
+#: info/infokey.c:907
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1007,14 +1070,14 @@
 msgid "Set screen height to (%d): "
 msgstr "³]©w¿Ã¹õ°ª«×¬° (%d): "
 
-#: info/makedoc.c:162 info/makedoc.c:170
+#: info/makedoc.c:164 info/makedoc.c:172
 #, c-format
 msgid ""
 "   Source files groveled to make this file include:\n"
 "\n"
 msgstr ""
 
-#: info/makedoc.c:550
+#: info/makedoc.c:552
 #, c-format
 msgid "Couldn't manipulate the file %s.\n"
 msgstr "µLªk³B²zÀÉ®× %s.\n"
@@ -1081,7 +1144,7 @@
 msgid "Move to the start of the line"
 msgstr "²¾¦Ü¥»¦æ¶}ÀY"
 
-#: info/session.c:860 makeinfo/node.c:1425
+#: info/session.c:860 makeinfo/node.c:1438
 msgid "Next"
 msgstr "address@hidden"
 
@@ -1564,7 +1627,7 @@
 msgid "Internally used by \\[universal-argument]"
 msgstr "¦b¤º³¡³Q \\[universal-argument] ¨Ï¥Î"
 
-#: info/tilde.c:338
+#: info/tilde.c:337
 #, c-format
 msgid "readline: Out of virtual memory!\n"
 msgstr "readline: ¯ÓºÉµêÀÀ°O¾ÐÅé!\n"
@@ -1654,186 +1717,139 @@
 msgid " Subfile: %s"
 msgstr " ¤lÀÉ®×: %s"
 
-#: lib/getopt.c:551 lib/getopt.c:570
-#, c-format
-msgid "%s: option `%s' is ambiguous\n"
-msgstr "%s: ¿ï¶µ `%s' ¤£©ú\n"
-
-#: lib/getopt.c:603 lib/getopt.c:607
-#, c-format
-msgid "%s: option `--%s' doesn't allow an argument\n"
-msgstr "%s: ¿ï¶µ `--%s' ¤£¥i§t¦³¤Þ¼Æ\n"
-
-#: lib/getopt.c:616 lib/getopt.c:621
-#, c-format
-msgid "%s: option `%c%s' doesn't allow an argument\n"
-msgstr "%s: ¿ï¶µ `%c%s' ¤£¥i§t¦³¤Þ¼Æ\n"
-
-#: lib/getopt.c:667 lib/getopt.c:689 lib/getopt.c:1020 lib/getopt.c:1042
-#, c-format
-msgid "%s: option `%s' requires an argument\n"
-msgstr "%s: ¿ï¶µ `%s' ¥²¶·§t¦³¤Þ¼Æ\n"
-
-#: lib/getopt.c:727 lib/getopt.c:730
-#, c-format
-msgid "%s: unrecognized option `--%s'\n"
-msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
-
-#: lib/getopt.c:738 lib/getopt.c:741
-#, c-format
-msgid "%s: unrecognized option `%c%s'\n"
-msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
-
-#: lib/getopt.c:796 lib/getopt.c:799
-#, c-format
-msgid "%s: illegal option -- %c\n"
-msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n"
-
-#: lib/getopt.c:805 lib/getopt.c:808
-#, c-format
-msgid "%s: invalid option -- %c\n"
-msgstr "%s: µL®Äªº¿ï¶µ -- %c\n"
-
-#: lib/getopt.c:863 lib/getopt.c:882 lib/getopt.c:1095 lib/getopt.c:1116
-#, c-format
-msgid "%s: option requires an argument -- %c\n"
-msgstr "%s: ¿ï¶µ¥²¶·§t¦³¤Þ¼Æ -- %c\n"
-
-#: lib/getopt.c:935 lib/getopt.c:954
-#, c-format
-msgid "%s: option `-W %s' is ambiguous\n"
-msgstr "%s: ¿ï¶µ `-W %s' ¤£©ú½T\n"
+#: lib/xexit.c:54
+msgid "ferror on stdout\n"
+msgstr ""
 
-#: lib/getopt.c:978 lib/getopt.c:999
-#, c-format
-msgid "%s: option `-W %s' doesn't allow an argument\n"
-msgstr "%s: ¿ï¶µ `-W %s' ¤£¥i§t¦³¤Þ¼Æ\n"
+#: lib/xexit.c:59
+msgid "fflush error on stdout\n"
+msgstr ""
 
-#: makeinfo/cmds.c:525 makeinfo/cmds.c:547
+#: makeinfo/cmds.c:527 makeinfo/cmds.c:549
 #, fuzzy, c-format
 msgid "arguments to @%s ignored"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "January"
 msgstr "address@hidden"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "February"
 msgstr "¤G¤ë"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "March"
 msgstr "¤T¤ë"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "April"
 msgstr "¥|¤ë"
 
-#: makeinfo/cmds.c:590
+#: makeinfo/cmds.c:592
 msgid "May"
 msgstr "¤­¤ë"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "June"
 msgstr "¤»¤ë"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "July"
 msgstr "¤C¤ë"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "August"
 msgstr "¤K¤ë"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "September"
 msgstr "¤E¤ë"
 
-#: makeinfo/cmds.c:591
+#: makeinfo/cmds.c:593
 msgid "October"
 msgstr "¤Q¤ë"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "November"
 msgstr "address@hidden"
 
-#: makeinfo/cmds.c:592
+#: makeinfo/cmds.c:594
 msgid "December"
 msgstr "¤Q¤G¤ë"
 
-#: makeinfo/cmds.c:944
+#: makeinfo/cmds.c:946
 #, c-format
 msgid "unlikely character %c in @var"
 msgstr ""
 
-#: makeinfo/cmds.c:987
+#: makeinfo/cmds.c:989
 msgid "@sc argument all uppercase, thus no effect"
 msgstr "@sc ªº¤Þ¼Æ¥þ¬O¤j¼g, address@hidden"
 
-#: makeinfo/cmds.c:1042
+#: makeinfo/cmds.c:1044
 #, c-format
 msgid "`{' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1082
+#: makeinfo/cmds.c:1084
 msgid "end of file inside verb block"
 msgstr ""
 
-#: makeinfo/cmds.c:1090
+#: makeinfo/cmds.c:1092
 #, c-format
 msgid "`}' expected, but saw `%c'"
 msgstr ""
 
-#: makeinfo/cmds.c:1120
+#: makeinfo/cmds.c:1123
 msgid ""
 "@strong{Note...} produces a spurious cross-reference in Info; reword to "
 "avoid that"
 msgstr ""
 
-#: makeinfo/cmds.c:1319
+#: makeinfo/cmds.c:1322
 #, c-format
 msgid "%c%s is obsolete"
 msgstr "%c%s ¤w¼o¤î¤£¥Î"
 
-#: makeinfo/cmds.c:1428
+#: makeinfo/cmds.c:1431
 #, c-format
 msgid "@sp requires a positive numeric argument, not `%s'"
 msgstr "@sp address@hidden, ¦Ó¤£¬O `%s'"
 
-#: makeinfo/cmds.c:1783 makeinfo/footnote.c:82
+#: makeinfo/cmds.c:1790 makeinfo/footnote.c:82
 #, c-format
 msgid "Bad argument to %c%s"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/cmds.c:1793 makeinfo/makeinfo.c:4193
+#: makeinfo/cmds.c:1800 makeinfo/makeinfo.c:4279
 msgid "asis"
 msgstr ""
 
-#: makeinfo/cmds.c:1795 makeinfo/cmds.c:1825 makeinfo/makeinfo.c:4195
+#: makeinfo/cmds.c:1802 makeinfo/cmds.c:1832 makeinfo/makeinfo.c:4281
 msgid "none"
 msgstr ""
 
-#: makeinfo/cmds.c:1809
+#: makeinfo/cmds.c:1816
 #, fuzzy, c-format
 msgid "Bad argument to @%s"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/cmds.c:1823
+#: makeinfo/cmds.c:1830
 msgid "insert"
 msgstr ""
 
-#: makeinfo/cmds.c:1839
+#: makeinfo/cmds.c:1846
 #, fuzzy, c-format
 msgid "Bad argument to @%s: %s"
 msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
 
-#: makeinfo/cmds.c:1922
+#: makeinfo/cmds.c:1929
 #, c-format
 msgid "Expected @%s on or off, not `%s'"
 msgstr ""
 
-#: makeinfo/cmds.c:1942
+#: makeinfo/cmds.c:1949
 #, c-format
 msgid "Only @%s 10 or 11 is supported, not `%s'"
 msgstr ""
@@ -1875,12 +1891,12 @@
 msgstr ""
 
 #: makeinfo/defun.c:500 makeinfo/defun.c:505 makeinfo/defun.c:545
-#: makeinfo/defun.c:644 makeinfo/xml.c:2109
+#: makeinfo/defun.c:644 makeinfo/xml.c:2136
 msgid "of"
 msgstr ""
 
 #: makeinfo/defun.c:509 makeinfo/defun.c:513 makeinfo/defun.c:517
-#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2114
+#: makeinfo/defun.c:551 makeinfo/defun.c:650 makeinfo/xml.c:2141
 msgid "on"
 msgstr ""
 
@@ -1913,8 +1929,8 @@
 msgid "Requested float type `%s' not previously used"
 msgstr ""
 
-#: makeinfo/float.c:378 makeinfo/float.c:384 makeinfo/index.c:913
-#: makeinfo/index.c:919 makeinfo/xref.c:134 makeinfo/xref.c:171
+#: makeinfo/float.c:377 makeinfo/float.c:383 makeinfo/index.c:925
+#: makeinfo/index.c:931 makeinfo/xref.c:134 makeinfo/xref.c:171
 #: makeinfo/xref.c:206
 msgid "See "
 msgstr ""
@@ -1938,7 +1954,7 @@
 msgid "Footnotes inside footnotes are not allowed"
 msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
 
-#: makeinfo/footnote.c:302 makeinfo/index.c:189
+#: makeinfo/footnote.c:302 makeinfo/index.c:190
 msgid "Footnotes"
 msgstr "µù¸}"
 
@@ -1947,64 +1963,64 @@
 msgid "%s: could not open --css-file: %s"
 msgstr ""
 
-#: makeinfo/html.c:175
+#: makeinfo/html.c:176
 #, c-format
 msgid "%s:%d: --css-file ended in comment"
 msgstr ""
 
-#: makeinfo/html.c:210
+#: makeinfo/html.c:204
 msgid "Untitled"
 msgstr ""
 
-#: makeinfo/html.c:428
+#: makeinfo/html.c:422
 msgid "[unexpected] no html tag to pop"
 msgstr ""
 
-#: makeinfo/html.c:770
+#: makeinfo/html.c:765
 #, fuzzy, c-format
 msgid "[unexpected] invalid node name: `%s'"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
 
-#: makeinfo/index.c:169
+#: makeinfo/index.c:170
 #, c-format
 msgid "Unknown index `%s'"
 msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
 
-#: makeinfo/index.c:234
+#: makeinfo/index.c:235
 #, c-format
 msgid "Info cannot handle `:' in index entry `%s'"
 msgstr ""
 
-#: makeinfo/index.c:412
+#: makeinfo/index.c:413
 #, c-format
 msgid "Index `%s' already exists"
 msgstr "¯Á¤Þ `%s' ¤w¦s¦b"
 
-#: makeinfo/index.c:455
+#: makeinfo/index.c:456
 #, c-format
 msgid "Unknown index `%s' and/or `%s' in @synindex"
 msgstr "@synindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s' »P/©Î `%s'"
 
-#: makeinfo/index.c:661
+#: makeinfo/index.c:662
 msgid "(line )"
 msgstr ""
 
-#: makeinfo/index.c:669
+#: makeinfo/index.c:670
 #, c-format
 msgid "(line %*d)"
 msgstr ""
 
-#: makeinfo/index.c:748
+#: makeinfo/index.c:751
 #, c-format
 msgid "Unknown index `%s' in @printindex"
 msgstr "@printindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s'"
 
-#: makeinfo/index.c:817
+#: makeinfo/index.c:820
 #, c-format
 msgid "Entry for index `%s' outside of any node"
 msgstr "¯Á¤Þ `%s' ªº¶µ¥Ø¤£¦b¥ô¦óªº¸`ÂI¤º"
 
-#: makeinfo/index.c:820 makeinfo/index.c:856
+#: makeinfo/index.c:823 makeinfo/index.c:859
 msgid "(outside of any node)"
 msgstr "(¤£¦b¥ô¦óªº¸`ÂI¤º)"
 
@@ -2107,37 +2123,42 @@
 msgid "@itemx not meaningful inside `%s' block"
 msgstr "`%s' °Ï¶ô¤§¤º, @itemx ¨ÃµL·N¸q"
 
-#: makeinfo/insertion.c:2369
+#: makeinfo/insertion.c:2367
 #, c-format
 msgid "%c%s found outside of an insertion block"
 msgstr ""
 
-#: makeinfo/lang.c:692
+#: makeinfo/lang.c:957
+#, c-format
+msgid "no default territory known for language `%s'"
+msgstr ""
+
+#: makeinfo/lang.c:1020
 #, c-format
 msgid "%s is not a valid ISO 639 language code"
 msgstr "%s address@hidden ISO 639 »y¨¥½X"
 
-#: makeinfo/lang.c:767
+#: makeinfo/lang.c:1110
 #, fuzzy, c-format
 msgid "unrecognized encoding name `%s'"
 msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
 
-#: makeinfo/lang.c:775
+#: makeinfo/lang.c:1118
 #, c-format
 msgid "sorry, encoding `%s' not supported"
 msgstr ""
 
-#: makeinfo/lang.c:827
+#: makeinfo/lang.c:1170
 #, c-format
 msgid "invalid encoded character `%s'"
 msgstr ""
 
-#: makeinfo/lang.c:1127
+#: makeinfo/lang.c:1472
 #, c-format
 msgid "%c%s expects `i' or `j' as argument, not `%c'"
 msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' address@hidden, ¦Ó¤£¬O `%c'"
 
-#: makeinfo/lang.c:1131
+#: makeinfo/lang.c:1476
 #, c-format
 msgid "%c%s expects a single character `i' or `j' as argument"
 msgstr "%c%s address@hidden `i' ©Î `j' address@hidden"
@@ -2152,62 +2173,66 @@
 msgid "here is the previous definition of `%s'"
 msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
 
-#: makeinfo/macro.c:356
+#: makeinfo/macro.c:359
 #, c-format
 msgid "\\ in macro expansion followed by `%s' instead of parameter name"
 msgstr ""
 
-#: makeinfo/macro.c:402
+#: makeinfo/macro.c:401
 #, c-format
 msgid "Macro `%s' called on line %d with too many args"
 msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
 
-#: makeinfo/macro.c:587
+#: makeinfo/macro.c:580
 #, c-format
 msgid "%cend macro not found"
 msgstr ""
 
-#: makeinfo/macro.c:625
-msgid "@quote-arg only useful for single-argument macros"
-msgstr "@quote-arg address@hidden"
+#: 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:661
+#: makeinfo/macro.c:649
 #, c-format
 msgid "mismatched @end %s with @%s"
 msgstr "@end %s »P @%s ¤£²Å¦X"
 
-#: makeinfo/makeinfo.c:185
+#: makeinfo/makeinfo.c:189
 #, c-format
 msgid "Too many errors!  Gave up.\n"
 msgstr "¿ù»~¹L¦h! ©ñ±ó.\n"
 
-#: makeinfo/makeinfo.c:303
+#: makeinfo/makeinfo.c:307
 #, c-format
 msgid "%s:%d: warning: "
 msgstr "%s:%d: ĵ§i: "
 
-#: makeinfo/makeinfo.c:322 makeinfo/makeinfo.c:2307
+#: makeinfo/makeinfo.c:326 makeinfo/makeinfo.c:2304
 #, c-format
 msgid "Misplaced %c"
 msgstr "»~¸mªº %c"
 
-#: makeinfo/makeinfo.c:341
+#: makeinfo/makeinfo.c:345
 #, c-format
 msgid "Try `%s --help' for more information.\n"
 msgstr "¸Õ¸Õ `%s --help' ¥H¨ú±o§ó¦hªº¸ê°T.\n"
 
-#: makeinfo/makeinfo.c:344
+#: makeinfo/makeinfo.c:348
 #, fuzzy, c-format
 msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
 msgstr "¥Îªk: %s [OPTION]... FILE...\n"
 
-#: makeinfo/makeinfo.c:347
+#: makeinfo/makeinfo.c:351
 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:351
+#: makeinfo/makeinfo.c:355
 #, c-format
 msgid ""
 "General options:\n"
@@ -2224,7 +2249,7 @@
 "      --version               display version information and exit.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:367
+#: makeinfo/makeinfo.c:371
 #, no-wrap
 msgid ""
 "Output format selection (default is to produce Info):\n"
@@ -2234,7 +2259,7 @@
 "      --plaintext             output plain text rather than Info.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:375
+#: makeinfo/makeinfo.c:379
 msgid ""
 "General output options:\n"
 "  -E, --macro-expand FILE     output macro-expanded source to FILE.\n"
@@ -2252,7 +2277,7 @@
 "  -o, --output=FILE           output to FILE (directory if split HTML),\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:389
+#: makeinfo/makeinfo.c:393
 #, c-format
 msgid ""
 "Options for Info and plain text:\n"
@@ -2273,7 +2298,7 @@
 "      --split-size=NUM        split Info files at size NUM (default %d).\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:406
+#: makeinfo/makeinfo.c:410
 msgid ""
 "Options for HTML:\n"
 "      --css-include=FILE      include FILE in HTML <style> output;\n"
@@ -2283,7 +2308,7 @@
 "                              produce file names in ASCII transliteration.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:415
+#: makeinfo/makeinfo.c:419
 #, c-format
 msgid ""
 "Options for XML and Docbook:\n"
@@ -2293,7 +2318,7 @@
 "dropped.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:422
+#: makeinfo/makeinfo.c:426
 msgid ""
 "Input file options:\n"
 "      --commands-in-node-names  allow @ commands in node names.\n"
@@ -2303,7 +2328,7 @@
 "  -U VAR                        undefine the variable VAR, as with @clear.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:431
+#: makeinfo/makeinfo.c:435
 msgid ""
 "Conditional processing in input:\n"
 "  --ifdocbook       process @ifdocbook and @docbook even if\n"
@@ -2323,7 +2348,7 @@
 "  Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:450
+#: makeinfo/makeinfo.c:454
 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"
@@ -2332,7 +2357,7 @@
 "  if generating XML, --ifxml is on and the others are off.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:458
+#: makeinfo/makeinfo.c:462
 #, fuzzy
 msgid ""
 "Examples:\n"
@@ -2363,189 +2388,189 @@
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü address@hidden,\n"
 "address@hidden, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì address@hidden"
 
-#: makeinfo/makeinfo.c:615
+#: makeinfo/makeinfo.c:619
 #, c-format
 msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:663 makeinfo/makeinfo.c:689 makeinfo/makeinfo.c:713
-#: makeinfo/makeinfo.c:743 makeinfo/makeinfo.c:764
+#: makeinfo/makeinfo.c:667 makeinfo/makeinfo.c:693 makeinfo/makeinfo.c:717
+#: makeinfo/makeinfo.c:747 makeinfo/makeinfo.c:768
 #, c-format
 msgid "%s: %s arg must be numeric, not `%s'.\n"
 msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼Æ­È, ¦Ó¤£¬O `%s'.\n"
 
-#: makeinfo/makeinfo.c:676
+#: makeinfo/makeinfo.c:680
 #, fuzzy, c-format
 msgid "%s: could not open macro expansion output `%s'"
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
 
-#: makeinfo/makeinfo.c:681
+#: makeinfo/makeinfo.c:685
 #, c-format
 msgid "%s: ignoring second macro expansion output `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:728
+#: 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:753
+#: makeinfo/makeinfo.c:757
 #, 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:830
+#: makeinfo/makeinfo.c:832
 #, c-format
 msgid "%s: missing file argument.\n"
 msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
 
-#: makeinfo/makeinfo.c:1021 makeinfo/makeinfo.c:4040
+#: makeinfo/makeinfo.c:1023 makeinfo/makeinfo.c:4128
 #, c-format
 msgid "Multiline command %c%s used improperly"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1024
+#: makeinfo/makeinfo.c:1026
 #, c-format
 msgid "Expected `%s'"
 msgstr "Expected `%s'"
 
-#: makeinfo/makeinfo.c:1503
+#: makeinfo/makeinfo.c:1505
 #, c-format
 msgid "Can't create directory `%s': %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1549
+#: makeinfo/makeinfo.c:1551
 #, c-format
 msgid "No `%s' found in `%s'"
 msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
 
-#: makeinfo/makeinfo.c:1629
+#: makeinfo/makeinfo.c:1631
 #, c-format
 msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1662
+#: makeinfo/makeinfo.c:1664
 #, c-format
 msgid "Making %s file `%s' from `%s'.\n"
 msgstr ""
 
-#: makeinfo/makeinfo.c:1697
-#, 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:1733
+#: makeinfo/makeinfo.c:1728
 #, 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:1788
+#: makeinfo/makeinfo.c:1783
 #, 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:2080
+#: makeinfo/makeinfo.c:2077
 #, c-format
 msgid "Unknown command `%s'"
 msgstr "¥¼ª¾ªº©R¥O `%s'"
 
-#: makeinfo/makeinfo.c:2102
+#: makeinfo/makeinfo.c:2099
 #, c-format
 msgid "Use braces to give a command as an argument to @%s"
 msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, address@hidden @%s ªº¤Þ¼Æ"
 
-#: makeinfo/makeinfo.c:2361
+#: makeinfo/makeinfo.c:2358
 #, fuzzy, c-format
 msgid "%c%s expected braces"
 msgstr "%c%s ¹w­p­n¦³ `{...}'"
 
-#: makeinfo/makeinfo.c:2374
+#: makeinfo/makeinfo.c:2371
 msgid "Unmatched }"
 msgstr "¥¼°t¹ïªº }"
 
-#: makeinfo/makeinfo.c:2422
+#: makeinfo/makeinfo.c:2419
 msgid "NO_NAME!"
 msgstr "NO_NAME!"
 
-#: makeinfo/makeinfo.c:2443
+#: makeinfo/makeinfo.c:2440
 #, c-format
 msgid "%c%s missing close brace"
 msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
 
-#: makeinfo/makeinfo.c:3358
+#: makeinfo/makeinfo.c:2618
+#, 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:3443
 #, fuzzy, c-format
 msgid "@image file `%s' (for HTML) not readable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: makeinfo/makeinfo.c:3364
+#: makeinfo/makeinfo.c:3449
 #, fuzzy, c-format
 msgid "No such file `%s'"
 msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
 
-#: makeinfo/makeinfo.c:3496
+#: makeinfo/makeinfo.c:3585
 #, fuzzy, c-format
 msgid "@image file `%s' (for text) unreadable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: makeinfo/makeinfo.c:3505
+#: makeinfo/makeinfo.c:3594
 msgid "@image missing filename argument"
 msgstr "@image ¨S¦³ÀɦW¤Þ¼Æ"
 
-#: makeinfo/makeinfo.c:3724
+#: makeinfo/makeinfo.c:3812
 #, c-format
 msgid "undefined flag: %s"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3725
+#: makeinfo/makeinfo.c:3813
 #, c-format
 msgid "{No value for `%s'}"
 msgstr ""
 
-#: makeinfo/makeinfo.c:3777
+#: makeinfo/makeinfo.c:3865
 #, c-format
 msgid "%c%s requires a name"
 msgstr "%c%s ¥²¶·­n¦³¦WºÙ"
 
-#: makeinfo/makeinfo.c:3883
+#: makeinfo/makeinfo.c:3971
 #, c-format
 msgid "Reached eof before matching @end %s"
 msgstr "¦b°t¹ïªº @end %s ¤§«e, ¥ý¨ì¹FÀÉ®×µ²§À"
 
-#: makeinfo/makeinfo.c:4133
+#: makeinfo/makeinfo.c:4220
 #, c-format
 msgid "`%.40s...' is too long for expansion; not expanded"
 msgstr ""
 
-#: makeinfo/multi.c:116
+#: makeinfo/multi.c:117
 msgid "Missing } in @multitable template"
 msgstr "¦b @multitable ¼Ëª©¤¤, ¨S¦³ }"
 
-#: makeinfo/multi.c:254
+#: makeinfo/multi.c:261
 #, c-format
 msgid "ignoring stray text `%s' after @multitable"
 msgstr ""
 
-#: makeinfo/multi.c:394
+#: makeinfo/multi.c:401
 #, c-format
 msgid "Too many columns in multitable item (max %d)"
 msgstr "multitable ¶µ¥Ø¤¤¦³¤Ó¦hªºÄæ¦ì (³Ì¤j­È¬° %d)"
 
-#: makeinfo/multi.c:556
+#: makeinfo/multi.c:564
 #, fuzzy, c-format
 msgid "[unexpected] cannot select column #%d in multitable"
 msgstr "µLªk¿ï¨ú multitable ¤¤ªºÄæ¦ì #%d"
 
-#: makeinfo/multi.c:585
+#: makeinfo/multi.c:593
 msgid "ignoring @tab outside of multitable"
 msgstr "©¿²¤ multitable ¥~ªº @tab"
 
-#: makeinfo/multi.c:633
+#: makeinfo/multi.c:641
 #, c-format
 msgid "** Multicolumn output from last row:\n"
 msgstr ""
 
-#: makeinfo/multi.c:636
+#: makeinfo/multi.c:644
 #, c-format
 msgid "* column #%d: output = %s\n"
 msgstr "* Äæ¦ì #%d: ¿é¥X = %s\n"
@@ -2570,7 +2595,7 @@
 msgid "No node name specified for `%c%s' command"
 msgstr "`%c%s' ©R¥O¤¤¥¼«ü©w¸`ÂI¦WºÙ"
 
-#: makeinfo/node.c:921 makeinfo/node.c:1152
+#: makeinfo/node.c:921 makeinfo/node.c:1162
 #, c-format
 msgid "Anchor `%s' and node `%s' map to the same file name"
 msgstr ""
@@ -2579,7 +2604,7 @@
 msgid "This @anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:926 makeinfo/node.c:1155
+#: makeinfo/node.c:926 makeinfo/node.c:1165
 msgid "Rename this anchor or use the `--no-split' option"
 msgstr ""
 
@@ -2600,82 +2625,82 @@
 msgid "Up:"
 msgstr "address@hidden:"
 
-#: makeinfo/node.c:1149
+#: makeinfo/node.c:1159
 #, c-format
 msgid "Anchors `%s' and `%s' map to the same file name"
 msgstr ""
 
-#: makeinfo/node.c:1154
+#: makeinfo/node.c:1164
 msgid "@anchor command ignored; references to it will not work"
 msgstr ""
 
-#: makeinfo/node.c:1348
+#: makeinfo/node.c:1361
 #, fuzzy, c-format
 msgid "%s reference to nonexistent node `%s' (perhaps incorrect sectioning?)"
 msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
 
-#: makeinfo/node.c:1364
+#: makeinfo/node.c:1377
 msgid "Menu"
 msgstr "¥Ø¿ý"
 
-#: makeinfo/node.c:1366
+#: makeinfo/node.c:1379
 msgid "Cross"
 msgstr ""
 
-#: makeinfo/node.c:1448
+#: makeinfo/node.c:1461
 #, c-format
 msgid "Next field of node `%s' not pointed to (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1451
+#: makeinfo/node.c:1464
 #, c-format
 msgid "This node (%s) has the bad Prev"
 msgstr "¥»¸`ÂI (%s) ªº address@hidden (Prev) ¸`ÂI¦³°ÝÃD"
 
-#: makeinfo/node.c:1463
+#: makeinfo/node.c:1476
 msgid "Prev"
 msgstr "address@hidden"
 
-#: makeinfo/node.c:1506
+#: makeinfo/node.c:1519
 #, c-format
 msgid "Prev field of node `%s' not pointed to"
 msgstr ""
 
-#: makeinfo/node.c:1510
+#: makeinfo/node.c:1523
 #, c-format
 msgid "This node (%s) has the bad Next"
 msgstr "¥»¸`ÂI (%s) ªº address@hidden (Next) ¸`ÂI¦³°ÝÃD"
 
-#: makeinfo/node.c:1522
+#: makeinfo/node.c:1535
 #, c-format
 msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
 msgstr ""
 
-#: makeinfo/node.c:1525
+#: makeinfo/node.c:1538
 msgid "Up"
 msgstr "address@hidden"
 
-#: makeinfo/node.c:1591
+#: makeinfo/node.c:1604
 #, c-format
 msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
 msgstr ""
 
-#: makeinfo/node.c:1620
+#: makeinfo/node.c:1633
 #, c-format
 msgid "node `%s' has been referenced %d times"
 msgstr "¸`ÂI `%s' ¤w³Q°Ñ·Ó %d ¦¸"
 
-#: makeinfo/node.c:1634
+#: makeinfo/node.c:1647
 #, c-format
 msgid "unreferenced node `%s'"
 msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
 
-#: makeinfo/node.c:1724
+#: makeinfo/node.c:1737
 #, c-format
 msgid "Removing %s\n"
 msgstr ""
 
-#: makeinfo/node.c:1728
+#: makeinfo/node.c:1741
 #, fuzzy, c-format
 msgid "Can't remove file `%s': %s"
 msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
@@ -2715,20 +2740,12 @@
 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:1628
+#: makeinfo/xml.c:1655
 #, c-format
 msgid "@image file `%s' unreadable: %s"
 msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
 
-#: makeinfo/xml.c:1973
+#: makeinfo/xml.c:2000
 msgid ""
 "@headitem as the last item of @multitable produces invalid Docbook documents"
 msgstr ""
@@ -2770,30 +2787,30 @@
 msgid "First argument to @inforef may not be empty"
 msgstr ""
 
-#: util/install-info.c:154
+#: util/install-info.c:171
 #, c-format
 msgid "%s: warning: "
 msgstr "%s: ĵ§i: "
 
-#: util/install-info.c:203
+#: util/install-info.c:220
 #, c-format
 msgid " for %s"
 msgstr ""
 
-#: util/install-info.c:426
+#: util/install-info.c:445
 #, 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
+#: util/install-info.c:453
 #, 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"
+"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"
@@ -2814,11 +2831,18 @@
 "                     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"
@@ -2854,7 +2878,7 @@
 "µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ¦^³ø¦Ü address@hidden,\n"
 "address@hidden, ½Ð¥H¹q¤l¶l¥ó (­^¤å) ±H¨ì address@hidden"
 
-#: util/install-info.c:488
+#: util/install-info.c:519
 #, fuzzy, c-format
 msgid ""
 "This is the file .../info/dir, which contains the\n"
@@ -2889,98 +2913,100 @@
 "\n"
 "* Menu:\n"
 
-#: util/install-info.c:513
+#: util/install-info.c:544
 #, 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
+#: util/install-info.c:631
 #, c-format
 msgid "%s: empty file"
 msgstr "%s: ªÅÀÉ®×"
 
-#: util/install-info.c:913 util/install-info.c:953
+#: util/install-info.c:944 util/install-info.c:984
 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
+#: util/install-info.c:979
 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
+#: util/install-info.c:1226 util/install-info.c:1236
 #, c-format
 msgid "%s: already have dir file: %s\n"
 msgstr ""
 
-#: util/install-info.c:1236
+#: util/install-info.c:1275
 #, c-format
 msgid "%s: Specify the Info file only once.\n"
 msgstr "%s: ¥u¦³«ü©w Info address@hidden"
 
-#: util/install-info.c:1287
+#: util/install-info.c:1298
+#, c-format
+msgid "Extra regular expression specified, ignoring `%s'"
+msgstr ""
+
+#: util/install-info.c:1309
+#, c-format
+msgid "Error in regular expression `%s': %s"
+msgstr ""
+
+#: util/install-info.c:1354
 #, c-format
 msgid "excess command line argument `%s'"
 msgstr "¦h¾lªº©R¥O¦C¤Þ¼Æ `%s'"
 
-#: util/install-info.c:1291
+#: util/install-info.c:1358
 msgid "No input file specified; try --help for more information."
 msgstr "¥¼«ü©w¿é¤JÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T."
 
-#: util/install-info.c:1294
+#: util/install-info.c:1361
 msgid "No dir file specified; try --help for more information."
 msgstr "¥¼«ü©w dir ÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o¨ú¦hªº¸ê°T."
 
-#: util/install-info.c:1316
+#: util/install-info.c:1385
 #, c-format
 msgid "no info dir entry in `%s'"
 msgstr "`%s' ¤º¨S¦³ info dir ¶µ¥Ø"
 
-#: util/install-info.c:1429
+#: util/install-info.c:1526
 #, c-format
 msgid "menu item `%s' already exists, for file `%s'"
 msgstr "¥Ø¿ý¶µ¥Ø `%s' ¤w¦s¦b, ¬Oµ¹ÀÉ®× `%s' ªº"
 
-#: util/install-info.c:1452
+#: util/install-info.c:1549
 #, c-format
 msgid "no entries found for `%s'; nothing deleted"
 msgstr "§ä¤£¨ì `%s' ªº¶µ¥Ø; ¥¼§R°£¥ô¦ó¶µ¥Ø"
 
-#: util/texindex.c:260
+#: util/texindex.c:224
 msgid "display this help and exit"
 msgstr "Åã¥Ü¨D§U¸ê°T, µM«áÂ÷¶}"
 
-#: util/texindex.c:262
-msgid "keep temporary files around after processing"
-msgstr "³B²z§¹²¦«á, ¤£²¾°£¼È¦sÀÉ"
-
-#: util/texindex.c:264
-msgid "do not keep temporary files around after processing (default)"
-msgstr "³B²z§¹²¦«á, ²¾°£¼È¦sÀÉ (¹w³]­È)"
-
-#: util/texindex.c:266
+#: util/texindex.c:226
 msgid "send output to FILE"
 msgstr "±N¿é¥X°e¦Ü FILE"
 
-#: util/texindex.c:268
+#: util/texindex.c:228
 msgid "display version information and exit"
 msgstr "Åã¥Üª©¥»¸ê°T, µM«áÂ÷¶}"
 
-#: util/texindex.c:278
+#: util/texindex.c:238
 #, c-format
 msgid "Usage: %s [OPTION]... FILE...\n"
 msgstr "¥Îªk: %s [OPTION]... FILE...\n"
 
-#: util/texindex.c:279
+#: util/texindex.c:239
 #, c-format
 msgid "Generate a sorted index for each TeX output FILE.\n"
 msgstr "¬°¨C­Ó TeX ¿é¥X FILE address@hidden"
 
-#: util/texindex.c:282
+#: util/texindex.c:242
 #, 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:284
+#: util/texindex.c:244
 #, c-format
 msgid ""
 "\n"
@@ -2989,27 +3015,48 @@
 "\n"
 "¿ï¶µ:\n"
 
-#: util/texindex.c:886 util/texindex.c:920 util/texindex.c:995
-#: util/texindex.c:1023
-#, c-format
-msgid "%s: not a texinfo index file"
-msgstr "%s: address@hidden texinfo ¯Á¤ÞÀÉ"
-
-#: util/texindex.c:980
+#: util/texindex.c:744
 #, c-format
 msgid "failure reopening %s"
 msgstr "­«·s¶}±Ò %s ®Éµo¥Í¿ù»~"
 
-#: util/texindex.c:1230
+#: util/texindex.c:759 util/texindex.c:787
+#, c-format
+msgid "%s: not a texinfo index file"
+msgstr "%s: address@hidden texinfo ¯Á¤ÞÀÉ"
+
+#: util/texindex.c:994
 #, c-format
 msgid "No page number in %s"
 msgstr "¦b %s ¤¤¨S¦³­¶½X"
 
-#: util/texindex.c:1303
+#: util/texindex.c:1067
 #, c-format
 msgid "entry %s follows an entry with a secondary name"
 msgstr ""
 
+#, 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"
+#~ "address@hidden ±z¥i¦b GNU address@hidden \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 address@hidden"
+
+#~ 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 ""
 #~ "  %-10s  Search for a specified string in the index entries of this Info\n"
 #~ msgstr "  %-10s  ¦b¥» Info Àɪº¯Á¤Þ¶µ¥Ø¤¤, address@hidden,\n"
@@ -3047,9 +3094,6 @@
 #~ msgid "Node:"
 #~ msgstr "¸`ÂI:"
 
-#~ msgid "virtual memory exhausted"
-#~ msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
-
 #~ msgid "`%s' has no Up field"
 #~ msgstr "`%s' ¨S¦³ address@hidden (Up) Äæ¦ì"
 
Index: util/bibtex.test
===================================================================
RCS file: /sources/texinfo/texinfo/util/bibtex.test,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util/bibtex.test    5 Jun 2006 07:45:43 -0000       1.1
+++ util/bibtex.test    1 Jul 2007 18:46:23 -0000       1.2
@@ -1,11 +1,11 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Texinfo is distributed in the hope that it will be useful,
Index: util/defs.in
===================================================================
RCS file: /sources/texinfo/texinfo/util/defs.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- util/defs.in        27 Jun 2006 17:01:26 -0000      1.7
+++ util/defs.in        1 Jul 2007 18:46:23 -0000       1.8
@@ -1,14 +1,14 @@
 # -*- shell-script -*-
 # @configure_input@
 #
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 
2006
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 
2006, 2007
 # Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
 # GNU Automake 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)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Automake is distributed in the hope that it will be useful,
Index: util/dvipdf.test
===================================================================
RCS file: /sources/texinfo/texinfo/util/dvipdf.test,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- util/dvipdf.test    19 Jun 2006 09:35:01 -0000      1.1
+++ util/dvipdf.test    1 Jul 2007 18:46:23 -0000       1.2
@@ -1,11 +1,11 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Texinfo is distributed in the hope that it will be useful,
Index: util/gendocs.sh
===================================================================
RCS file: /sources/texinfo/texinfo/util/gendocs.sh,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- util/gendocs.sh     2 Apr 2007 22:51:30 -0000       1.19
+++ util/gendocs.sh     1 Jul 2007 18:46:23 -0000       1.20
@@ -2,13 +2,13 @@
 # gendocs.sh -- generate a GNU manual in many formats.  This script is
 #   mentioned in maintain.texi.  See the help message below for usage details.
 
-scriptversion=2007-04-02.15
+scriptversion=2007-07-01.11
 
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 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 2, or (at your option)
+# 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,
Index: util/latex2html.test
===================================================================
RCS file: /sources/texinfo/texinfo/util/latex2html.test,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- util/latex2html.test        27 Jun 2006 17:01:26 -0000      1.3
+++ util/latex2html.test        1 Jul 2007 18:46:24 -0000       1.4
@@ -1,11 +1,11 @@
 #! /bin/sh
-# Copyright (C) 2006  Free Software Foundation, Inc.
+# 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Texinfo is distributed in the hope that it will be useful,
Index: util/local.test
===================================================================
RCS file: /sources/texinfo/texinfo/util/local.test,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- util/local.test     2 Jan 2006 19:56:26 -0000       1.5
+++ util/local.test     1 Jul 2007 18:46:24 -0000       1.6
@@ -1,11 +1,11 @@
 #! /bin/sh
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2005, 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Texinfo is distributed in the hope that it will be useful,
Index: util/texi2dvi.test
===================================================================
RCS file: /sources/texinfo/texinfo/util/texi2dvi.test,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- util/texi2dvi.test  19 Jun 2006 09:35:01 -0000      1.11
+++ util/texi2dvi.test  1 Jul 2007 18:46:24 -0000       1.12
@@ -1,11 +1,11 @@
 #! /bin/sh
-# Copyright (C) 2003, 2005, 2006  Free Software Foundation, Inc.
+# 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 2, or (at your option)
+# the Free Software Foundation; either version 3, or (at your option)
 # any later version.
 #
 # GNU Texinfo is distributed in the hope that it will be useful,
Index: util/texindex.c
===================================================================
RCS file: /sources/texinfo/texinfo/util/texindex.c,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- util/texindex.c     1 Jul 2007 15:35:46 -0000       1.20
+++ util/texindex.c     1 Jul 2007 18:46:24 -0000       1.21
@@ -1,12 +1,12 @@
 /* texindex -- sort TeX index dribble output into an actual index.
-   $Id: texindex.c,v 1.20 2007/07/01 15:35:46 karl Exp $
+   $Id: texindex.c,v 1.21 2007/07/01 18:46:24 karl Exp $
 
    Copyright (C) 1987, 1991, 1992, 1996, 1997, 1998, 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
    it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 2, or (at your option)
+   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,
P COPYING
P ChangeLog
P Makefile.am
P NEWS
P system.h
P doc/txi-de.tex
P doc/txi-es.tex
P doc/txi-pt.tex
P doc/txi-tr.tex
P info/dir.c
P info/display.c
P info/display.h
P info/doc.h
P info/dribble.c
P info/dribble.h
P info/echo-area.c
P info/echo-area.h
P info/filesys.c
P info/filesys.h
P info/footnotes.c
P info/footnotes.h
P info/gc.c
P info/gc.h
P info/indices.c
P info/indices.h
P info/info-utils.c
P info/info-utils.h
P info/info.c
P info/info.h
P info/infodoc.c
P info/infokey.c
P info/infokey.h
P info/infomap.c
P info/infomap.h
P info/key.h
P info/m-x.c
P info/makedoc.c
P info/man.c
P info/man.h
P info/nodemenu.c
P info/nodes.c
P info/nodes.h
P info/pcterm.c
P info/search.c
P info/search.h
P info/session.c
P info/session.h
P info/signals.c
P info/signals.h
P info/termdep.h
P info/terminal.c
P info/terminal.h
P info/tilde.c
P info/tilde.h
P info/variables.c
P info/variables.h
P info/window.c
P info/window.h
P lib/substring.c
P lib/xexit.c
P makeinfo/cmds.c
P makeinfo/cmds.h
P makeinfo/defun.c
P makeinfo/defun.h
P makeinfo/files.c
P makeinfo/files.h
P makeinfo/float.c
P makeinfo/float.h
P makeinfo/footnote.c
P makeinfo/footnote.h
P makeinfo/html.c
P makeinfo/html.h
P makeinfo/index.c
P makeinfo/index.h
P makeinfo/insertion.c
P makeinfo/insertion.h
P makeinfo/lang.c
P makeinfo/lang.h
P makeinfo/macro.c
P makeinfo/macro.h
P makeinfo/makeinfo.c
P makeinfo/makeinfo.h
P makeinfo/multi.c
P makeinfo/multi.h
P makeinfo/node.c
P makeinfo/node.h
P makeinfo/sectioning.c
P makeinfo/sectioning.h
P makeinfo/toc.c
P makeinfo/toc.h
P makeinfo/xml.c
P makeinfo/xml.h
P makeinfo/xref.c
P makeinfo/xref.h
P makeinfo/tests/copying
P po/cs.po
P po/da.po
P po/de.po
P po/de_AT.po
P po/eo.po
P po/fr.po
P po/he.po
P po/hr.po
P po/hu.po
P po/ja.po
P po/nb.po
P po/nl.po
P po/no.po
P po/pl.po
P po/ro.po
P po/ru.po
P po/rw.po
P po/sv.po
P po/tr.po
P po/vi.po
P po/zh_CN.po
P po/zh_TW.po
P util/bibtex.test
P util/defs.in
P util/dvipdf.test
P util/gendocs.sh
P util/latex2html.test
P util/local.test
P util/texi2dvi.test
P util/texindex.c




reply via email to

[Prev in Thread] Current Thread [Next in Thread]