diff options
| author | Marc Espie <espie@cvs.openbsd.org> | 2002-06-10 13:21:50 +0000 |
|---|---|---|
| committer | Marc Espie <espie@cvs.openbsd.org> | 2002-06-10 13:21:50 +0000 |
| commit | e9d84711c304eca76d998c83ddae54ec5ec7e5fb (patch) | |
| tree | 0a5c4fe0b210dae687f09af716729c6e4ecb155b | |
| parent | a1e3439457bf8a89e3e52c17fb5f788c736c2470 (diff) | |
TeXinfo 4.2, much more robust html (and other formats) output, and a few
features that new FSF programs will need (e.g., gcc snapshots).
looked at by fgs@, thanks.
103 files changed, 20985 insertions, 11290 deletions
diff --git a/gnu/usr.bin/texinfo/ABOUT-NLS b/gnu/usr.bin/texinfo/ABOUT-NLS index 28d38c76fd6..022965c6ac5 100644 --- a/gnu/usr.bin/texinfo/ABOUT-NLS +++ b/gnu/usr.bin/texinfo/ABOUT-NLS @@ -8,7 +8,7 @@ A few packages already provide translations for their messages. If you found this `ABOUT-NLS' file inside a distribution, you may assume that the distributed package does use GNU `gettext' internally, -itself available at your nearest GNU archive site. But you do *not* +itself available at your nearest GNU archive site. But you do _not_ need to install GNU `gettext' prior to configuring, installing or using this package with messages translated. @@ -22,8 +22,8 @@ related to internationalization, you should tell about the version of `gettext' which is used. The information can be found in the `intl/VERSION' file, in internationalized packages. -One advise in advance -===================== +Quick configuration advice +========================== If you want to exploit the full power of internationalization, you should configure it using @@ -34,13 +34,14 @@ to force usage of internationalizing routines provided within this package, despite the existence of internationalizing capabilities in the operating system where this package is being installed. So far, only the `gettext' implementation in the GNU C library version 2 provides as -many features (such as locale alias or message inheritance) as the -implementation here. It is also not possible to offer this additional -functionality on top of a `catgets' implementation. Future versions of -GNU `gettext' will very likely convey even more functionality. So it -might be a good idea to change to GNU `gettext' as soon as possible. - - So you need not provide this option if you are using GNU libc 2 or +many features (such as locale alias, message inheritance, automatic +charset conversion or plural form handling) as the implementation here. +It is also not possible to offer this additional functionality on top +of a `catgets' implementation. Future versions of GNU `gettext' will +very likely convey even more functionality. So it might be a good idea +to change to GNU `gettext' as soon as possible. + + So you need _not_ provide this option if you are using GNU libc 2 or you have installed a recent copy of the GNU gettext package with the included `libintl'. @@ -53,23 +54,20 @@ Most such packages use GNU `gettext'. Other packages have their own ways to internationalization, predating GNU `gettext'. By default, this package will be installed to allow translation of -messages. It will automatically detect whether the system provides -usable `catgets' (if using this is selected by the installer) or -`gettext' functions. If neither is available, the GNU `gettext' own +messages. It will automatically detect whether the system already +provides the GNU `gettext' functions. If not, the GNU `gettext' own library will be used. This library is wholly contained within this package, usually in the `intl/' subdirectory, so prior installation of -the GNU `gettext' package is *not* required. Installers may use +the GNU `gettext' package is _not_ required. Installers may use special options at configuration time for changing the default behaviour. The commands: ./configure --with-included-gettext - ./configure --with-catgets ./configure --disable-nls -will respectively bypass any pre-existing `catgets' or `gettext' to use -the internationalizing routines provided within this package, enable -the use of the `catgets' functions (if found on the locale system), or -else, *totally* disable translation of messages. +will respectively bypass any pre-existing `gettext' to use the +internationalizing routines provided within this package, or else, +_totally_ disable translation of messages. When you already have GNU `gettext' installed on your system and run configure without an option for your new package, `configure' will @@ -83,18 +81,10 @@ package is more recent, you should use to prevent auto-detection. - By default the configuration process will not test for the `catgets' -function and therefore they will not be used. The reasons are already -given above: the emulation on top of `catgets' cannot provide all the -extensions provided by the GNU `gettext' library. If you nevertheless -want to use the `catgets' functions use - - ./configure --with-catgets - -to enable the test for `catgets' (this causes no harm if `catgets' is -not available on your system). If you really select this option we -would like to hear about the reasons because we cannot think of any -good one ourself. + The configuration process will not test for the `catgets' function +and therefore it will not be used. The reason is that even an +emulation of `gettext' on top of `catgets' could not provide all the +extensions of the GNU `gettext' library. Internationalized packages have usually many `po/LL.po' files, where LL gives an ISO 639 two-letter code identifying the language. Unless @@ -110,22 +100,42 @@ Using This Package As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -ISO 639 `LL' two-letter code prior to using the programs in the -package. For example, let's suppose that you speak German. At the -shell prompt, merely execute `setenv LANG de' (in `csh'), -`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This -can be done from your `.login' or `.profile' file, once and for all. - - An operating system might already offer message localization for -many of its programs, while other programs have been installed locally -with the full capabilities of GNU `gettext'. Just using `gettext' -extended syntax for `LANG' would break proper localization of already -available operating system programs. In this case, users should set -both `LANGUAGE' and `LANG' variables in their environment, as programs -using GNU `gettext' give preference to `LANGUAGE'. For example, some -Swedish users would rather read translations in German than English for -when Swedish is not available. This is easily accomplished by setting -`LANGUAGE' to `sv:de' while leaving `LANG' to `sv'. +`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, +and `CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. + + You might think that the country code specification is redundant. +But in fact, some languages have dialects in different countries. For +example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The +country code serves to distinguish the dialects. + + The locale naming convention of `LL_CC', with `LL' denoting the +language and `CC' denoting the country, is the one use on systems based +on GNU libc. On other systems, some variations of this scheme are +used, such as `LL' or `LL_CC.ENCODING'. You can get the list of +locales supported by your system for your country by running the command +`locale -a | grep '^LL''. + + Not all programs have translations for all languages. By default, an +English message is shown in place of a nonexistent translation. If you +understand other languages, you can set up a priority list of languages. +This is done through a different environment variable, called +`LANGUAGE'. GNU `gettext' gives preference to `LANGUAGE' over `LANG' +for the purpose of message handling, but you still need to have `LANG' +set to the primary language; this is required by other parts of the +system libraries. For example, some Swedish users who would rather +read translations in German than English for when Swedish is not +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. Translating Teams ================= @@ -133,33 +143,21 @@ Translating Teams For the Free Translation Project to be a success, we need interested people who like their own language and write it well, and who are also able to synergize with other translators speaking the same language. -Each translation team has its own mailing list, courtesy of Linux -International. You may reach your translation team at the address -`LL@li.org', replacing LL by the two-letter ISO 639 code for your -language. Language codes are *not* the same as the country codes given -in ISO 3166. The following translation teams exist, as of December -1997: - - Chinese `zh', Czech `cs', Danish `da', Dutch `nl', English `en', - Esperanto `eo', Finnish `fi', French `fr', German `de', Hungarian - `hu', Irish `ga', Italian `it', Indonesian `id', Japanese `ja', - Korean `ko', Latin `la', Norwegian `no', Persian `fa', Polish - `pl', Portuguese `pt', Russian `ru', Slovenian `sl', Spanish `es', - Swedish `sv', and Turkish `tr'. - -For example, you may reach the Chinese translation team by writing to -`zh@li.org'. - - If you'd like to volunteer to *work* at translating messages, you +Each translation team has its own mailing list. The up-to-date list of +teams can be found at the Free Translation Project's homepage, +`http://www.iro.umontreal.ca/contrib/po/HTML/', in the "National teams" +area. + + If you'd like to volunteer to _work_ at translating messages, you should become a member of the translating team for your own language. -The subscribing address is *not* the same as the list itself, it has +The subscribing address is _not_ the same as the list itself, it has `-request' appended. For example, speakers of Swedish can send a message to `sv-request@li.org', having this message body: subscribe Keep in mind that team members are expected to participate -*actively* in translations, or at solving translational difficulties, +_actively_ in translations, or at solving translational difficulties, rather than merely lurking around. If your team does not exist yet and you want to start one, or if you are unsure about what to do or how to get started, please write to `translation@iro.umontreal.ca' to reach the @@ -173,42 +171,193 @@ Available Packages ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of December -1997. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination. - - Ready PO files cs da de en es fi fr it ja ko nl no pl pt ru sl sv - .----------------------------------------------------. - bash | [] [] [] | 3 - bison | [] [] [] | 3 - clisp | [] [] [] [] | 4 - cpio | [] [] [] [] [] [] | 6 - diffutils | [] [] [] [] [] | 5 - enscript | [] [] [] [] [] [] | 6 - fileutils | [] [] [] [] [] [] [] [] [] [] | 10 - findutils | [] [] [] [] [] [] [] [] [] | 9 - flex | [] [] [] [] | 4 - gcal | [] [] [] [] [] | 5 - gettext | [] [] [] [] [] [] [] [] [] [] [] | 12 - grep | [] [] [] [] [] [] [] [] [] [] | 10 - hello | [] [] [] [] [] [] [] [] [] [] [] | 11 - id-utils | [] [] [] | 3 - indent | [] [] [] [] [] | 5 - libc | [] [] [] [] [] [] [] | 7 - m4 | [] [] [] [] [] [] | 6 - make | [] [] [] [] [] [] | 6 - music | [] [] | 2 - ptx | [] [] [] [] [] [] [] [] | 8 - recode | [] [] [] [] [] [] [] [] [] | 9 - sh-utils | [] [] [] [] [] [] [] [] | 8 - sharutils | [] [] [] [] [] [] | 6 - tar | [] [] [] [] [] [] [] [] [] [] [] | 11 - texinfo | [] [] [] | 3 - textutils | [] [] [] [] [] [] [] [] [] | 9 - wdiff | [] [] [] [] [] [] [] [] | 8 - `----------------------------------------------------' - 17 languages cs da de en es fi fr it ja ko nl no pl pt ru sl sv - 27 packages 6 4 25 1 18 1 26 2 1 12 20 9 19 7 4 7 17 179 +matrix shows the current state of internationalization, as of March +2002. The matrix shows, in regard of each package, for which languages +PO files have been submitted to translation coordination, with a +translation percentage of at least 50%. + + Ready PO files bg ca cs da de el en eo es et fi fr + +-------------------------------------+ + a2ps | [] [] [] [] | + bash | [] [] [] [] | + bfd | [] [] | + binutils | [] [] | + bison | [] [] [] | + clisp | [] [] [] [] | + cpio | [] [] [] [] | + diffutils | [] [] [] [] [] [] | + enscript | [] [] | + error | [] [] | + fetchmail | () [] [] [] () | + fileutils | [] [] [] [] [] | + findutils | [] [] [] [] [] | + flex | [] [] [] [] | + gas | [] [] | + gawk | [] [] | + gcal | [] [] | + gcc | [] [] | + gettext | [] [] [] [] [] | + gnupg | [] [] [] [] [] [] | + gprof | [] [] | + grep | [] [] [] [] [] [] | + hello | [] [] [] [] [] [] [] [] | + id-utils | [] [] [] | + indent | [] [] [] [] [] | + jpilot | () [] [] [] | + jwhois | [] [] | + kbd | [] [] | + ld | [] [] | + libc | [] [] [] [] [] [] [] | + lilypond | [] [] | + lynx | [] [] [] [] | + m4 | [] [] [] [] [] | + make | [] [] [] [] | + mysecretdiary | [] [] | + nano | [] () [] [] [] [] | + nano_1_0 | [] () [] [] [] [] | + opcodes | [] [] [] | + parted | [] [] [] [] | + ptx | [] [] [] [] [] | + python | | + recode | [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] | + sketch | () [] () | + soundtracker | [] [] [] | + sp | | + tar | [] [] [] [] [] [] | + texinfo | [] [] [] [] [] | + textutils | [] [] [] [] [] | + util-linux | [] [] [] [] | + vorbis-tools | | + wdiff | [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] | + +-------------------------------------+ + bg ca cs da de el en eo es et fi fr + 1 12 11 31 36 9 1 8 39 15 1 50 + + gl he hr hu id it ja ko lv nb nl nn + +-------------------------------------+ + a2ps | () () [] | + bash | | + bfd | [] | + binutils | [] | + bison | [] [] | + clisp | [] | + cpio | [] [] [] | + diffutils | [] [] [] | + enscript | [] | + error | [] | + fetchmail | | + fileutils | [] [] [] | + findutils | [] [] [] [] [] [] | + flex | [] | + gas | | + gawk | [] | + gcal | | + gcc | | + gettext | [] | + gnupg | [] [] [] | + gprof | | + grep | [] | + hello | [] [] [] [] [] [] [] [] [] [] | + id-utils | [] | + indent | [] [] [] | + jpilot | () () | + jwhois | | + kbd | | + ld | | + libc | [] [] [] [] | + lilypond | [] [] | + lynx | [] [] | + m4 | [] [] [] [] | + make | [] [] [] [] | + mysecretdiary | | + nano | [] [] [] () [] () [] | + nano_1_0 | [] [] [] () [] () [] | + opcodes | [] | + parted | [] [] [] | + ptx | [] [] [] [] | + python | | + recode | [] [] [] | + sed | [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] | + sharutils | [] [] [] | + sketch | () | + soundtracker | [] | + sp | | + tar | [] [] [] | + texinfo | [] [] | + textutils | [] [] | + util-linux | () [] | + vorbis-tools | | + wdiff | | + wget | [] [] [] [] [] | + +-------------------------------------+ + gl he hr hu id it ja ko lv nb nl nn + 19 7 0 4 6 11 22 9 1 8 19 4 + + no pl pt pt_BR ru sk sl sv tr uk zh_TW + +----------------------------------------+ + a2ps | () () () [] [] [] () | 8 + bash | | 4 + bfd | [] [] | 5 + binutils | [] | 4 + bison | [] [] [] | 8 + clisp | | 5 + cpio | [] [] [] [] | 11 + diffutils | [] [] [] [] [] | 14 + enscript | [] [] [] | 6 + error | [] [] [] | 6 + fetchmail | () () [] | 4 + fileutils | [] [] [] [] | 12 + findutils | [] [] [] [] [] [] [] | 18 + flex | [] [] [] | 8 + gas | [] | 3 + gawk | [] [] | 5 + gcal | [] [] | 4 + gcc | [] | 3 + gettext | [] [] [] [] | 10 + gnupg | [] [] [] | 12 + gprof | [] [] | 4 + grep | [] [] [] | 10 + hello | [] [] [] [] [] [] [] | 25 + id-utils | [] [] | 6 + indent | [] [] [] [] | 12 + jpilot | () () | 3 + jwhois | () () [] | 3 + kbd | [] [] | 4 + ld | [] [] | 4 + libc | [] [] [] [] [] [] | 17 + lilypond | [] | 5 + lynx | [] [] [] | 9 + m4 | [] [] [] | 12 + make | [] [] [] [] | 12 + mysecretdiary | [] [] | 4 + nano | () [] [] [] [] | 14 + nano_1_0 | () [] [] [] | 13 + opcodes | [] [] | 6 + parted | [] [] [] | 10 + ptx | [] [] [] [] [] [] | 15 + python | | 0 + recode | [] [] [] [] | 13 + sed | [] [] [] [] [] [] | 21 + sh-utils | [] [] [] [] [] [] [] [] [] | 22 + sharutils | [] [] [] | 12 + sketch | [] () | 3 + soundtracker | [] | 5 + sp | | 0 + tar | [] [] [] [] [] [] [] | 16 + texinfo | [] [] [] | 10 + textutils | [] [] [] [] | 11 + util-linux | [] [] [] | 8 + vorbis-tools | [] | 1 + wdiff | [] [] [] [] | 9 + wget | [] [] [] [] [] [] [] | 20 + +----------------------------------------+ + 35 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW + 55 domains 5 13 2 12 25 11 11 41 34 4 7 489 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -221,6 +370,27 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If December 1997 seems to be old, you may fetch a more recent copy -of this `ABOUT-NLS' file on most GNU archive sites. + If March 2002 seems to be old, you may fetch a more recent copy of +this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date +matrix with full percentage details can be found at +`http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. + +Using `gettext' in new packages +=============================== + + If you are writing a freely available program and want to +internationalize it you are welcome to use GNU `gettext' in your +package. Of course you have to respect the GNU Library General Public +License which covers the use of the GNU `gettext' library. This means +in particular that even non-free programs can use `libintl' as a shared +library, whereas only free software can use `libintl' as a static +library or use modified versions of `libintl'. + + Once the sources are changed appropriately and the setup can handle +to use of `gettext' the only thing missing are the translations. The +Free Translation Project is also available for packages which are not +developed inside the GNU project. Therefore the information given above +applies also for every other Free Software Project. Contact +`translation@iro.umontreal.ca' to make the `.pot' files available to +the translation teams. diff --git a/gnu/usr.bin/texinfo/COPYING b/gnu/usr.bin/texinfo/COPYING index eeb586b392a..d60c31a97a5 100644 --- a/gnu/usr.bin/texinfo/COPYING +++ b/gnu/usr.bin/texinfo/COPYING @@ -291,7 +291,7 @@ convey 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) 19yy <name of author> + Copyright (C) <year> <name of author> This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -313,7 +313,7 @@ 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: - Gnomovision version 69, Copyright (C) 19yy name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision 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. diff --git a/gnu/usr.bin/texinfo/ChangeLog b/gnu/usr.bin/texinfo/ChangeLog index 126d1fca463..75bd4894b35 100644 --- a/gnu/usr.bin/texinfo/ChangeLog +++ b/gnu/usr.bin/texinfo/ChangeLog @@ -1,9 +1,1660 @@ -1999-09-28 Karl Berry <karl@gnu.org> +2002-04-01 <karl@gnu.org> - * doc/texinfo.txi: New isbn. + * configure.ac: version 4.2. + * util/texi2dvi: 4.2 + + * makeinfo/toc.c: doc fix. + * util/install-info-html: + * makeinfo/texinfo.xsl: Fixes From: Ville Skyttä + <ville.skytta@iki.fi>. + + * makeinfo/insertion.c (begin_insertion): (copying case) omit + cm_insert_copying if no_headers. + Bug report from Stephen Gildea. + +2002-03-28 <karl@gnu.org> + + * configure.ac: pretest 4.1d. + + * doc/texinfo.txi: + * makeinfo/cmds.c: ignore headings commands. From Stephen Gildea. + + * doc/texinfo.txi: @ifplaintext + +2002-03-26 <karl@gnu.org> + + * doc/texinfo.tex (\ifplaintext,\ifnotplaintext): new output + format conditional. + + * makeinfo/cmds.c (cm_settitle): + * makeinfo/node.c (cm_node): need to pass output filename arg to + * xml_begin_document. + + * makeinfo/cmds.c (cm_sp): need close_single_paragraph instead of + close_paragraph to avoid an extra blank line. Bug report from Stephen Gildea. + + * doc/texinfo.tex (\doignore): can't do c kludge for + documentdescription. Bug report from Stephen Gildea. + + * doc/texinfo.txi: missing t in documentdescription example, from + Stephen Gildea. + +2002-03-24 <karl@gnu.org> + + * doc/texinfo.txi: invar sec + +2002-03-23 <karl@gnu.org> + + * configure.ac: pretest 4.1c. + +2002-03-23 Eli Zaretskii <eliz@is.elta.co.il> + + * info/search.c (skip_non_whitespace): Don't go beyond the + terminating null character. + + * info/filesys.c (filesys_read_info_file) + (filesys_read_compressed): Null-terminate the contents of the file + we've read, so it could be used as a C string. + +2002-03-23 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): Fix + computation of output_filename's length, to avoid overrunning + malloc'ed buffer. If mkdir returns with EEXIST, assume we can use + an existing directory only if the existing file is indeed a + directory. On MS-DOS, allow for EACCES in addition to EEXIST. + <max_name_len>: Remove this variable. + + * makeinfo/makeinfo.c (expansion): Protect execute_string from too + long strings. + (EXECUTE_STRING_MAX): New macro. + (execute_string): Use EXECUTE_STRING_MAX, not 4000. + +2002-03-23 <karl@gnu.org> + + * doc/texinfo.txi: + * makeinfo/insertion.h: + * makeinfo/texinfo.dtd: + * makeinfo/xml.h: + * makeinfo/xml.c: + * makeinfo/makeinfo.h: + * makeinfo/insertion.c: + * makeinfo/html.c: + * makeinfo/cmds.c: + * doc/info-stnd.texi: @permissions -> @copying. + * doc/texinfo.tex: permissions -> copying. + +2002-03-22 <karl@gnu.org> + + * configure.ac: pretest 4.1b. + + * info/Makefile.am (BUILT_SOURCES): conditionalize on + TEXINFO_MAINT, to appease distcheck. + + * From: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>: + * makeinfo/makeinfo.h (next_menu_item_number): New global. + * makeinfo/insertion.c (begin_insertion): Initialise it. + * makeinfo/makeinfo.c (handle_menu_entry): Emit accesskey attribute + in html output, according to next_menu_item_number. + * makeinfo/node.c (cm_node): Emit accesskey attributes in html output. + + * doc/texinfo.txi: GNU texts. + + * doc/info-stnd.texi: @syncodeindex, not @synindex. + +2002-03-21 <karl@gnu.org> + + * doc/texinfo.txi: @permissions. + +2002-03-20 <karl@gnu.org> + + * doc/texinfo.txi: document --no-headers a bit better. + * makeinfo/makeinfo.c: better description of --no-headers, + suggested by Stephen Gildea. + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): use + command-line specified output name unchanged. + + * makeinfo/makeinfo.c (full_expansion): new routine, separated + from expansion, that does not tamper with the formatting parameters. + * makeinfo/insertion.c: copying -> permissions. + (cm_insert_permissions): insert rather than add. + * makeinfo/texinfo.dtd: + * makeinfo/xml.h: + * makeinfo/xml.c: + * makeinfo/cmds.c: copying -> permissions. + * makeinfo/makeinfo.h: copying -> permissions. + (full_expansion): declare. + + * doc/texinfo.txi: @copying -> @permissions, @include fdl.texi. + * doc/info-stnd.texi: @copying -> @permissions, always include the FDL. + + * makeinfo/html.c (html_output_head): copying -> permissions, use + insert_string. + * makeinfo/insertion.h: copying -> permissions. + * doc/texinfo.tex: \copying -> \permissions. + + * doc/Makefile.am (EXTRA_DIST): include fdl.texi. + +2002-03-19 <karl@gnu.org> + + * makeinfo/insertion.c (cm_insert_copying): use insert_string in + the xml case, sigh. + + * doc/info-stnd.texi: copying + + * dir-example: info standalone. + + * makeinfo/html.c: copyright_text -> copying_text. + * makeinfo/texinfo.dtd: + * makeinfo/insertion.c: + * makeinfo/insertion.h: + * makeinfo/makeinfo.h: + * makeinfo/xml.c: + * makeinfo/xml.h: + * makeinfo/cmds.c: copyrighttext -> copying. + * doc/info-stnd.texi: copyrighttext -> copying. + * doc/texinfo.tex (\copying, \insertcopying): rename from + copyrighttext per rms. + + * makeinfo/index.c (index_add_arg): don't emit warning for index + entries containing : after all. + + * info/infokey.c: remove non-ansi trailing commas from last items + of enums. From: Albert Chin-A-Young <china@thewrittenword.com>. + +2002-03-18 <karl@gnu.org> + + * doc/info-stnd.texi: @include after @setfilename. + * doc/texinfo.txi: @insertcopyrighttext, @settitle GNU ... + + * doc/texinfo.txi: mention @setfilename and source filename + exceptions at the top. + + * makeinfo/defun.c (scan_group_in_string): handle escaped @{ and @}. + Bug report from Werner Lemberg. + + * doc/info-stnd.texi: add version number to title a la Texinfo. + * doc/info-stnd.texi: file -> manual. + * doc/info-stnd.texi: use @copyrighttext. + + * makeinfo/insertion.c (begin_insertion, end_insertion): + copyrighttext case. + * makeinfo/makeinfo.h (copyright_text): declare/define. + * makeinfo/html.c (html_output_head): output copyrighttext. + * makeinfo/texinfo.dtd: Add copyrighttext. + * makeinfo/xml.h (xml_element): add COPYRIGHTTEXT. + * makeinfo/xml.c (texinfoml_element_list, docbook_element_list): + copyrighttext case. + +2002-03-17 <karl@gnu.org> + + * makeinfo/insertion.h (insertion_type): include copyrighttext. + * makeinfo/cmds.c (command_table): new command copyrighttext. + + * doc/texinfo.tex (\copyrighttext, \insertcopyrighttext): new + Texinfo commands to handle the copyright and permission text cleanly. + (\dblarrowbox,\longdblarrowbox,\pushcharbox,\equivbox,\bullbox): + remove these definitions that have not been used for ages. + + * configure.ac: call AC_CANONICAL_BUILD before the termcap + checking. Bug report from Eli. + +2002-03-16 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/node.c (cm_anchor): When recording the anchor position, + account for output_paragraph_offset, since the current paragraph + might not be closed yet (happens inside a menu, for example). + + * djgpp/config.sed: Tweak to adapt to the new Automake/Autoconf. + + * djgpp/README: Update. + +2002-03-15 <karl@gnu.org> + + * dir-example: GNU organization. + +2002-03-14 <karl@gnu.org> + + * makeinfo/cmds.c (cm_titlepage): do not declare nonexistent + function. + +2002-03-14 <karl@gnu.org> + + * doc/texinfo.txi: don't say specifically html 3.2, since <html + lang=...> is not 3.2. + Bug reprt from: Matthew Woodcraft <mattheww@chiark.greenend.org.uk>. + +2002-03-13 <karl@gnu.org> + + * doc/texinfo.tex (\writetocentry): set \pdfmakepagedesttrue here. + (\Etitlepage): instead of here. In case the document has no + @titlepage. Bug report from Stephen Gildea. + + * util/texi2dvi: be verbose after the definition of cmd, not + before. From Andreas Schwab. + +2002-03-12 <karl@gnu.org> + + * pretest 4.1a. + * doc/info-stnd.texi: update to FDL. + +2002-03-11 <karl@gnu.org> + + * util/texi2dvi: + * util/texindex.c: + * util/install-info.c: + * makeinfo/makeinfo.c: + * info/infokey.c: + * info/info.c: home page and help message. + + * doc/texinfo.txi (math): document @\ (aka \\) for literal \. + regularize index entries. + * makeinfo/cmds.c (command_table): \\ -> insert_self. + + * doc/texinfo.tex (\mathbackslash): new definition. + (\math): handle \\ too. + (\codeunder): handle @code{\} in mmode. + + * makeinfo/html.c: make home page be gnu's. + + * doc/texinfo.txi (Conventions): rewrite description of quotes so + as to work in all formats; there was no output for HTML. + Report from: David Merrill <david@lupercalia.net>. + +2002-03-10 <karl@gnu.org> + + * doc/texinfo.txi (Texinfo Copying Conditions): mention this + manual's license specifically. + +2002-03-09 Eli Zaretskii <eliz@is.elta.co.il> + + * info/indices.c (add_index_to_index_nodenames): Fix an off-by-one + error when computing the number of the last index entry. + +2002-03-08 <karl@gnu.org> + + * doc/texinfo.tex: Rewrite unnumbered toc handling to keep track + of their sequence, so they can be handled correctly in + the PDF toc (= bookmarks). + From: Werner LEMBERG <wl@gnu.org>. + + * configure.ac: AC_MSG_WARN if can't find a term library. From: + Marc.Herbert@ens-lyon.fr. + + * info/info.c: alphabetize. + * info/info.c: include short option names. + +2002-03-08 Eli Zaretskii <eliz@is.elta.co.il> + + * info/display.c (display_update_one_window): Dynamically reallocate + printed_line[] as needed. When under -R, ignore ANSI escapes for + the purposes of line wrap display. Clear the line to EOL if it + used escape sequences. Reallocate entry->text if the new + printed_line is longer than screenwidth. + + * info/window.c (string_width): Don't count ANSI escape sequences + in string width, when under -R.. + (calculate_line_starts): Don't count ANSI escape sequences in line + width, when under -R. + (window_get_cursor_column, window_chars_to_goal): When under -R, + ANSI escapes don't affect the horizontal position. + + * info/info-utils.c (printed_representation): If -R is in effect, + treat ESC as a normal character. + +2002-03-08 <karl@gnu.org> + + * util/Makefile.am: + * info/Makefile.am: + * makeinfo/Makefile.am: + * lib/Makefile.am: doc fix. + + * doc/Makefile.am (install-tex): prefix the install directories + with $(DESTDIR), because that is what automake does for all + generated install rules. The file pdfcolor.tex should be + installed as such (and not as epsf.tex). + From: Peter Breitenlohner <peb@mppmu.mpg.de>. + + * configure.ac (AC_INIT): now pass [GNU Texinfo]. + (AM_INIT_AUTOMAKE): now no args, for automake 1.6. + +2002-03-05 <karl@gnu.org> + + * doc/texinfo.txi: history + +2002-03-04 <karl@gnu.org> + + * configure.ac: version 4.1. + * util/texi2dvi: version. + + * doc/texinfo.txi: @settitle is used in html output (from Eli), + various underfull hbox fixes. + +2002-03-02 <karl@gnu.org> + + * configure.ac: pretest 4.0k + + * info/info.c: declare add_file_to_directory to avoid warning. + + * doc/info-stnd.texi: info standalone so as not to collide with + `standards' in dir. + +2002-03-01 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/insertion.c (end_insertion): Insert the /td and /tr + directives in lower case. From Per Bothner <per@bothner.com>. + + * makeinfo/macro.c (cm_alias): Ignore whitespace around the alias + name, like the manual promises. + + * doc/texinfo.txi (Invoking Macros, Macro Details): Document that + commas in macro arguments don't work in TeX. Advise texi2dvi -e + when macros don't work with TeX. + + * doc/texinfo.txi (Node Line Requirements): Add restrictions about + parens and some punctuation characters in node names. + (Def Cmd Template): Document that macros are not expanded. + + The following two changes allow to say "info foo" if there's an + Info file `foo' somewhere along INFOPATH. + + * info/info.c (add_file_directory_to_path): New function, code + moved from `main'. + (main): Use add_file_directory_to_path. + + * info/session.c (info_follow_menus): If the first menu entry + couldn't be found as an item in DIR's menu, try it as a file name. + + 2001-06-19 Mark Montague <markmont@umich.edu> + + * info/filesys.c: Fix for sparc64 (offsets should be "long"s). + + * info/session.c: Fix typos in function calls. + + 2001-08-23 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/footnote.c (cm_footnote): Don't allow footnotes inside + footnotes. + (output_pending_notes): Increment already_outputting_pending_notes + in the HTML case as well, to protect execute_string from + recursively entering output_pending_notes. + +2002-03-01 <karl@gnu.org> + + * doc/texinfo.tex: fix mismatched $'s for sake of emacs font-lock. + From: Stephen Gildea <gildea@stop.mail-abuse.org>. + +2002-02-27 <karl@gnu.org> + + * configure.ac: pretest 4.0j. + + * info/infodoc.c: 1scroll-forward typo. + +2002-02-26 <karl@gnu.org> + + * lib/system.h [! ENABLE_NLS]: let's not go const. + +2002-02-26 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/config.sed: Add tweaking of file names in "install-info" + and "uninstall-info" targets. + + * doc/inf-stnd.texi (Custom Key Bindings, Invoking infokey): + Add footnotes about DOS file names. + + * info/infokey.c (main) [__MSDOS__]: If HOME is not defined, + default to the current directory. + +2002-02-26 <karl@gnu.org> + + * lib/system.h (LC_MESSAGES) [! LC_MESSAGES]: need this after all. + +2002-02-25 <karl@gnu.org> + + * doc/info-stnd.texi: contents at top, avoid overfull hbox. + * lib/Makefile.am (libtxi_a_sources): include gettext.h. + + * lib/system.h (LC_MESSAGES): don't need conditional, Bruno says + that locale.h or libintl.h does so. + + * configure.ac: pretest 4.0i. + + * dir-example: infokey. + * doc/info-stnd.texi: invoking infokey. + * info/infokey.c (short_help): reorganize slightly. + + * lib/system.h: use "gettext.h" instead of <libintl.h> per gettext + 0.11 recommendation. + +2002-02-25 gettextize <bug-gnu-gettext@gnu.org> + + * Makefile.am (SUBDIRS): Add intl. + * configure.ac (AC_CONFIG_FILES): Add intl/Makefile. + +2002-02-25 <karl@gnu.org> + + * util/Makefile.am (LDADD): + * makeinfo/Makefile.am (LDADD): + * info/Makefile.am (LDADD): @LIBINTL@ per gettextize. + + * configure.ac: gettextize changes. + * Makefile.am: gettextize changes. + +2002-02-25 gettextize <bug-gnu-gettext@gnu.org> + + * Makefile.am (SUBDIRS): Add m4. + (SUBDIRS): Remove intl. + (ACLOCAL_AMFLAGS): New variable. + (EXTRA_DIST): Add config.rpath. + * configure.ac (AC_CONFIG_FILES): Add m4/Makefile. + (AC_CONFIG_FILES): Remove intl/Makefile. + +2002-02-23 <karl@gnu.org> + + * pretest 4.0h. + + * 2002-02-23 Eli Zaretskii <eliz@is.elta.co.il> + * doc/info-stnd.texi (Invoking Info): Add a reference to the + description of index-apropos and index-search. Document the + --raw-escapes option. + (Searching Commands): Describe index-search and index-apropos. + + * info/man.c (clean_manpage): If raw_escapes_p is not set, remove + ANSI escape sequences from the man page. + + * info/info.h: Declare raw_escapes_p. + + * info/info.c: <raw_escapes_p>: New variable. + New option --raw-escapes or -R. + (main): Handle it. + (info_short_help): Document it. + (main): Honor --output together with --usage, by dumping the node + we found to the named file. + + 2002-02-23 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/html.c (nodename_to_filename): Call + nodename_to_filename_1 with the last argument 1, not 0. + + * makeinfo/toc.c (shortcontents_update_html) + (contents_update_html): Don't omit the entry for the Top node. + + * 2002-01-30 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/node.c (cm_node): Don't condition splitting on + top_node_seen being non-zero. If current_node is NULL, use the + current output file name to get at the file name for the previous + node. Don't compute a new file name for a node if we didn't close + the current file. + + 2002-02-01 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/node.c (cm_node): Call html_output_head whenever we + create a new split-HTML file. + + * makeinfo/html.c (html_output_head): Make html_title static. + Compute it only once, and don't free it. Output the <h1> title + header only once per run. + + 2002-02-02 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/toc.c (contents_update_html): Fix the condition for + omitting duplicate TOC entries. Fix comparison with the TOC entry + for "Top". + +2002-02-14 <karl@gnu.org> + + * doc/Makefile.am (DISTCLEANFILES): use this variable instead of + the distclean-aminfo target, which apparently is no longer used. + + * pretest 4.0g. + + * doc/texinfo.tex (\appendixentry): new macro for typesetting + appendix toc entries. + (\appendixzzz, \summarycontents, \pdfoutlines): use it, instead of + usurping \chapentry. This allows the bookmarks in the pdf output + to come out right. Report from: Kurt Hornik + <Kurt.Hornik@ci.tuwien.ac.at>. + +2002-02-13 <karl@gnu.org> + + * configure.ac: ALL_LINGUAS is deprecated as of gettext 0.11. + * doc/texinfo.tex (\image): remove spurious \loggingall. + + * doc/texinfo.txi: @math now implies @tex. + * doc/texinfo.tex (\math): imply @tex. + +2002-02-11 <karl@gnu.org> + + * makeinfo/insertion.c (handle_verbatim_environment): save and + restore filling_enabled and inhibit_paragraph_indentation. Bug + report from: Alexandre Duret-Lutz <duret_g@lrde.epita.fr>. + + * makeinfo/makeinfo.c (reader_loop): don't worry about bare braces + inside @math. + +2002-02-08 <karl@gnu.org> + + * info/infodoc.c: keep underlines with the text they refer to, for + translation purposes. + Pointed out by Christian Rose <menthos@menthos.com>, 20 nov 2001. + + * doc/info.texi: recommend setting INFOPATH. + + * doc/Makefile.am (install-tex): need $(srcdir) for install. + From: istry <istry@mail.ru>. + + * doc/texinfo.tex: replace $$$ delimiter with $.$, for sake of + font-lock in Emacs 21.1. Suggestion from: Stephen Gildea + <gildea@stop.mail-abuse.org>. + + 2002-01-26 Eli Zaretskii <eliz@is.elta.co.il> + * info/infomap.c (default_emacs_like_info_keys) + (default_emacs_like_ea_keys, default_vi_like_info_keys) + (default_vi_like_ea_keys): Fix default keybindings to be + consistent with non-INFOKEY branch. Add bindings for Home, End, + and Delete keys. + + 2002-01-23 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/toc.h <TOC_ENTRY_ELT>: New member html_file. + + * makeinfo/toc.c (toc_add_entry): Compute and set the html_file + member. + (shortcontents_update_html): Produce the toc_* links correctly, + without duplicating the link text. Fix comparison with "Top". + Handle the case when there's @shortcontents, but no @contents. + (contents_update_html): Fix the way toc_* anchors are produced + from toc_entry_alist[i]->name: take only the node name from the + string in toc_entry_alist[i]->name. Fix comparison with "Top". + + * makeinfo/sectioning.c (sectioning_html): Take the toc_anchor + substring before closing the anchor with </a>. Fix the closing + </hN> tag--add 2 to level, not 1. Use sizeof instead of a magic + value of 9. + + * makeinfo/cmds.c: Make @summarycontents call cm_shortcontents, as + promised by the docs. + + 2002-01-19 Eli Zaretskii <eliz@is.elta.co.il> + * djgpp/config.sed: Fix a problem with AC_CONFIG_LINKS that + prevented building from a directory on another drive. + + * djgpp/config.bat: Fix problems with long --srcdir diectory names. + + * djgpp/README: Update. + +2002-01-31 <karl@gnu.org> + + * doc/texinfo.txi: mention dvips + +2002-01-28 <karl@gnu.org> + + * configure.ac (ALL_LINGUAS): add hr. + +2002-01-22 <karl@gnu.org> + + * makeinfo/defun.c (defun.c): only warn about ( immediately + following a defun name, since the groff manual needs other + characters there where whitespace is incorrect. + Reported by Werner Lemberg <wl@gnu.org>. + + * doc/info-stnd.texi: alphabetize variable list. + + * doc/texinfo.txi: no :'s in index entries, index @page/@group + some more. + + * makeinfo/index.c (index_add_arg): warn if index entry contains a + colon. From: Kenneth Lorber <keni@his.com>. + +2002-01-21 <karl@gnu.org> + + * makeinfo/insertion.c: </pre not /<pre, reported by Mike + Benefield <mike@duckbrain.com>. + +2002-01-18 <karl@gnu.org> + + * configure.ac: pretest 4.0f. + + * util/texindex.c: + * util/install-info.c: + * makeinfo/makeinfo.c: + * info/info.c: it's 2002. + + * info/session.c: pass right args to info_scroll_half_screen_up. + From Eli. + +2002-01-18 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/multi.c (multitable_item): Always return a value. + + * util/install-info.c (xmalloc, xrealloc, pfatal_with_name) + (open_possibly_compressed_file, parse_input): Call `fatal' with 3 + arguments, to avoid compiler warnings. + (main): Call `fatal', `error', and `warning' with the right number + of arguments. + + * makeinfo/makeinfo.c (main): Remove extraneous first arg of + usage(). + + * info/window.c (build_message_node): Supply a 4th argument to + build_message_buffer. + + +2002-01-18 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/sectioning.c (sectioning_html): End the anchor properly + with a </a>. + + * info/session.c (info_menu_or_ref_item): If we didn't find a + cross-reference on this line, try the one before. + + * info/infomap.c (fetch_user_maps): Provide two different + translations for ``file too small'' and ``file too big'' error. + + * info/info.c (info_short_help): Print the --speech-friendly + option together with the other options, not at the end of the help + screen. + +2002-01-18 Andreas Schwab <schwab@suse.de> + + * makeinfo/html.c (escape_string): When string is empty don't read + past end of it. + +2002-01-17 <karl@gnu.org> + + * doc/info-stnd.texi: overfull box in table. + +2002-01-16 <karl@gnu.org> + + * configure.ac: pretest 4.0e. + + * doc/info.texi: update from emacs. + +2002-01-03 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (file_line_error): New function. + + * makeinfo/insertion.c (discard_insertions): Call file_line_error + instead of changing global variables. + + * makeinfo/sectioning.c (cm_top): Ditto. + + * makeinfo/node.c (validate_file): Ditto. + + * makeinfo/makeinfo.c (discard_braces, handle_variable_internal): + Ditto. + + * makeinfo/macro.c (define_macro): Ditto. + + 2001-12-31 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/node.h (TAG_ENTRY): New struct member html_fname. + + * makeinfo/node.c (find_node_by_fname): New function. + (remember_node): Accept an additional argument FNAME, the node's + file name, and record it in the list of nodes; callers changed. + (cm_node): Call find_node_by_fname to see if this node's file name + clashes with another node or anchor. If it clashes with another + node, append the new node to the same file instead of erasing the + other node. If it clashes with an anchor, print an error message + and overwrite the anchor's file. + (cm_anchor): If this anchor's file name clashes with another + anchor or node, print an error message and ignore the anchor. + + * makeinfo/files.c (normalize_filename): New function. + + * makeinfo/files.h <normalize_filename>: Add declaration. + + * makeinfo/html.c (nodename_to_filename_1): Call + normalize_filename before returning the file name to the caller. + Disable the code which adds #Nodified-filename to the file name we + produce. + + * makeinfo/makeinfo.c (add_char): Don't replace whitespace with + if we are producing an HTML directive. + (add_html_elt): New function. + (cm_xref, cm_inforef, cm_uref, cm_email, cm_image): Use + add_html_elt instead of add_word, where appropriate. + + * makeinfo/html.c (add_link): Ditto. + + * makeinfo/footnote.c (cm_footnote): Ditto. + + * makeinfo/defun.c (defun_internal): Ditto. + + 2001-12-27 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/node.c (cm_node): Don't omit links to (DIR) from the + navigation bar, add_anchor_name will DTRT now. + + * makeinfo/makeinfo.c (cm_xref): Produce a split-HTML file name + from arg1, the node name, not from arg3 or arg2, which are the + reference name. Use arg2 or arg3 for the text to be displayed as + a link between ">" and "</a>". Use add_anchor_name instead of + add_nodename_to_filename. + (cm_inforef): Use add_anchor_name instead of + add_nodename_to_filename. Handle the case of a missing second + argument in @inforef. + + * makeinfo/html.c (add_anchor_name): Always add # and the anchor + name, even if we are splitting. If the node is "(dir)", treat it + as if it were "dir". + (nodename_to_filename_1): Don't append #Top for the Top node. + (add_link): Don't punt if nodename is "(dir)". Output "</a>" + after the link. + + 2001-12-25 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/makeinfo.c (cm_xref, cm_inforef): Output the target + file name via add_nodename_to_filename. + + 2001-12-20 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/html.c (nodename_to_filename_1): Make references to Top + to refer to index.html#Top. + (add_nodename_to_filename): Accept additional argument HREF; + callers changed. + + * makeinfo/toc.c (rewrite_top): If the filename to rewrite is + stdout or the null device, do nothing. + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use + FILENAME_CMP instead of strcmp. Search for a period forward, not + backward. Make index_name[] a static const array, and its len + computed at compile time. + (convert_from_loaded_file): If output_filename is the null device, + turn off HTML splitting. + (cm_xref): Use add_anchor_name, rather than add_escaped_anchor_name, + in the 5-argument case in HTML mode. + (cm_inforef): Fix external references in HTML mode. + + * makeinfo/node.c (cm_node): Use FILENAME_CMP instead of strcmp. + Don't open a new file if the new node's name is empty. Take the + directory part of split-HTML files from current_output_filename, + not from toplevel_output_filename (the latter doesn't include the + manual's subdirectory part). + + * makeinfo/html.c (nodename_to_filename_1): Use FILENAME_CMPN + instead of strncmp. Support *.inf files in references. + +2001-12-11 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update + for Texinfo 4.0d. + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH + instead of literal `/'. + (convert_from_loaded_file): Flush the output stream before + creating the TOC. + + +2002-01-14 <karl@gnu.org> + + * info/info.c: translate --speech-friendly (from Eli). + * makeinfo/index.c: formatting. + + 2001-12-24 Eli Zaretskii <eliz@is.elta.co.il> + * info/infomap.c (initialize_info_keymaps): Bind the user-defined + keys on top of the default ones, not the other way around. + +2002-01-11 <karl@gnu.org> + + * info/info.c: can't do #ifdef inside of printf any more. + From: Tyler <tyler@zerodivide.cx> + + * configure.ac (ALL_LINGUAS): add he, from Eli. + +2002-01-09 Eli Zaretskii <eliz@is.elta.co.il> + + * info/window.c (calculate_line_starts): Cast node->contents[i] to + unsigned char. + +2002-01-04 <karl@gnu.org> + + * doc/texinfo.tex (\footnotezzz): \noindent=\relax. + +2002-01-03 <karl@gnu.org> + + * doc/texinfo.tex (\imagexxx): handle pdf and dvi cases the same. + (\dopdfimage): need \immediate to avoid seg fault when including the + same image twice. + Bug reports from Alexandre Duret-Lutz <duret_g@lrde.epita.fr>. + +2001-12-31 <karl@gnu.org> + + * makeinfo/makeinfo.c (cm_image): check *ext_arg as well as + ext_arg when computing length of fullname. + + * makeinfo/defun.c: docbook changes. + * makeinfo/docbook.c (docbook_punctuation): remove deprecated + default: at end of statement. + + * makeinfo/docbook.c: initial. + * makeinfo/docbook.h: initial. + * makeinfo/Makefile.am (makeinfo_SOURCES): add docbook.[ch]. + * makeinfo/makeinfo.c (add_char): use in docbook case. + + * doc/texinfo.tex (\footnotezzz): use \everypar={\hang} instead of + just \hang in case a footnote extends for multiple paragraphs. + +2001-12-18 <karl@gnu.org> + + * info/Makefile.am (BUILT_SOURCES): include $(EXEEXT) on makedoc + dependency since automake doesn't do it. + + 2001-12-11 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/config.bat, djgpp/config.sed, djgpp/config.site: Update + for Texinfo 4.0d. + + * info/infomap.c (fetch_user_maps): Initialize `filename' to NULL + and don't try to call `open' if `filename' is NULL. + [__MSDOS__]: Try the current directory if neither $INFOKEY nor + $HOME are defined. + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): Use IS_SLASH + instead of literal `/'. + (convert_from_loaded_file): Flush the output stream before + creating the TOC. + + 2001-12-10 Eli Zaretskii <eliz@is.elta.co.il> + + * info/infokey.c (main): Use FOPEN_WBIN instead of "w". + + * info/infokey.h (INFOKEY_SRCFILE, INFOKEY_FILE) [__MSDOS__]: + Special definitions for MS-DOS. + + 2001-12-09 Eli Zaretskii <eliz@is.elta.co.il> + + * lib/system.h: Condition inclusion of libintl.h on ENABLE_NLS. + (gettext, bindtextdomain, textdomain) [!ENABLE_NLS]: Provide + trivial definitions for when NLS is not used. + (LC_MESSAGES) [!ENABLE_NLS]: Define if undefined by locale.h. + +2001-12-18 Eli Zaretskii <eliz@is.elta.co.il> + + * info/infomap.c (decode_keys): Change the return type to int; + callers changed. Return zero if some of the special keys in SRC + are not defined by the terminal; return non-zero otherwise. + (section_to_keymaps): If decode_keys returns zero, don't bind the + key sequence. + +2001-12-18 Eli Zaretskii <eliz@is.elta.co.il> + + * makeinfo/xml.c (xml_insert_element_with_attribute) + (xml_insert_element): Rename the argument `element' to `elt'. + + * info/infokey.c (compile): Use \033 instead of (non-standard) \e. + +2001-12-17 <karl@gnu.org> + + 2001-12-16 Eli Zaretskii <eliz@is.elta.co.il> + + * info/pcterm.c (pc_initialize_terminal) [INFOKEY]: Store term_kh, + term_ke, term_ki, and term_kx sequences. + (DJGPP_keytab): Map Home, End, and Insert to escape sequences, not + to C-a, C-e, etc. + + * info/infomap.c (default_emacs_like_info_keys) + (default_emacs_like_ea_keys, default_vi_like_info_keys) + (default_vi_like_ea_keys): Add the leading suppress-default flag, + to be consistent with the table which comes from a file. + + * info/session.c (info_do_lowercase_version): Add a doc string. + + * info/infodoc.c (describe_key) [INFOKEY]: If keystroke is bound + to do-lowercase-version, but its lower-case variant is undefined, + say that keystroke is also undefined. + + +2001-12-12 <karl@gnu.org> + + * makeinfo/files.c (find_and_load): remove conditionals on + VMS|O_BINARY, always just read as many bytes as we can. + + 2001-12-11 Eli Zaretskii <eliz@is.elta.co.il> + * new files for djgpp/. + + 2001-09-09 Eli Zaretskii <eliz@is.elta.co.il> + * info/echo-area.c (build_completions): Look for a candidate + completion which matches user's request including the letter-case, + use that as the value of LCD_completion. + + 2001-12-06 Eli Zaretskii <eliz@is.elta.co.il> + * info/echo-area.c (build_completions): When looking for the best + completion candidate, only compare as much characters as the user + typed. + + +2001-12-04 <karl@gnu.org> + + * doc/texinfo.tex (\pdfmkpgn): remove trailing @ in link names + again. Also from Kurt. + + * doc/texinfo.tex (\image): need five commas to ignore additional + optional args to @image. From Kurt.Hornik@ci.tuwien.ac.at. + + * doc/texinfo.tex (\afourlatex): reset \globaldefs=0 explicitly. + From Trond Endrestøl <trond@ramstind.gtf.ol.no>. + +2001-12-01 <karl@gnu.org> + + * makeinfo/files.c (find_and_load): remove O_BINARY from open + call, this messes up under Windows. From eli. + +2001-11-20 <karl@gnu.org> + + * makeinfo/makeinfo.c (cm_image): reword error messages. + +2001-11-19 <karl@gnu.org> + + * Pretest 4.0d. + * doc/texinfo.txi: index ragged right/left. + + * info/window.c (build_message_buffer): handle %1$s as used in + ja.po. From Fumitoshi UKAI <ukai@debian.or.jp>. + + * configure.ac (ALL_LINGUAS): add sv. + +2001-11-16 <karl@gnu.org> + + * Makefile.am (EXTRA_DIST): add COPYING.DOC. + + 1999-10-30 Andrew Bettison <andrewb@zip.com.au> + + All these changes are to implement user-configurable key mapping + using the new 'infokey' program. For the time being, the new + code is conditional on [INFOKEY] and the old code is still there + in case we want to revert. + + * info/session.c (incremental_search): test for printable chars + _before_ isearch command keys -- makes a difference if the + isearch commands are bound to printable chars. + + * info/doc.h, + * info/infodoc.c, + * info/infomap.c, + * info/m-x.c, + * info/session.c: New typedef InfoCommand, plus a bunch of + supporting macros, to abstract a "command" away from being a + function pointer. + + * info/doc.h (pretty_keyseq), + * info/infodoc.c (pretty_keyseq), + * info/session.c (pretty_keyseq): Moved definition from + session.c into infodoc.c, and rewrote to recognise special + terminal sequences (PgUp, PgDn, etc.). + + * info/infodoc.c (create_internal_info_help_node, + replace_in_documentation, info_where_is), + * info/m-x.c (info_execute_command): Cleaned up references to + hardwired keystrokes. + + * info/infodoc.c (replace_in_documentation): + Extended the \\[foo] syntax to recognise \\%-X.Y[foo], which + causes the replacement text to be inserted using sprintf("%-X.Ys"). + + * info/session.c (_scroll_forward, _scroll_backward, + scroll_forward_page_only, scroll_backward_page_only, + scroll_forward_page_only_set_window, + scroll_backward_page_only_set_window): New functions, eliminating + need for SPC and DEL hack. + + * info/session.c (scroll_forward, scroll_backward, + scroll_forward_set_window, scroll_backward_set_window): Call + _scroll_forward and _scroll_backward to do all the work. + + * info/infomap.c (initialize_info_keymaps)[!INFOKEY]: set 'v' + and Control('v') key bindings to info_scroll_backward_page_only + and info_scroll_forward_page_only respectively. + + * info/Makefile.am (bin_PROGRAMS): Added new executable `infokey'. + (infokey_SOURCES): Defined. + (EXTRA_DIST): Added `sample_infokey'. + (BUILT_SOURCES): Added `key.c'. + + * info/infokey.h, + * info/infokey.c: Created, for new program `infokey' which + creates a $HOME/.info file by compiling a text source file with + syntax very similar to that used by `lesskey' in less 3.4.0. + + * info/makedoc.c: Generate new file `key.c' defining an array to + map command names to codes. + + * info/key.h: Created, to define contents of new `key.c' now + created by makedoc. + + * info/info.h (INFOKEY): Define, to enable all following changes. + (set_variable_to_value)[INFOKEY]: Declare new function. + + * info/makedoc.c [INFOKEY]: Write '#define A_' numeric command + code definitions into `funs.h' to support new key binding system. + + * info/session.c (info_dispatch_on_key, info_numeric_arg_digit_loop) + [INFOKEY], + * info/infomap.c [INFOKEY], + * info/infodoc.c (function_documentation, function_name, + describe_key, pretty_keyname, pretty_keyseq_internal, + where_is_internal)[INFOKEY], + * info/terminal.h (term_kh, term_ke, term_kx, term_ki)[INFOKEY], + * info/terminal.c (term_kh, term_ke, term_kx, term_ki, + terminal_initialize_terminal)[INFOKEY], + * info/variables.c (set_variable_to_value)[INFOKEY], + * info/sample_infokey: Added infokey functionality, copied more + or less wholesale from 'lesskey' in GNU Less 3.4.0. Added a new + typedef struct FUNCTION_KEYSEQ, and a new element `keys' to + typedef struct FUNCTION_DOC, to give the user some control over + the keystrokes that appear in the documentation node generated + by get-help-window, and to improve efficiency a little. + + * info/infodoc.c (info_internal_help_text, + create_internal_info_help_node)[INFOKEY]: Rewrote all code that + assumes fixed keystrokes, replacing %10s sequences with \\%10[foo] + sequences instead. + + * doc/info-stnd.texi: Documented above changes. + +2001-09-19 <karl@gnu.org> + + * makeinfo/cmds.c: </ not /<, duh :). From janneke. + +2001-09-12 <karl@gnu.org> + + * configure.ac (AC_SYS_POSIX_TERMIOS, AC_HEADER_TIOCGWINSZ): use + these new autoconf macros instead of the old automake ones. + + * info/terminal.c: remove unconditional include of sys/ioctl.h. + * info/termdep.h: <sys/ioctl.h> [GWINSZ_IN_SYS_IOCTL]: include outside of HAVE_TERMIOS_H, + per autoconf manual. + + * doc/Makefile.am (install-info-am): remove override of automake's + target, instead enable looking in . for info files within automake. + + * doc/info-stnd.texi: include separate version-stnd.texi + * configure.ac: autoconf 2.52, and rename to configure.ac. + +2001-09-11 <karl@gnu.org> + + * doc/texinfo.txi: recommend against using - and _ in @set names, + * and rearrange that section. + + * info/infodoc.c (replace_in_documentation): free fun_name to fix + memory leak. + From: "Art Haas" <ahaas@neosoft.com>, Sat, 4 Aug 2001 08:34:31 -0500. + + * makeinfo/lang.c: encoding support for info output from kama. + * makeinfo/lang.h: encoding support for info output from kama. + + * makeinfo/html.c: include document encoding code unless + no_encoding. + * makeinfo/insertion.c (cm_direntry): don't call begin_insertion + if ignoring. + (cm_documentdescription): moved here, and likewise. + (begin_insertion): don't need output format conditionals here. + + * makeinfo/cmds.c (cm_documentdescription): move to insertion.c. + * makeinfo/makeinfo.h (enable_encoding): new global. + * makeinfo/makeinfo.c: new option --enable-encoding, rearrange help. + + Sun Oct 31 18:44:24 UTC 1999 Karl Heinz Marbaise <kama@hippo.fido.de> + + - lang.{c,h}: + o added translation map between HTML markups and 8-Bit + (ISO-8859-1 codes; supplemental is Unicode for the future). + o added cm_search_iso_map: + search for characters based on HTML markup names for + translation 8-Bit code. + o recognizing of @documentencoding improved. + now we can recognize things like ISO-8859-{1...15} + + - makeinfo.{c,h}: + o added two command line switches. + + info-encoding to activate the encoding for info output + which is correctly shown by info. Default is NOT to + encode the output to be compatible with earlier versions. + + no-encoding to suppress encoding e.g. while producing + ASCII output (--no-headers) results in that you get + "A for Ä as before. + o help output changed to document the switches. + + - html.c: + charset encoding in html based on @documentencoding. + + +2001-07-31 <karl@gnu.org> + + * doc/texinfo.txi: mention pdfcolor.tex. + * doc/texinfo.tex: doc. + * doc/Makefile.am (install-tex): install pdfcolor.tex too. + * doc/pdfcolor.tex: new file, since Kurt.Hornik@ci.tuwien.ac.at + reports that not all pdftex installations include it. + +2001-07-25 <karl@gnu.org> + + * doc/texinfo.tex (\Etitlepage): need \HEADINGSon before the + \...aftertitlepage checks to get page numbers. Report from + 3diff@gnu.org. + +2001-07-06 <karl@gnu.org> + + * doc/texinfo.txi: mention http://docbook2X.sourceforge.net/. + +2001-06-29 <karl@gnu.org> + + * makeinfo/makeinfo.c: make output to stdout imply --no-split for + HTML, too. + + * makeinfo/html.c (html_output_head): use documentdescription if set. + * makeinfo/insertion.h (insertion_type): new case documentdescription. + * makeinfo/insertion.c (begin_insertion, end_insertion, + insertion_type_names): new case for documentdescription. + * makeinfo/cmds.c (cm_documentdescription): new fn. + * makeinfo/makeinfo.h (document_description): new global. + * doc/texinfo.txi: @documentdescription. + @documentdescription implementation from patches by Will Estes. + +2001-06-26 <karl@gnu.org> + + * doc/texinfo.txi: documentdescription + * doc/texinfo.tex: Ignore @documentdescription ... @end + documentdescription. + + * doc/texinfo.txi: document sequential punctuation in @footnote is + normal, suggested by rms. + +2001-06-21 <karl@gnu.org> + + * doc/texinfo.tex (\textfonts): call \setleading here, so that we can + switch font sizes back and forth inside @tex with \globaldefs=1 + and not lose the leading. + + * doc/texinfo.txi: allow @smallbook to run without overfull or + underfull boxes. + +2001-06-19 <karl@gnu.org> + + * doc/texinfo.tex (\imagexxx): ignore new optional args to @image. + + * makeinfo/html.c (html_output_head): include <h1>title</h1> at + beginning of document. + * makeinfo/sectioning.c (cm_top): don't include explicit links in + HTML output, the regular code for @node will do it. + (sectioning_html): use <h2> for chapter instead of <h1>, etc. + * makeinfo/node.c (cm_node): do not include code to output the + HTML <head>, we do that elsewhere now. + + 1999-11-26 W. L. Estes <will@fumblers.org> + * makeinfo/insertion.c (begin_insertion): add an explicit <br> + before beginning a <pre> block. for flushleft and flushright, use + <div> tag with an align attribute set. + * makeinfo/insertion.c (end_insertion): for flushleft and + flushright, end the </div> block. + + * makeinfo/makeinfo.c (cm_image): new variable, alt_arg now allows + user-supplied alt attribute value and + ext_arg allows user-supplied extension for image files. + + * makeinfo/toc.c (contents_update_html): add anchors at chapter + level entries + (shortcontents_update_html): hrefs in shortcontents point to the + above anchors in the detailed contents + + * doc/texinfo.txi: document changes to @image and the new behavior + of shortcontents entries + +2001-06-14 <karl@gnu.org> + + * makeinfo/node.c: no need for size_t. + +2001-06-13 <karl@gnu.org> + + * texinfo.tex (\pdfmkdest): \normalturnoffactive, so refs and + defs match. + (\xrefX): pdf link defs no longer use @, so link refs shouldn't use @ + either. (All xrefs in pdf were failing.) + (\mkpgn): remove redundant second definition. + + * texinfo.tex (\smallerfonts): new font size. + (\smallexample, et al.): use it, in all cases, not just @smallbook. + + 1999-11-30 Andreas Schwab <schwab@suse.de> + * doc/texinfo.tex (\xrefX): Turn off active characters when writing + out the link name for pdf. + +2001-06-13 <karl@gnu.org> + + * doc/texinfo.txi: document that @smallexample is smaller in all + page formats now. + +2001-06-11 <karl@gnu.org> + + * 4.0c. + * util/Makefile.am: Don't need automake patch any more, with + automake 1.4p4. + + * configure.in (AC_FUNC_SETVBUF_REVERSED): only needed on + pre-sysvr3 systems that nobody has anymore? Or so Russ Allbery + informs me ... + +2001-06-08 <karl@gnu.org> + + * makeinfo/Makefile.am (EXTRA_DIST): include texinfo.{dtd,xsl}. + + * util/Makefile.am: automake-1.4p3 now. + +2001-06-07 <karl@gnu.org> + + * util/texi2dvi: comment out conditional text, from Werner LEMBERG + <wl@gnu.org>. + + 2001-06-02 Eli Zaretskii <eliz@is.elta.co.il> + * info/echo-area.c (info_read_completing_internal): If there are + no completions, say that instead of "Not complete". + + * configure.in (ALL_LINGUAS): add da + + * makeinfo/Makefile.am (pkgdata_DATA): include texinfo.xsl. + + * configure.in: update for autoconf 2.50. + +2001-06-04 <karl@gnu.org> + + * util/Makefile.am (EXTRA_DIST): automake-14p2.patch now. + * util/automake-14p2.patch: rename from 14p1. + +2001-05-22 <karl@gnu.org> + + * changes from feloy for lowercase xml names, etc. + +2001-05-21 <karl@gnu.org> + + * util/Makefile.am (EXTRA_DIST): add automake-14p1.patch. + * makeinfo/Makefile.am (pkgdata_DATA): define to install + texinfo.dtd. + + 2001-05-17 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/makeinfo.c (cm_xref, cm_inforef): Don't allow empty + first arguments in cross references. + + * makeinfo/makeinfo.c: redo --help, basic patch from ke@suse.de. + +2001-05-03 <karl@gnu.org> + + * doc/info.texi: move help-cross to be subnode of cross-refs, + instead dangling out in space. + * doc/info.texi: update from eli + +2001-05-02 <karl@gnu.org> + + * makeinfo/xml.c (xml_push_current_element): need to select the + `name' member. + +2001-05-01 <karl@gnu.org> + + * configure.in: 4.0b + + * doc/info.texi (Help-Cross): subsection of Cross-refs. + + * lib/system.h (va_alist, etc.): moved from makeinfo.c. + * makeinfo/makeinfo.c (va_alist, etc.): move to system.h + + * makeinfo/xml.[ch]: new files from Philippe Martin <feloy@free.fr>. + * pretty much all files also modified for XML/DocBook output. + * doc/texinfo.txi: minimally mention --xml and --docbook. + * makeinfo/xml.c: convert to K&R until we can do ansi2knr. + + * util/texindex.c, + * util/install-info.c, + * info/info.c: it's 2001. + +2001-04-15 <karl@gnu.org> + + * doc/info.texi: major update from eli. + +2001-04-13 <karl@gnu.org> + + 1999-10-16 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/node.c (cm_node): Don't generate cross-references to + "(DIR)". + * makeinfo/html.c (add_link): Likewise. + + 1999-10-16 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/makeinfo.c (insert): Don't call html_output_head here. + (add_char): Call html_output_head here... + * makeinfo/cmds.c (cm_sp): ...and here... + * makeinfo/toc.c (cm_contents, cm_shortcontents): ...and here... + * makeinfo/node.c (cm_anchor): ...and here. + + * makeinfo/html.c (html_output_head): `free' html_title if + expanded. Make <head> and <body> stand out. + +2001-04-12 <karl@gnu.org> + + 1999-12-26 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/defun.c (defun_internal): Use execute_string instead + add_word_args to expand defined_name, type_name and category (in + HTML mode). + +2001-03-29 <karl@gnu.org> + + * Makefile.am: simple license. + +2001-02-27 <karl@gnu.org> + + 1999-12-17 Yoshiki Hayashi <t90553@mail.ecc.u-tokyo.ac.jp> + * info/terminal.h, info/terminal.c (term_kh, term_ke, term_kD): + New variables to hold Home, End, Delete key sequences. + * info/infomap.c (initialize_emacs_like_keymaps, + initialize_vi_like_keymaps): Set them. + + * makeinfo/makeinfo.h, + * makeinfo/makeinfo.c: --split-size option from Yoshiki: + 1999-12-09 Yoshiki Hayashi <t90553@mail.ecc.u-tokyo.ac.jp> + * makeinfo/makeinfo.h (split_size): New option. + * makeinfo/makeinfo.c (long_options): Add split_size. + (usage): Ditto. Suggested by Richard Y. Kim. + + * util/texi2dvi: -o support from Akim. + +2001-02-02 <karl@gnu.org> + + * dir-example: don't need zsh twice. + + From: Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 02 Apr 2000. + * doc/texinfo.txi: capitalization fixes. + * doc/info.texi: up pointer fixes. + * doc/texinfo.txi: installing an info file. + + * makeinfo/makeinfo.c: --output is for split html, not non-split. + From: Karl Eichwalder <keichwa@gmx.net> + +2001-01-12 <karl@gnu.org> + + 1999-10-15 Eli Zaretskii <eliz@is.elta.co.il> + * makeinfo/cmds.c (cm_sc): Don't print the warning about + all-uppercase argument in menus under --no-headers. + + * makeinfo/files.c: pass O_BINARY flag to open, suggested by bfox. + +2001-01-11 <karl@gnu.org> + + * info/terminal.c [HAVE_TERMIOS_H && TCOON]: tcflow TCOOFF/TCCON + to resume output if user presses CTRL-S at the beginning of + things. + [HAVE_TERMIO_H && TCXONC]: ditto. + From Kevin Ryde <user42@zip.com.au>, 16jun2000; + cf. emacs/src/sysdep.c. + +2001-01-08 <karl@gnu.org> + + * makeinfo/cmds.c: afivepaper, afourwide, afourlatex. + * doc/texinfo.txi: afivepaper + +2001-01-05 <karl@gnu.org> + + * doc/info.texi: typo from: Martin Buchholz <martin@xemacs.org>. + * doc/info.texi: typo fixes from meyering. + +2001-01-02 <karl@gnu.org> + + * makeinfo/makeinfo.c (remember_brace_1): don't assume command is + non-null, an (erroneous) input line like \hbox to7in{ passes in a + null. + + * makeinfo/toc.c: fix from jan + * makeinfo/html.c: fix from jan for top-level references. + +2000-12-22 <karl@gnu.org> + + * makeinfo/makeinfo.c: --help changes. + * doc/texinfo.txi: -o means the directory name for HTML output. + +2000-12-21 <karl@gnu.org> + + * doc/texinfo.txi: switch to fdl + + * makeinfo/html.c: doc fix. + * makeinfo/insertion.c: no space after _ I guess. + * makeinfo/cmds.c: no space after _ I guess. + + * makeinfo/html.c (nodename_to_filename_1): fix up external + * top-node references. + +2000-12-20 <karl@gnu.org> + +* HTML table patch from Jan: + 2000-12-19 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/multi.c (multitable_item), + (cm_tab): close html table columns. Also, align cell contents to + top, which is probably the most sensible thing to do for text. + + +2000-12-19 <karl@gnu.org> + + * makeinfo/makeinfo.c (insert_toplevel_subdirectory): try + name.html if just name doesn't work. + + * doc/texinfo.txi: document html output in .html directory + sometimes. + + * util/Makefile.am (EXTRA_DIST): add install-info-html. + + * util/texindex.c: 2000 + * util/install-info.c: 2000 + * info/info.c: 2000 + * configure.in: 4.0a + + * lib/system.h: include limits.h + + * Applied HTML splitting changes from Jan: + 2000-11-10 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo: removed code for numbered split HTML output, removed + SPLIT_JCN conditional. + + 2000-11-09 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/html.c: prepared nodifying filename functions for + linking not non-spit HTML documents, by adding ``#anchor'' to + external refernces. + + * doc/texinfo.txi (Installing HTML info): updated doco for --html + option, added node Installing HTML info. + + * util/install-info-html.in: new script. The bare minimum + required for generating HTML index. + + * lib/system.h: compilation fix. + + 2000-11-08 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/makeinfo.c (convert_from_loaded_file): [SPLIT_JCN]: + overloaded already way too hairy function with logic to put split + html output into subdirectory with basename of toplevel output + file. + + * makeinfo/html.c (fix_filename): new function. + + 2000-11-07 Jan Nieuwenhuizen <janneke@gnu.org> + + * toc.c (toc_add_entry): + (contents_update_html): + (shortcontents_update_html): [SPLIT_JCN]: use hrefs for nodename based + html files. + + * node.c (cm_node): [SPLIT_JCN]: create html filename based on + nodename (instead of a numbered node<num>.html filename). + + * makeinfo/makeinfo.c (main): [SPLIT_JCN]: enable splitting of + html output. + + * makeinfo/html.c + (add_url_name,add_nodename_to_filename,nodename_to_filename): new + functions. + +2000-12-15 <karl@gnu.org> + + * configure.in (AC_CHECK_HEADERS): add limits.h explicitly. + +2000-11-10 <karl@gnu.org> + + * dir-example: update + * info/nodes.c: doc fixes, etc. + + * incorporated verbatim patch from janneke: + 2000-04-14 <janneke@gnu.org> + + * applied texinfo-3.12s.jcn4 patch + + 1999-09-02 <janneke@gnu.org> + + * makeinfo/cmds.c, + * makeinfo/insertion.c: @verbatiminclude file + * doc/texinfo.tex: @verbatiminclude file + * doc/texinfo.txi: @vebatiminclude file doco + * NEWS: added @verbatiminclude to Language section + + 1999-09-01 <janneke@gnu.org> + + * makeinfo/makeinfo.c: bf: @exdent (urg6.texi) -- Rolled into 4.0 + * NEWS: added verb* to Language section + * doc/texinfo.txi: @verb, @verbatim doco + * doc/texinfo.tex: tricky tex-fix for @verb{<char>..<char>} + * doc/texinfo.tex: real tab expansion for @verbatim mode + * doc/texinfo.tex: proper start of environment, no indentation + + 1999-08-31 <janneke@gnu.org> + + * makeinfo/cmds.c: + * makeinfo/insertion.{c,h}, + * makeinfo/makeinfo.{c,h}: redo of @verbatim, @verb{<char>..<char>} + * doc/texinfo.tex: fixed @verb{<char>..<char>} + + 1999-08-30 Jan Nieuwenhuizen <janneke@gnu.org> + + * makeinfo/cmds.c, + * makeinfo/insertion.{c,h}, + * makeinfo/makeinfo.{c,h}: added @verbatim (and preliminary @verb) + support + * doc/texinfo.tex: added @verbatim (and preliminary @verb) support + + 1999-08-24 Jan Nieuwenhuizen <janneke@gnu.org> + + * bf: empty node: makeinfo/node.c:cm_node () -- Rolled into 4.0 + + +2000-10-18 <karl@gnu.org> + + * doc/info.texi: eli update + +2000-09-22 <karl@gnu.org> + + * makeinfo/defun.c: warn if non-whitespace follows @defun'd name + (suggestion from Akim). + + Installed some patches: + + 2000-08-04 Paul Eggert <eggert@twinsun.com> + * makeinfo/multi.c (find_template_width): + Don't access before start of *PARAMS. + + 2000-08-21 Eli Zaretskii <eliz@is.elta.co.il> + * info/filesys.c (info_file_in_path): Reject FILENAME if it is + empty, or ".", or "..". + + 2000-08-23 Eli Zaretskii <eliz@is.elta.co.il> + * info/session.c (info_menu_or_ref_item): If the user have chosen + menu item or xref that's identical to defentry's label, use + defentry instead of looking for its label. Otherwise, select the + entry whose position is the closest to the window's point, in + case there's more than a single entry with that label. + +2000-09-12 <karl@gnu.org> + + * doc/texinfo.txi: it's 2000 now. + * doc/texinfo.txi: document the only real (and rare) reason for not using implicit pointer + creation. + +2000-09-06 <karl@gnu.org> + + * configure.in: test all termcap variables for existence. From + andy@rz.uni-karlsruhe.de. + + * configure.in (ALL_LINGUAS): include ja. + * lib/system.h [HAVE_IO_H]: make #include <io.h> conditional for + BeOS. Reported by Dan Moore, dan@moore.cx. + * configure.in (AC_CHECK_HEADERS): add io.h. + +2000-06-05 <karl@gnu.org> + + * doc/texinfo.txi: forgot to escape {}. + +2000-05-30 <karl@gnu.org> + + * info/filesys.c (is_dir_name): check all info suffixes as well as + the compression suffixes. Fixes segmentation fault on a dir.info + file ending after the * Menu. + +2000-05-28 <karl@gnu.org> + + * doc/texinfo.txi: Forgot {arg} in @rmacro example. From Olaf B. + +2000-05-27 <karl@gnu.org> + + * doc/txi-cs.tex: update from: Stepan Kasal <kasal@suse.cz>. + + * doc/Makefile.am (install-data-local): reformat warning per + François to hopefully make it more noticeable. + + 2000-02-08 Eli Zaretskii <eliz@is.elta.co.il> + * info/session.c (incremental_search): Don't retain RET when + exiting isearch. Suggested by Hrvoje Niksic <hniksic@iskon.hr>. + +2000-05-22 <karl@gnu.org> + + * doc/texinfo.txi: pageparams -> pagesizes + +2000-05-18 <karl@gnu.org> + + * makeinfo/lang.c (cm_accent_tilde): need N in list. + From: kama@hippo.fido.de (Karl Heinz Marbaise) + + * makeinfo/files.c (find_and_load): read only the number of bytes + available in the buffer. Also, remove one-byte-at-a-time reading + in the WIN32 case. + From: "J. David Bryan" <dbryan@bcpl.net> + + * info/man.c: use eli's patch after all, we re-increment j at the + top of the loop. + +2000-05-16 <karl@gnu.org> + + * info/man.c (clean_manpage): don't write before the beginning of + newpage. + (based on patch from Eli). + +2000-02-03 <karl@gnu.org> + + * doc/texinfo.txi: remove spurious space. from kaja. + +1999-10-12 Karl Berry <karl@gnu.org> + + * doc/Makefile.am (install-tex): install all txi-?? files. + +1999-10-01 W. L. Estes <will@fumblers.org> + + * makeinfo/cmds.c: dont treat @center as separate paragraph, + use div element to output center + +1999-09-29 Eli Zaretskii <eliz@is.elta.co.il> + + * djgpp/README: Say `dir-example', not DIR. + + * lib/system.h (DEFAULT_INFOPATH) [__DJGPP__]: Define. + +1999-09-28 Karl Berry <karl@gnu.org> * configure.in, util/texi2dvi: version 4.0. + * doc/texinfo.txi: New isbn. 1999-09-24 Karl Berry <karl@gnu.org> @@ -6634,3 +8285,2531 @@ Sun Jun 26 18:46:16 1988 Richard Stallman (rms at sugar-bombs.ai.mit.edu) * util/texindex.c (sort_in_core, sort_offline, parsefile): Give up on input file if any line doesn't start with backslash. + +/* changelog for texinfo.tex before 19jun01. */ + +2001-05-24 <karl@gnu.org> + + * texinfo.tex (\smallbreak, \medbreak, \bigbreak): add check for + \ifnum\lastpenalty to plain tex definitions, so that we won't + insert space right after a section title. + (\aboveenvbreak): similar check of \lastpenalty. + +2001-05-21 <karl@gnu.org> + + * texinfo.tex (\pdfurl): \let\value=\expandablevalue, so at least + some cases can be properly handled. + +2001-03-28 <karl@gnu.org> + + * texinfo.tex: Copyright. + + * texinfo.tex (\pdfmkdest): remove trailing @ in target names; + suggestion from: Reiner Schlotte <R.Schlotte@science-computing.de>. + (\imagexxx): call \normalturnoffactive so _ (among others) will be + allowed in filenames; report from arnold@skeeve.com. + +2001-02-02 <karl@gnu.org> + + * texinfo.tex (\secondary): handle pdf case. + (\dosubind): secondary index entry not written as separate arg for + texindex. + From: Trevin Beattie <trevin@eyring.com> + Date: Tue, 21 Mar 2000 13:04:06 -0700 + +2001-01-12 <karl@gnu.org> + + * texinfo.tex (\dopdfimage): different syntax for filename + inclusion (foo vs {foo}). From: <Kurt.Hornik@ci.tuwien.ac.at>, + 22dec99. + +2001-01-08 <karl@gnu.org> + + * texinfo.tex (\afivepaper): new command from Jose Romildo + Malaquias <romildo@urano.iceb.ufop.br>. + +2000-12-12 <karl@gnu.org> + + * texinfo.tex: oops, had outside page reversed. + +2000-12-11 <karl@gnu.org> + + * texinfo.tex (\inmargin): allow lefttext and righttext as args. + +2000-11-10 <karl@gnu.org> + + * texinfo.tex: implementation of new commands @verbatim, @verb, + and @verbatiminclude from janneke@gnu.org. + +2000-11-09 <karl@gnu.org> + + * texinfo.tex (\inmargin): rewrite to allow for placing the + material either in the right or left margin. + +2000-10-27 <karl@gnu.org> + + * texinfo.tex (\dosynindex): new macro subroutine, do not + \closeout twice the index being redirected. + (\synindex, \syncodeindex): call it. + +2000-10-18 <karl@gnu.org> + + * texinfo.tex (\inmargin): rewrite to allow argument to be vmode + material, such as a box from an image. + +2000-09-06 <karl@gnu.org> + + * texinfo.tex (\doublecolumnout): must subtract \ht\partialpage + here, not in \begindoublecolumns. Otherwise the \partialpage on + the first page of double columns affects every subsequent page, + e.g., if @setchapternewpage off. Reported by Aharon Robbins + <arnold@skeeve.com> for standards.texi. + +2000-05-28 <karl@gnu.org> + + * texinfo.tex (\linkcolor): replace Cyan with Blue. + (\output): do \pdfmkdest at top. + (\pdfmakeoutlines): set \_ to \normalunderscore. + From: Trevin Beattie <trevin@eyring.com>. + +2000-05-27 <karl@gnu.org> + + * texinfo.tex (\today): only define if undefined. + From: Stepan Kasal <kasal@suse.cz>. + +2000-05-16 <karl@gnu.org> + + * texinfo.tex (\deftypeivarheader): need defheaderxcond. From: + Marcel van der Boom <marcel@hsdev.com>. + +1999-10-01 Karl Berry <karl@gnu.org> + + * texinfo.tex (\afourwide): had hsize and vsize reversed. + From: Pascal Obry <pascal_obry@csi.com> + +1999-09-25 Karl Berry <karl@gnu.org> + + * texinfo.tex (\alias): fix from Andreas. + +1999-09-19 Karl Berry <karl@gnu.org> + + * texinfo.tex (\key): rename the \smallrm and \smallsy here. + + * texinfo.tex (\indexfonts): rename to \smallfonts, along with + \indrm, etc. + Define all the fonts, too. + (\footnotezzz): use \smallfonts. + + * texinfo.tex (\needx): get better leading; do nothing if @need + value is less than one linespace. From Arnold. + (\douref, \xrefX, \doemail [pdf]): make spaces normal again, so our + \ignorespaces commands are effective even in an @display. + + * texinfo.tex (\finishtitlepage): remove FINISH TITLE debugging + message. + + * texinfo.tex (\anchor): rewrite to always \ignorespaces. + Bug from esken. + + * texinfo.tex (\indexnofonts): dummy up \acronym. + From: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de> + +1999-09-06 Karl Berry <karl@gnu.org> + + * texinfo.tex (\texinfoversion): update. + + * texinfo.tex: Avoid multiparagraph cells losing linespace between + paragraphs. From: Andreas Schwab <schwab@suse.de>. + Bug from: Lalo Martins <lalo@webcom.com>. + +1999-08-19 Karl Berry <karl@gnu.org> + + * texinfo.tex (\shortchaplabel): move computation of width of + "Appendix" inside, in case it's been changed by a language. + +Mon Aug 9 16:31:55 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: pdf updates from Han. + +Fri Aug 6 13:48:22 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\charcode): remove unused counter. + From: Akira KAKUTO <kakuto@fsci.fuk.kindai.ac.jp>. + +Thu Jul 22 19:08:19 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Update from Han. + +Tue Jul 20 17:13:16 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: More pdf improvements from Han. + +Mon Jul 19 16:33:31 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Better pdf support from: Han The Thanh + <thanh@informatics.muni.cz>. + +Sun Jul 18 14:21:03 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: pdfimage takes braces. + +Tue Jul 6 19:40:14 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\deftypeop): New command. + +Mon Jul 5 17:17:33 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\contents): call \pdfmakeoutlines here instead of + inline (!). + (\pdfmakeoutlines): call \indexnofonts instead of making a separate + attempt at it. + +Tue May 25 06:16:06 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (time-stamp-format): use %02H. + + * texinfo.tex: Had PDF and DVI transposed. + +Sun Apr 25 15:30:00 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\appendixletter): restore \the, necessary for .toc. + +Thu Apr 22 19:22:12 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\emergencystretch): Increase to .15\hsize. + +Tue Apr 20 05:11:04 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\defunargs): use \tensl\hyphenchar\font to work + better with Gildea's PostScript version. + + * texinfo.tex (\tab): Change back to just &. + From: Nathan Sidwell <nathan@acm.org>. + + * texinfo.tex: No \fi. + +Mon Apr 19 17:38:54 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\pdflink) [!\ifpdf]: define to ignore arg. + + * texinfo.tex: Add pdf support. Merge from: Kurt Hornik + <Kurt.Hornik@ci.tuwien.ac.at>. + +Wed Mar 31 13:24:16 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\defopheader): missing word space before `on'. + Report from: Chris Hanson <cph@martigny.ai.mit.edu>. + +Fri Mar 26 17:00:41 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\imagexxx): Equalize space above and below if in + vmode. From rms. + +Thu Mar 25 20:00:00 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\deftypeivar): new command. + +Tue Mar 23 17:53:37 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (&): be sure active & is defined for @deftypefn + operator&. + Report from: Nathan Sidwell <nathan@acm.org>. + +Sat Mar 20 12:31:53 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\exampleindent): new command. From Yoshiki. + + * texinfo.tex: Changes from Andreas to use \sl\$ inside italics + and to avoid extra spaces around @anchor. + + * texinfo.tex (\image, \imagexx): move pdf test to imagexxx for + correct filename parsing. + +Mon Mar 15 16:51:20 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\imagexxx): reset catcode ^^M in case we're inside + in an example. Report from kama. + + * texinfo.tex (\putwordin): new macro for word `in'. + (\xrefX): use it. + Report from: "Alexey A. Nikiforov" <A.A.Nikiforov@inp.nsk.su> + +Sun Feb 21 16:47:28 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Expand tabs. + +Sun Feb 14 16:02:29 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\paragraphindent): implement. + Suggestion from: Paul DuBois <dubois@primate.wisc.edu>. + +Tue Feb 9 07:25:07 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\alias): use def rather than \let. + Change timestamp format to include hours. + + * texinfo.tex: New commands @alias and @definfoenclose. + From: "Eric S. Raymond" <esr@snark.thyrsus.com>. + +Mon Feb 8 14:46:56 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\scanmacro): Use \endinput to avoid spurious space, + and various other space fixes. From: Andreas Schwab + <schwab@ls5.informatik.uni-dortmund.de>. + +Thu Feb 4 15:24:40 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\uref): implement optional third arg. + + * texinfo.tex (\dosubind): Include index entry in third arg to + \entry instead of writing as bogus fourth arg. + Report from: kama@hippo.fido.de (Karl Heinz Marbaise). + + * texinfo.tex (\setemergencystretch): Increase somewhat. + + * texinfo.tex (\putwordof): rename from \putwordOf. + * texinfo.tex (defivarhead, \defcvarheader): Use \putwordof. + +Tue Feb 2 16:57:00 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\documentlanguage, \documentencoding): new + commands. \documentlanguage based on an implementation by kama. + +Sat Jan 30 17:23:45 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\putwordMMai): Should be MMay. From Trond. + +Fri Jan 29 17:52:16 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Fix @macro expansion inside @section. Patch from + Andreas: + + From: Andreas Schwab <schwab@ls5.informatik.uni-dortmund.de> + + The general idea is to construct a list a all defined macros in + the form \do\macro1\do\macro2..., then temporarily define + \do to something appropriate and execute the list to do + whatever is needed. Here is a patch, and i have also + fixed a few other bugs that i found while browsing through + the @macro implementation. Additionally i have added a + check to prevent the user from doing silly things like + @macro shipout. + +Sun Jan 24 09:59:42 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\obstexwarn): Don't use *** in message, it + interferes with make output parsing. + +Thu Jan 21 15:45:20 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex: Internationalization improvements from kama. + +Wed Jan 20 17:12:52 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\contents, \shortcontents): Run \contentspagealignmacro. + From: Trond Endrestol <trond@agamemnon.gtf.ol.no> + +Thu Jan 14 16:53:43 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\begindoublecolumns): Ship out \partialpage + immediately if it is nonvoid, instead of saving it. This avoids a + bug where the index could end up printing one line per page (see + the indexspread.tex test). + From: Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * texinfo.tex (\image): If running pdftex, do \pdfimage{imagefile.pdf}. + From: Samuel Tardieu <sam@inf.enst.fr> + + Also, update copyright year. + +Tue Jan 5 17:50:45 1999 Karl Berry <karl@gnu.org> + + * texinfo.tex (\enddoublecolumns): Move \pagegoal reset to after + the \endgroup so we get the restored single-column \vsize + as intended. + +Sun Dec 20 17:57:22 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\indexdummies): Set \{ and \} to \mylbrace and + \mybrace to avoid braces in the index file, which + texindex can't handle. + +Sat Dec 19 18:13:16 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\pickupwholefraction): Ignore whole-number part. + (\setuptable): Always pass whole-number part and decimal point. This + allows leading zeroes. + Suggestion from: Ben Bullock <ben@hayamasa.demon.co.uk>. + Date: Fri, 21 Aug 1998 14:06:50 +0100 (BST) + +Tue Dec 15 16:38:07 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\indexdummies): set \{ and \} to \lbracecmd and + \rbracecmd to avoid lossage if @tex is active during \shipout. + Report from: "Peter Kabal" <Kabal@ece.mcgill.ca>. + +Sun Dec 6 17:11:17 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex: Doc fix. + +1998-11-11 Andreas Schwab <schwab@issan.cs.uni-dortmund.de> + + * doc/texinfo.tex (\onepageout): Put the cropmarks in vboxes of + zero height so that they don't contribute space themselves. + Compensate for \topandbottommargin. + (\internalpagesizes): Advance \outervsize by 2\topandbottommargin, + not only 0.6in. + +Fri Nov 6 17:27:57 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex: Use standard time-stamp.el package instead of + update-date.el. + +Sat Oct 31 19:23:02 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\indexnofonts,\indexdummies): add \url and \uref to + list. + +Fri Oct 30 08:16:23 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (\expandablevalue): Delete spurious `v' character. + +Tue Oct 27 11:18:40 1998 Karl Berry <karl@gnu.org> + + * texinfo.tex (@env, @command, @option): Must disable for index + and xref commands. Also, \input plain if necessary before + using {} in the version number. + +Wed Sep 30 11:40:36 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Use date as version number instead of RCS, and + update-date to update it. + +Thu Sep 17 13:22:44 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Fix @macro expansion of @code with _ in the + argument. + From: Zack Weinberg <zack@rabi.columbia.edu>. + +Fri Aug 28 10:30:29 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\itemzzz): take \itemmargin into account when + unhboxing. Reported by Bob. + +Fri Aug 14 16:56:58 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Change @defun environments so that right margin is + not changed, and instead the defun type label is outdented + into the margin. + +Thu Aug 13 13:31:41 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\smartslanted): define this separately from + \smartitalic. + (\emph, \i): use \smartitalic for true italics. + +Mon Aug 10 11:51:13 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\value): handle active _ or - in argument (happens + if called from @code). + Report from: Dave Love <d.love@dl.ac.uk>. + +Sun Jul 19 09:49:23 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\dosubind): Don't do \vskip to preserve \lastskip + unless we are in vertical mode. Otherwise we might end a + paragraph prematurely, and \folio won't get expanded by + \output. + Report from: "Richard E. Stone" <res@rstone.mn.org> + +Thu Jul 16 15:33:37 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Keep track of how negative the page numbers have + gotten: + (\lastnegativepageno): New \count register. + (\startcontents): Use it. + (\contents, \summarycontents): set it. + +Mon Jul 13 16:58:11 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\imagexxx): Add some space around the image if it's + by itself. + +1998-07-09 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * texinfo.tex (chapterzzz): Put a space before the chapter number + in the message. + (appendixzzz): Use \putwordAppendix in the message. + +Thu Jul 9 08:39:53 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\macro): Globalize assignments since it's done + inside a group. From Zack. + +Mon Jul 6 17:21:25 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\comment): Speed up. + (\loggingall): Turn on eTeX's extended tracing. + More macro fixes. + Date: Sat, 04 Jul 1998 14:51:49 -0400 + From: Zack Weinberg <zack@rabi.phys.columbia.edu> + +Thu Jul 2 10:20:32 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\contents, \summarycontents, \startcontents): Use + roman numerals for toc, arabic outside, even when toc is + at the beginning. + +Mon Jun 29 10:05:28 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\anchor): New command @anchor. + (\xrefX): Avoid double space when xref to an @anchor or an @unnumbered. + + * texinfo.tex (\itemzzz): Use kerns and \unhbox when item text + fits in the space, so footnotes can work. + + * texinfo.tex (\setref): Take additional argument for the -snt + xref. Call \indexdummies. + (\donoderef, \appendixnoderef, \unnumbnoderef): Change \setref calls. + +Sat Jun 27 19:16:34 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\contents, \summarycontents): Must not be \outer. + +Fri Jun 26 16:15:14 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\writetocentry): New macro. + (\chapternofonts): No longer needed. + (\chapter, ..., \unnumberedsubsubsec): Change all the sectioning + commands to call \writetocentry instead of doing it inline. + Also, do not call \chapternofonts, we avoid expansion with + \the\toks instead. + (\opencontents): No longer needed, instead \writetocentry opens + the file when necessary. + (\setfilename): Don't call \opencontents. + (\ifsetcontentsaftertitlepage, \ifsetshortcontentsaftertitlepage): + New conditionals. + (\Etitlepage): Call \contents and/or \shortcontents if + conditionals are set. + + Global: use \nobreak instead of \penalty 10000 for epsilon efficiency. + +Thu Jun 25 08:29:32 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\option,\env,\command): New markup commands. + Suggested by arnold@gnu.org. + + * texinfo.tex (\afourpaper): More reasonable margins. + From: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de> + Date: Thu, 25 Jun 1998 10:48:13 +0200 (MET DST) + +Wed Jun 24 17:46:43 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\acronym): New Texinfo command. + +Tue Jun 23 17:36:39 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\dots, \enddots): Missing \leavevmode. + Report from: Thomas Esken <esken@nmlab.informatik.fh-dortmund.de> + Date: Tue, 23 Jun 1998 14:22:27 +0200 (MET DST) + +Mon Jun 22 16:00:53 1998 Karl Berry <karl@north> + + * texinfo.tex: Rewrite of index stuff to do better column breaking + and balancing. + The old code failed miserably when the index was just the wrong size, + e.g., the Autoconf manual with @afourpaper. + Bug report from: Wilhelm Mueller <muewi@hb.senbvs43.uni-bremen.de> + Date: Fri, 12 Jun 1998 16:34:49 +0200 (MET DST) + (\initial): Add more glue around the initial, and make it a + multiple of \baselineskip. + (\entry): Add glue before each entry so the columns can always be the + same height. + (\doublecolumnout): Available space no longer needs to handle + \partialpage specially. + (\pagesofar): Take \ht\partialpage into account with \vsize. + (\enddoublecolumns): Reset \output to avoid calling + \balancecolumns twice + (\balancecolumns): Format for readability. + (\initialskipamount): No longer needed, remove. + + (\hbadness): Increase a bit, boxes that are a little underfull look ok. + +Sun Jun 21 16:48:38 1998 Karl Berry <karl@north> + + * texinfo.tex (\ninettsl): cmsltt10 is not standard, so use + cmsltt10 scaled 900. + Date: Mon, 15 Jun 1998 12:35:41 +0200 (MET DST) + From: Werner Struckmann <struck@ips.cs.tu-bs.de>. + +Thu Jun 18 08:32:15 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: @macro fixes from Zack Weinberg + <zack@rabi.phys.columbia.edu>. + - @ifblah did not work inside @macro + - spaces in parameter lists in macro definitions caused errors + - leading spaces in parameter lists in macro invocations were + preserved inappropriately. + +Wed Jun 10 16:50:53 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\smallformatx, \smalldisplayx): New macros. + (\smallbook): Arrange to use them. + (\display, \flushleft, etc.): Rewrite to avoid duplication. + +Sun Jun 7 18:13:45 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\pagesizes): Rename to \internalpagesizes. + (\custompaper): Rename to \pagesizes. + +Sat Jun 6 13:16:32 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Rewrite paper size definitions, add @custompaper. + + * texinfo.tex: Fix for macros in arguments to other commands. + From Zack. + +Thu Jun 4 11:21:07 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Better @macro implementation. + From: Zack Weinberg <zack@rabi.phys.columbia.edu>. + +Tue May 26 17:43:21 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\imagexxx): Center image if it is not part of a + paragraph. + +Tue May 19 17:17:12 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: \linkstrue by default. + Also, first implementation of @macro; can only handle some cases, + but that is better than nothing. + From: Zack Weinberg <zack@rabi.phys.columbia.edu> + +Thu May 14 17:32:47 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: New command @novalidate along the lines of makeinfo + --no-validate. + Date: Sun, 26 Oct 1997 18:54:47 -0500 + From: Zack Weinberg <zack@rabi.phys.columbia.edu> + +Tue May 12 16:19:35 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\valuexxx): Split up into expandable and + non-expandable parts. + (\expandablevalue): New macro. + (\indexdummies): \let\value = \expandable value. + + * texinfo.tex: Doc fixes. + + * texinfo.tex (\doind): Just call \dosubind with empty third arg. + (\dosubind): Replace with \doind definition and suitable code to handle + possible third arg. And propagate glue past the whatsit from the + \write so index entries don't cause extra space between + @defuns (for example). + +Wed May 6 12:51:27 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\deftypemethparsebody): Handle the extra arg in + @deftypemethodx, too. + (\deftypefunx): Error definition was misspelled as \deftypeunx. + +Fri May 1 17:31:58 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo/texinfo.tex (\putwordon, \putwordMethodon): New macros. + Use in \def... commands. + (\indexdummies): make `\ ' be just ` ' for sorting. + (\deftypemethparsebody): New macro. + (\defmethod): Call it. + Various doc fixes. + Repored by: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise) + Date: Wed, 07 Jan 1998 10:19:42 +0100 + +Fri Apr 10 16:54:48 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: @cartouche: Align right side correctly. + From: dale.smith@bellhow.com (Dale Smith) + Date: Fri, 06 Mar 1998 14:47:02 GMT + +Sun Apr 5 17:19:03 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\dosetq): Use \normalturnoffactive instead of just + \turnoffactive, so \'s in node names are handled properly. + (\tie): Move definition to more rational position in the file. + (\@, \{, etc.): Use decimal numbers in all cases, to avoid use of '. + Paranoia only. + (\+): Turn off once and for all at the beginning, and define as + \tabalign in @tex. + +Tue Mar 31 19:33:31 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\synindex, \syncodeindex): \closeout the redirected + index. + From: Jakob Stoklund Olesen <stoklund@mi.aau.dk> + + * texinfo.tex (\doignore): Ignore everything after `c', so @end + ifinfo and the like can be commented out. + (\macrocsname): New macro. + Reported by: "James A. Lupo" <lupoja@feynman.ml.wpafb.af.mil> + +Wed Feb 25 15:48:51 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\doprintindex): Change catcode of @ before \read, + in case of \initial{@} being the line that is read. + Reported by: Drew Csillag <drew_csillag@geocities.com> + + * texinfo.tex (\dotable): Add \leftskip to \hsize in the first column. + Don't inherit \rightskip from surrounding environment. + Set \item to \crcr to avoid empty first row. + Prepend \parskip glue before table. + Set \everycr locally outside of alignment, don't reset it + explicitly in \Emultitable. + All from Andreas Schwab, to avoid overfull hboxes. + + Also, work on leading commentary in file a bit. + +Tue Feb 24 17:48:29 1998 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: \!: Save and restore this for @tex. + From: Jean-Pierre Moreau <jpmoreau@ciframedical.com> + Date: Fri, 22 Aug 1997 16:47:36 -0400 + + * texinfo.tex (\angleleft, \angleright): New macros. + (\refx, \email, \key): Use them. + From: Stephen Gildea <gildea@intouchsys.com> + Date: Fri, 26 Dec 1997 11:43:32 EST + +Mon Feb 23 17:34:23 1998 Karl Berry <karl@cs.umb.edu> + + 1997-08-28 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + * doc/texinfo.tex (xrdef): Read the second argument with \ + as an escape character. + +1998-01-22 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> + + * texinfo.tex (\tocentry): Don't \turnoffactive before typesetting + the arguments, it causes special characters to be printed + incorrectly. + +Mon Jan 19 10:58:25 1998 Karl Berry <karl@cs.umb.edu> + + * texi2html: Correct version number, home page reference. + +Sat Jan 17 15:12:03 1998 Karl Berry <karl@cs.umb.edu> + + * texi2html: Version 1.54. Handle @image better, etc. + * From: Bob Friesenhahn <bfriesen@simple.dallas.tx.us>. + +Wed Dec 24 13:59:07 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\dots, \enddots): Use current font instead of + always using math italic. From Stephen Gildea. + +Tue Dec 23 11:33:07 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: Spurious xepsf.tex should be epsf.tex. + +Mon Oct 13 15:49:28 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\titlefont): Explicitly set \rm. + +Sat Jul 26 15:12:37 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\email): Let to \uref instead of \code, as a second + optional argument makes sense for this, too. + +Mon Jul 14 13:43:43 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\indexdummies): Add \value. + +Thu Jul 10 13:34:30 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\authorrm): Must use \def instead of \let, as + \secrm is not yet defined. + +1997-07-09 Richard Stallman <rms@psilocin.gnu.ai.mit.edu> + + * texinfo.tex (\titlefont): Define again, using \titlefonts. + +Wed Jul 9 16:45:30 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\startcontents): Leave ^ catcode as other. + +Sat Jul 5 17:16:40 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\titlefonts): New macro to set title font styles, + so italic etc. work in @title. + (\titlefont): No longer needed. + (\titlepage): Call \titlefonts instead of \titlefont. + (\chapsf, \ssecsy, \ssecttsl): Correct magstep values. + From: Stephen Gildea <gildea@intouchsys.com>. + + * texinfo.tex (\onepageout): Back up to 2\baselineskip per Stephen. + (\kbdinputstyle): New command. + +1997-04-03 00:07:28 1997 Richard Stallman <rms@gnu.ai.mit.edu> + + * texinfo.tex (\kbdfont, \kbdexamplefont): New macros, parms that + tell @@kbd what to do. + (\setkbdinputdistinct, \setkbdinputexample): New commands set them. + (\kbd): Use those parms. + +Thu Jul 3 16:52:39 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\onepageout): Leave only one line space above the + footline, to be more like plain. Suggested by Stephen Gildea. + (\evenfootline): Left one too many line spaces here, so reduce by two. + + (\ifnottex): Another ignore command. + (\ifnothtml,\ifnotinfo): New commands. + (\doignore): Ignore brace characters, so mismatched braces in ignored + text do not cause complaints. + +Fri Jun 27 15:09:16 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\image): New definition for new @image command. + +Wed Jun 18 15:58:20 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\oddfootingxxx), + (\onepageout): Leave space for the footline if present. + (\everyfootingxxx, \everyheadingxxx): Call \oddfootingxxx and + \evenfootingxxx instead of repeating their code. From: Stephen + Gildea <gildea@intouchsys.com>. + + (\setfilename): Read texinfo.cnf if present. + + (\indexdummies, \indexnofonts): No-op additional commands @result @equiv + @expansion @print @error @point. From: Dave Bodenstab + <imdave@ais.net> (for texi2www doc). + +Fri Jun 6 10:31:34 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\setmultitablespacing): Restore bad typing mistake + from yesterday. + +Thu Jun 5 18:04:26 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\uref): Write real definition, taking one mandatory + argument and one optional one. + +Wed Jun 4 17:16:09 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\mainmagstep): Define this as a \count variable + instead of with \let, to make changing to \magstep1 more transparent. + From: HERBERT@boevm4.vnet.ibm.com. + (\uref): New command a la \url. + +Sat May 24 18:06:41 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\deftypemethod, \deftypemethodheader): New macros + to implement new commands @deftypemethod and @deftypemethodx. + Suggestion from: KHMarbaise@p69.ks.fido.de (Karl Heinz Marbaise). + +Wed May 21 17:17:52 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\opnr, \clnr): Increment/decrement \parencount, for + @defun lines with nested parens. From Bill Schelter + <wfs@fireant.ma.utexas.edu>. + (\itemizeitem): Correct \errmessage. + +Mon May 19 17:34:40 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\codeunder): Use \_ and \ifusingtt to avoid + dotaccent from _ in roman fonts, e.g., @deftypefn. + (\tex): Remove spurious spaces at the end of subdefinitions. + From: "John W. Eaton" <jwe@bevo.che.wisc.edu>. + (\url, \email): \let to \code; no quotes or angle brackets. + +Mon May 5 17:06:35 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\onepageout): \ifcropmarks, center the page body. + Lost this when merged \croppageout with \onepageout. Found by + Arnold. + + (\doprintindex): Do not bother to go into double column mode unless + there actually is a non-empty index. + + (\begindoublecolumns): Include any existing \partialpage in the new one, + lest we lose a whole page of output. Found by M J Morley + <mjm@scs.leeds.ac.uk>. + + (\chapternofonts): Remove spurious spaces, both in the definitions that + get output to the aux file(s) and in this macro. + + Fix comments and rationalize whitespace in various other places. + +Sun Apr 27 15:41:16 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\chapter, etc.): Avoid expansion of section title + when writing the toc. + +Thu Apr 24 16:35:46 1997 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\onepageout): Integrate cropmarks case here, + instead of having a completely different routine. + (\croppageout): Remove this. + +Sun Jun 9 14:26:42 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\ignoremorecommands): Ignore \defcodeindex, and do + not ignore \message. + +Thu Apr 11 12:59:42 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\macro): New macro. + (\enddots, \endldots): New macros. + (\centerchap, \centerchapyyy): New macros. + (\centerchfplain, \centerchfopen): New macros. + (\CHAPFplain, \CHAPFopen): Set \centerchapmacro. + +Wed Mar 13 11:42:17 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\url): New macro, like \samp for now. + +Sun Mar 10 13:05:08 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex: Changes in @multitable code. + Change meaning of @multitablelinespace. + +Tue Mar 5 18:56:08 1996 Dave Love <d.love@dl.ac.uk> + + * texinfo.tex (\set): Set catcode of space explicitly (inside a + group) to avoid losing inside @example, say. + +Sun Mar 3 17:01:27 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\itemxpar): Protect the \vskip here with \nobreak, + to avoid a possible page break at an @itemx. + +Sun Feb 25 14:53:15 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\obstexwarn): Use \global to avoid ever getting the + warning twice. + + * texinfo.tex (\include): Allow underscores and other such + characters we made active in the file name argument. + +Tue Feb 6 15:06:27 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\afourlatex): Delete the old duplicate definition + of \afourlatex. + +Sun Feb 4 15:20:16 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\tab): New definition. + (\setuptable): Fix previous change. + (\multitablecolspace): Renamed from \multitablecolmargin. + (\multitablelinespace): Renamed from \multitablelineskip. + +Fri Feb 2 02:20:16 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\multitableparskip): Renamed from \intableparskip. + Allocate with \newskip. + (\multitableparindent): Renamed from \intableparindent. Use \newskip. + (\multitablelineskip): Renamed from \spacebetweenlines. Use \newskip. + (\multitablecolmargin): Renamed from \spacebetweencols. + (\columnfractions): Renamed from \percentofhsize. + (xcolumnfractions): Renamed from \xpercentofhsize. + + * texinfo.tex (\setuptable): Handle >1 digits after @percentofsize. + (\pickupwholepercent): New macro. + +Sun Jan 28 21:14:46 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\key, \kbdfoo): Use \ttsl unconditionally. + (\setkeyfont): Definition deleted. + +Tue Jan 23 14:57:23 1996 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex: @kbd within @example selects slanted tty font: + (\ttsl, \ttslshape): Define this new font shape. + (\kbdfoo): Set the font to \ttsl if already using \tt. + (\setkeyfont, \ifmonospace): New macros. + +Wed Jan 17 23:57:48 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\changepagesizes): Additional arg for topskip. + (\afourlatex): Total rewrite. + (\afourwide): Pass new arg to \changepagesizes. + +Wed Jan 3 17:15:00 1996 Stephen Gildea <gildea@x.org> + + * texinfo.tex (\slbshape, \itbshape): Use bold slant and and + bold italic in titles to match the bold roman. Do not use + bold sf or bold tt, which would be too heavy. + + * texinfo.tex (\setfont): Pass font name in more pieces. + (\*shape): New macros defining symbolic names for all font + shapes so can use other font families with different naming + conventions. + +Wed Jan 3 15:52:18 1996 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\ignoremorecommands): Turn off @everyheading and + friends, @headings, @setchapternewpage, @setchapterstyle. + +Sat Dec 30 17:20:48 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\inmargin): Don't allow a break before the vertical + kern. Do allow a whole paragraph of marginal text, not just one line. + Use \inmarginspacing. + +Thu Dec 28 23:22:08 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\inmargin): New command @inmargin. + (\dircategory): Ignore @dircategory. + +Tue Dec 12 17:25:36 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\lvvmode): Remove this; use \leavevmode as usual, + so spaces/underscores at beginnings of lines inside @example work. + Bogus index entries should be (and now are, I think) handled in + other ways. + +Mon Nov 13 16:07:09 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\xrefX): Test for xref-automatic-section-title + being @set correctly, and remove spurious redefinition of + \printednodename in that case. + +Mon Oct 16 15:16:34 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\unsepspaces): New macro to make active space + expand into a normal space char in index entries. + (\indexdummies): Use \unsepspaces. + +Thu Oct 12 14:56:52 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\tie): Use \lvvmode, not \leavevmode. + Don't use \@M directly either. + +Sun Aug 27 21:17:09 1995 Paul Eggert <eggert@twinsun.com> + + * texinfo.tex (\appendixsection): Fix misspelled defn. + +Mon Jul 31 23:57:57 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\ttfont): Don't call \nohyphenation. + +Sun Jul 30 18:30:47 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\tocentry): Use \turnoffactive. + +Sun Feb 5 05:34:13 1995 Richard Stallman <rms@pogo.gnu.ai.mit.edu> + + * texinfo.tex (\boldbraxnoamp): New function. + (\deftypefunargs): Use that, not \boldbrax. + +Tue Jan 31 12:15:28 1995 Karl Berry <karl@cs.umb.edu> + + * texinfo.tex (\set): Use \gdef, not \xdef. + +Sat Jan 21 16:39:36 1995 Richard Stallman <rms@pogo.gnu.ai.mit.edu> + + * texinfo.tex: Initially make _ and + \active, + then later make them \other. + (\otherifyactive): New command. + +Thu Jan 19 21:59:22 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\afourwide): New command. + +Mon Jan 16 09:29:38 1995 Stephen Gildea <gildea@x.org> + + * texinfo.tex: Initially make + and _ "other" characters. + (\fixbackslash, \everyjob): Make + and _ active characters. + +Tue Jan 10 19:16:09 1995 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex: At beginning, \input plain if necessary. + (\deftypefunargs): Use \boldbrax, not \functionparens. + +Sun Dec 18 16:40:11 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\indsc): Use csc10 (at 9pt), not indrm. + +Mon Oct 31 00:51:20 1994 Richard Stallman <rms@pogo.gnu.ai.mit.edu> + + * texinfo.tex (\changepapersizes): Fix definition syntax. + (\fontprefix): Define only if not yet defined. + + * texinfo.tex (\margin): Define a new insert. + (\SETmarginindex): Initialize to \relax. + (\doindex): Optionally put the entry in the margin. + (\pagecontents): Print the index entries put in the margin. + +Sat Oct 29 19:50:10 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\auxhat): New macro. + (\dosetq): Use \auxhat. + (reading the aux file): Give ^ catcode 7. + +Wed Oct 26 03:28:04 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\setfont): New macro. Use it for specifying + most of the fonts that are normally cm fonts. + (\fontprefix): New macro, normally `cm'. + +Mon Oct 24 01:27:09 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\startcontents): Set catcode of ^. + +Thu Oct 13 02:19:43 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\ifhtml, \html, \enddots, \?, \!): New commands. + +Fri Sep 16 16:30:52 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\defheaderxcond): New macro. + (\deftypefnheaderx): Use defheaderxcond when calling defname. + (\deftypefunheaderx, \deftypevarheader, \deftypevrheader): Likewise. + +Fri Aug 26 03:08:08 1994 Amy Hendickson <amyh@ai.mit.edu> + + * texinfo.tex (\multitable): New command. + +Mon Aug 1 14:28:57 1994 Richard Stallman <rms@mole.gnu.ai.mit.edu> + + * texinfo.tex (\changepagesizes, \afourlatex): New macros. + +Tue Jul 12 11:45:58 1994 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\quotation): Set \parskip to zero to avoid extra + space below the environment. + (\quotation): Clean up comments and indentation. + +Wed Jul 13 05:36:40 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrefX): Put back, and correct, the test of + SETxref-automatic-section-title. + +Thu Jul 7 15:57:52 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * Set catcodes of chars 128-255 to \other. + +Mon Jul 4 15:32:41 1994 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\tie): Set \catcode of @ to 11 before using \@M. + + * texinfo.tex (\xrefX): Undo \turnoffactive while printing the node + name, so _ in node names doesn't come out as the dot accent. + +Sat Jul 2 14:49:26 1994 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\tie): Ensure we're in horizontal mode before the + \penalty. + +Tue May 10 01:21:28 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\donoderef, \unnumbnoderef, \appendixnoderef): + Set \lastnode globally. + +Sun Apr 17 15:35:43 1994 Karl Berry (karl@ra.cs.umb.edu) + + * texinfo.tex (\~): Define to be a tie. + (\ptextilde): New defn to save the plain's tilde accent. + (\tex): Restore plain tilde. + +Sun Mar 27 23:35:17 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\smallbook): Set \defbodyindent and \deftypemargin. + +Sun Mar 20 19:47:59 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrefX): Define and use \correctnodename. + (@turnoffactive): Move after @ becomes available + and turn off backslash as well as other chars. Use @realbackslash. + (@normalturnoffactive): Like @turnoffactive but use @normalbackslash. + +Sat Mar 19 12:26:25 1994 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\singlespaceskip): Increase to 12.5pt. + (\singlespace): Call \setleading instead of just assigning to + \baselineskip, so the strut box will be reset. + (\smalllispx): Likewise. + +Sun Mar 13 20:32:28 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\dots): Change back to \ldots. + +Sat Mar 12 22:34:10 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\indexnofonts): Add %'s to suppress newlines after \def. + +Sat Feb 26 15:51:37 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\deftexinfoversion): New macro. + (\texinfoversion): Define using \deftexinfoversion. + +Wed Jan 26 12:40:52 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\putwordSee, \putwordInfo, \putwordfile) + (\putwordChapter, \putwordAppendix, \putwordSection) + (\putwordsection, \putwordpage) + (\putwordTableofContents, \putwordShortContents): New macros. + Used in various places instead of fixed words. + +Mon Jan 24 22:51:36 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\ignoremorecommands): Turn off @item and @message. + +Thu Jan 20 17:01:53 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\indexnofonts): Treat accents as dummies. + Turn modified European letters into one or more ordinary letters. + +Tue Jan 18 14:54:32 1994 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\indexdummies): Handle tex accents and European letters. + +Wed Nov 24 16:11:51 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\dots): Use $\,$ for spacing. + +Sun Nov 21 22:16:21 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\dots): Avoid using \ldots; use periods and kern. + (\indexdotfill): Use italic periods. + +Fri Nov 19 20:50:31 1993 Roland H. Pesch (pesch@apple-gunkies.gnu.ai.mit.edu) + + * texinfo.tex (\deftypefunargs): use \tclose rather than \code to + avoid side effects on active chars + +Tue Sep 28 16:01:58 1993 Roland H. Pesch (pesch@apple-gunkies.gnu.ai.mit.edu) + + * texinfo.tex (\obeyedspace defn): remove blank after \sepspaces + (left destructive penalty in vertical list) + +Mon Aug 30 14:17:27 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * texinfo.tex (\setref, \unnumbsetref, \appendixsetref): Uncomment + \dosetq for title. + (\Ytitle): Define as \thissection instead of \thischapter. + (\xrefX): If there is no printed-title arg given, and @ifset + xref-automatic-section-title, try to use the real section title. + +Tue Jul 27 12:47:24 1993 Charles Hannym (mycroft@trinity.gnu.ai.mit.edu) + + * texinfo.tex (\ifitemxneedsnegativevskip): New \if; set immediately + following a short \item. + (\itemxpar): \par and then if \ifitemxneedsnegativevskip is set, do + a \vskip-\parskip. + (\internalBitemx, \internalBxitemx, \internalBkitemx): Use \itemxpar + rather than \par. + (\itemzzz): Set \ifitemxneedsnegativevskip as appropriate. + +Thu Jul 22 16:08:33 1993 Charles Hannum (mycroft@trinity.gnu.ai.mit.edu) + + * texinfo.tex (\titlezzz, \finishtitlepage): Explicitly make hrules + have a width of \hsize so they aren't too long in smallbook format. + +Tue Jun 29 15:56:19 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\deftypefnheaderx): call \normalparens to permit + normal typesetting of strings (e.g. for C++ docn) containing `&' + +Fri Jun 25 14:08:44 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\nestedignore): turn off \ind... fonts too + (primarily for use within @smallexample) + +Wed Jun 23 11:58:48 1993 Jim Kingdon (kingdon@wombat.gnu.ai.mit.edu) + + * longopts.table: Update GDB options. + +Sun Jun 20 22:00:11 1993 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * lgpl.texinfo: Use @smallexample instead of @example. Reformat + example disclaimer to avoid overfull \hbox. + +Mon Jun 14 04:09:47 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\entry): Don't make a line of dots + if there are no page numbers. + +Fri Jun 11 16:35:23 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\defparsebodycommon): New macro from \defvrparsebody. + (\deftpparsebody): Call it; can't use \defvrparsebody. + (\deftpheaderline, \removeemptybraces): New macros. + +Sat May 8 10:49:25 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\itemzzz): Only change \parskip temporarily, and + unskip by it later if the item text is on its own line. + + * texinfo.tex (\tablez): Do \afterenvbreak before the \endgroup, + so the \parskip value is the table's, not the surrounding text's. + (\vtable, \ftable, \itemizey): Likewise. + Note: for most environments, \nonfillfinish deals with this. + + * texinfo.tex (\smalllisp): New definition for non-small case, a + la @smallexample. + + * texinfo.tex: Delete \message{} at beginning; it does nothing. + + (These changes are all trying to make space above and below + environments more equal.) + * texinfo.tex (\singlespace): Don't insert a kern. + (\group): Do \offinterlineskip, and reset \par to insert a blank + line's worth of space. + (\lisppar): Delete meaningless call to \obeyspaces before making + the definition. + (\Elisp [the outer one]): Rename to \nonfillfinish, and end the + paragraph before the group. + (\lisp): Set \Elisp (the inner one) to \nonfillfinish + (\example, \smallexample, \display, \format, \flushleft, + \flushright, \quotation): Use \nonfillfinish. + (\lineskipfactor, \strut{height,depth}percent): Set to more exact + values. + (\setleading): Set \normallineskip and call \normalbaselines, for + cleanliness. + +Thu May 6 16:00:59 1993 Jeffrey Osier (jeffrey@deneb.cygnus.com) + + * texinfo.tex (\ignoremorecommands): Turn off \set and \clear. + +Tue Apr 20 17:02:34 1993 Roland H. Pesch (pesch@apple-gunkies.gnu.ai.mit.edu) + + * texinfo.tex (\codex): Delete space. + +Thu Apr 15 14:59:04 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\ignoremorecommands): Turn off @raisesections, @up, + @lowersections, @down within false conditionals. + +Sun Apr 18 04:33:13 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\code): Define - and _ to permit line-breaking + despite the fact that hyphenation is disabled. + (\codex, \codedash, \codeunder): New macros. + +Tue Mar 16 18:19:16 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\ignoremorecommands): Turn off @printindex within + false conditionals. + +Sun Mar 14 10:47:36 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\footnote): Don't bother to take the footnote text + as an argument, and hence don't define as \long. + (\footnotezzz): Do \footstrut after we start the paragraph. + (Also reformat these macros to make them easier to read.) + +Fri Feb 26 13:02:44 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (@include): Use \thisfile rather than #1 as \input arg. + + * texinfo.tex (\readauxfile): Call \warnedobstrue to turn off warning + re TeX 3.0 on second and subsequent runs. + +Thu Feb 25 18:03:38 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\realeverypar): Delete, as it was unused. + + * texinfo.tex (\group): Do a \strut in \everypar. + +Mon Feb 22 17:10:06 1993 Karl Berry (karl@claude.cs.umb.edu) + + * texinfo.tex (\obeyedspace): Define to be whatever \sepspaces + does (and move the definition to after \sepspaces). + +Wed Feb 17 01:55:20 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\nonfillstart): Do \singlespaces and \let\par + before \obeylines. + +Fri Feb 12 12:32:56 1993 Roland H. Pesch (pesch at el_bosque.cygnus.com) + + * texinfo.tex (\obstexwarn): issue message re bug in TeX 3.0. + (\nullfont): commented-out redefinition, to enable w/TeX 3.0. + (\nestedignore): call \obstexwarn for manuals that may trip bug + + * texinfo.tex (\nestedignore): avoid @tex contents with \doignore + +Thu Feb 11 15:41:06 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\indexdummies): enable @dfn and @emph in index entries + +Thu Feb 11 13:32:32 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\ignoremorecommands): ignore @include within + failing conditionals + +Sat Feb 6 19:44:28 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\nestedignore): Set \globaldefs--make all defs local. + +Tue Feb 2 15:57:37 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (@raisesections, @lowersections): new commands. + * (@up, down): original BFox synonyms for above. + * (\numhead, \apphead, \unnmhead): internal macros to map headings + to appropriate level + * (@nwnode): new synonym for @node, used in newest + makeinfo + +Tue Jan 26 17:05:02 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\include): avoid group around file contents + +Tue Jan 19 18:58:56 1993 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\ignoremorecommands, used in \nestedignore): also + ignore cross-ref commands and \settitle + (\setyyy, used in @set): make definitions global + (\clearxxx, used in @clear): clear definitions globally + +Thu Jan 14 17:43:32 1993 Michael I Bushnell (mib@geech.gnu.ai.mit.edu) + + * texinfo.tex: Added \shorttitlepage. + +Sat Jan 2 15:01:45 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\tclose): Use \spaceskip instead of modifying + \fontdimen's to normalize the interword space. + + * texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of + \exhyphenpenalty, to turn off hyphenation for real. + (\{no,restore}hyphenation): New macros. + +Sat Jan 2 15:01:45 1993 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\t, \key, \tclose): Use \hyphenchar instead of + \exhyphenpenalty, to turn off hyphenation for real. + (\{no,restore}hyphenation): New macros. + +Tue Jan 5 19:15:46 1993 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\deftpparsebody): Make synonymous with \defvrparsebody. + +Sun Dec 27 09:40:08 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\inforef, \inforefzzz): Use the \ignorespaces + primitive instead of \losespace. + (\losespace): Delete. + + * texinfo.tex (\menu, \direntry): Handle like \ifinfo. + + * texinfo.tex (\unmatchedenderror, \defineunmatchedend): New macros. + (\endxxx): Call it, instead of just doing it inline. + (\conditionalsucceed, \nece): More new macros. + (\iftex): Call \conditionalsucceed. + (\Eiftex): Define to give an error at the outer level. + + * texinfo.tex (\ignoremorecommands, \nestedignore): New macros. + (\ifset, \ifclear): Expand a macro on success as well as failure; + also switch to using expansion instead of assignments to act after + the conditional. + (\if{set,clear}succeed): Call \conditionalsucceed. + (\if{set,clear}fail): Call \nestedignore instead of \doignore. + + * texinfo.tex (\clear): Don't insert a spurious space. + + * texinfo.tex (\value): Put comment next to definition. + + * texinfo.tex (\setyyy): Call \setzzz, and define the variable as + simply the parameter, no \unskip. + (\setzzz): New macro; do not globally define the variable. + +Thu Dec 3 17:24:05 1992 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (croppageout): use same escape-char switching as + default output routine. Permits using _ in TOC entries. + +Fri Nov 13 17:35:38 1992 Charles Hannum (mycroft@gnu.ai.mit.edu) + + * texinfo.tex (indexing): Rewrote double-column mode to fix a + rare breakage. + +Sun Oct 25 07:13:31 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\obeyedspace): No need to define with \gdef, we're + at the outer level. + +Fri Oct 16 18:04:40 1992 Roland McGrath (roland@geech.gnu.ai.mit.edu) + + * lgpl.texinfo: Change "This program" to "This library" in example + copying notice. + +Sat Oct 10 09:43:45 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\bullet, \minus): Use \implicitmath instead of $. + +Fri Oct 2 08:35:51 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\Egroup): Don't do the \strut and \nointerlineskip. + +Sat Sep 26 09:08:59 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\doignore, \enddoignore): New macros. + (\ifinfo): Call \doignore. + (\ifxinfoxxx): Deleted. + (\ignore, \ifsetfail, \ifclearfail): use \doignore. + + * texinfo.tex (\unnumbered): Expand the arg only once for the \message. + + * texinfo.tex (\deftpparsebody, \parsetpheaderline): New macros. + (\deftp): Call \deftpparsebody. + +Thu Sep 24 10:12:45 1992 Karl Berry (karl@cs.umb.edu) + + * texinfo.tex (\entry): Do \par first; add comments. + (\short{chap,unnumbered}entry,\do{chap,sec,subsec,subsubsec}entry): + Call \tocentry, instead of using \vbox. + (\tocentry): New macro. + +Sat Sep 19 14:36:11 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\`, \'): Definitions deleted. + +Fri Sep 18 14:33:09 1992 Roland H. Pesch (pesch@cygnus.com) + + * texinfo.tex (\ifset, \ifclear): Standardize catcode of space as + for \ignore. + +Fri Sep 11 15:25:01 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\finalout): Move out of final section of file, + which claims not to define new control words. + + * texinfo.tex (\setleading): New macro. + (outer level, @smallbook, @afourpaper): Call it, instead of + setting \baselineskip directly. + + * texinfo.tex (\|): New definition for changebars. + +Tue Sep 1 17:32:48 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\begindoublecolumns): Exactly double \vsize. + +Sat Aug 29 10:12:16 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\group): Define \Egroup to use struts instead of + letting TeX do its own interline spacing. + + * texinfo.tex (\{remove,ignore}activespaces): New macros. + (\end): Call \removeactivespaces; give the correct error messages; + don't try to expand a nonexistent \E... macro. + + * texinfo.tex (\EMsimple): End the help message with a period. + + * texinfo.tex (\gobble): New macro. + (\lisp): Call it (instead of defining it every time). + (\example, \smallexample): Define \E... within the macro. + +Tue Aug 25 11:56:26 1992 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex (\readauxfile): Make + normal while reading aux file. + +Thu Aug 20 21:32:34 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\doublecolumnhsize): Compute value in + \begindoublecolumns. + (\afourpaper, \smallbook, <outer level>): Remove these (virtually + identical) computations. + + * texinfo.tex (\doublecolumnvsize): Deleted. + (\afourpaper, \smallbook): Don't compute it. + (\begindoublecolumns): Just double \vsize here (thus decreasing + the value considerably from the old value of 19.1in, which was far + too large.) + +Fri Aug 14 10:16:42 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\parseargx): Use \expandafter instead of + \aftergroup to continue the processing. + (\parsearglinex): Renamed to \parseargline, since the former + \parseargline is no longer needed. + + * texinfo.tex (\parseargline) Remove a trailing @c or @comment. + (\argremovec, \argremovecomment): New macros. + +Thu Aug 6 11:28:55 1992 Roland H. Pesch (pesch@fowanton.cygnus.com) + + * texinfo.tex: extended @set to define expandable vars; + @value expands same. Auxiliary macros \setxxx, \setyyy + used for @set. + +Sun Aug 2 14:34:48 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\entry): do line-breaking on the index entry. + +Wed Jul 1 17:05:26 1992 Karl Berry (karl@claude.cs.umb.edu) + + * texinfo.tex (\lparen, \rparen): new definitions. + ((,[,],)): new global definitions for these four active + characters, so parens and brackets can be used in @deffn names. + +Sat Jun 27 11:32:58 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\shortchaplabel): new macro to align chapter and + appendix labels. + (\shortchapentry): call it. + (\shortappendixwidth): new dimen register. + +Wed Jun 24 09:45:34 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\afterenvbreak): make the same as \aboveenvbreak, + so space below environments doesn't get lost. + (\aboveenvskipamount): rename to \envskipamount, since it's used + both above and below. + +Wed Jun 24 09:45:34 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\group): do @comment at the end, to avoid excessive + white space when called inside @group. + +Wed Jun 24 16:36:04 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\startcontents): End page before setting pageno. + +Thu May 28 20:27:25 1992 Robert J. Chassell (bob@hill.gnu.ai.mit.edu) + + * texinfo.tex (\vtable): Like @ftable, but for variables. + +Fri May 22 07:04:32 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\w): do \leavevmode before the \hbox. + +Sat May 16 11:16:27 1992 Karl Berry (karl@hayley) + + * texinfo.tex (\smallbook): decrease \topskip somewhat. + + * texinfo.tex (\group): use \vtop instead of \vbox. + + * texinfo.tex (\newlinechar): define for use in help strings. + (\groupinvalidhelp): define this for use with \errhelp. + (\group): set \errhelp to above. + +Thu Apr 30 16:19:17 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\need): Rewritten by karl. + +Sat Apr 18 16:24:00 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\exdentamount): New var, set by environments. + (\exdent, \exdentyyy): Define suitably for filled environments. + Always exdent by innermost indentation step. + (\nofillexdent, \nofillexdentyyy): Alternates for nofill envs. + (\lisp, \smalllispx, \display): Set \exdent to \nofillexdent. + +Thu Apr 2 15:04:15 1992 Robert J. Chassell (bob@kropotkin.gnu.ai.mit.edu) + + * texinfo.tex (\Esmalllisp): Smaller baseline skip for smallexamples. + +Sun Mar 29 20:44:49 1992 Brendan Kehoe (brendan@cs.widener.edu) + + * texinfo.tex (\startcontents): Always close contentsfile and + adjust the page. + +Fri Mar 27 17:41:52 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\chapternofonts): Deal with \result, \equiv, etc. + +Sat Mar 21 08:22:29 1992 Karl Berry (karl at hayley) + + * texinfo.tex (\entry): format entries better if the page number + and entry text don't fit on one line. + + * texinfo.tex (\loggingall, \gloggingall): new macros to help with + debugging. + +Fri Mar 20 15:35:42 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\result, \expansion, \print, \equiv): + Don't copy prefabricated boxes; must adapt to current font. + (\dblarrowbox, \longdblarrowbox, \pushcharbox, \equivbox): Deleted. + (\bullbox): Deleted. + +Thu Mar 19 22:17:14 1992 Robert J. Chassell (bob@kropotkin.gnu.ai.mit.edu) + + * texinfo.tex (\widowpenalty, \clubpenalty): Set them to 10000, since + 8000 did not work. + +Fri Mar 6 13:26:36 1992 Robert J. Chassell (bob@kropotkin.gnu.ai.mit.edu) + + * texinfo.tex (\widowpenalty, \clubpenalty): Set them to 8000, since + 2000 did not work (but \widowpenalty at 20000 did work). + +Thu Feb 27 12:27:14 1992 Karl Berry (karl@wombat.gnu.ai.mit.edu) + + * texinfo.tex (\widowpenalty): set to 2000, not 20000. + +Sat Feb 8 14:34:45 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\widowpenalty, \clubpenalty): Set them to 2000. + (\itemizeitem): Use penalty 1200. + (\itemzzz): Add \nobreak near beginning. + + * texinfo.tex (\quotation): Increase right margin, instead of + left margin twice. + +Wed Feb 5 12:08:30 1992 Karl Berry (karl at hayley) + + * texinfo.tex (\alphaenumerate, \capsenumerate): redefine as a call + to \enumerate. + (\{lower,upper}caseenumerate): Rename from \{alpha,caps}enumerate. + +Sun Feb 2 21:07:19 1992 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\itemzzz): Compensate in line-by-itself case for + a table that is indented. + +Mon Jan 13 21:04:07 1992 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex: Use 26 instead of control-z as character constant. + +Sat Jan 11 02:20:58 1992 Roland McGrath (roland@albert.gnu.ai.mit.edu) + + * gpl.texinfo: Unfilled Yoyodyne example. + +Sat Dec 7 16:16:54 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\cartouche): Set \nonarrowing. + (\lisp, \smalllisp, \quotation, \display): If set, don't narrow. + +Mon Dec 2 08:15:08 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\itemzzz): don't start a paragraph if the item text + is on a line by itself; don't allow a page break after that + line; always do \par before typesetting anything. + +Tue Nov 26 15:13:13 1991 Roland McGrath (roland@albert.gnu.ai.mit.edu) + + * lgpl.texinfo: @ifset lgpl-appendix, use @appendix instead of + @unnumbered. + +Sun Nov 10 12:00:06 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\doprintindex): only \read if the file existed; + \closein the test stream in all cases. + (\initial, \entry): do not \outer, so that \read does not get an + error if the index exists. + +Fri Nov 8 18:13:28 1991 Michael Bushnell (roland@churchy.gnu.ai.mit.edu) + + * texinfo.tex (\itemizey): missing %'s in macro defn. + Also, add \begingroup; accidentally deleted by Karl Berry. + +Thu Nov 7 11:41:25 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\doprintindex): \read from the index file to make + \ifeof true when the file exists but is empty. + +Tue Nov 5 08:29:13 1991 Robert J. Chassell (bob at grackle) + + * texinfo.tex (@thischaptername): Provide default value for when + @chapter not defined. + +Sat Nov 2 17:59:02 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\itemizezzz): do \begingroup here, since \itemizey + can't any longer. + +Tue Oct 29 12:17:41 1991 Robert J. Chassell (bob at grackle) + + * texinfo.tex: @paragraphindent defined as a no op. + +Fri Oct 25 15:19:47 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\enumeratey): allow any lowercase letter, uppercase + letter, or number as argument; initialize \itemno and begin the + environment's group here. + (\itemizey): don't initialize \itemno here. + (\numericenumerate, \startenumeration): new macro. + +Wed Oct 23 16:26:30 1991 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\ifclear, \ifset): Remove \outer. + + * texinfo.tex (\afourpaper): Set various parameters. + +Tue Oct 22 18:42:31 1991 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\alphaenumerate, \capsenumerate): + Let @end enumerate end these. + (\Ealphaenumerate, \Ecapsenumerate): Aliases for \Eenumerate. + +Sun Oct 20 18:23:18 1991 Richard Stallman (rms@mole.gnu.ai.mit.edu) + + * texinfo.tex (\mainmagstep): New parameter macro. + (Defining fonts): Use that parameter to scale them. + If \bigger is defined, use 12 point fonts. + +Tue Sep 24 00:30:07 1991 Roland McGrath (roland@churchy.gnu.ai.mit.edu) + + * texi2dvi: Iterate over the right variable to look for new idx files. + + * texi2dvi: GPL 2. + + * texi2dvi: Fix 2nd invocation of texindex to pass right args. + +Wed Sep 11 20:52:42 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\cartouche): New macro. + +Fri Aug 23 16:13:46 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\section, \subsection, \subsubsection): + Initially define for numbered chapters. + +Fri Aug 2 01:46:09 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\footnote): Use \unskip instead of \removelastskip. + +Mon Jul 29 14:06:54 1991 Roland H. Pesch (pesch at cygint.cygnus.com) + + * texinfo.tex (\majorheadingzzz, \chapheadingzzz, \chfplain, + \unnchfplain, \unnchfopen, \secheadingi, \subsecheadingi, + \subsubsecheadingi): allow line breaks in headings. + (\shortchapentry, \shortunnumberedentry, \dochapentry, \dosecentry, + \dosubsecentry, \dosubsubsecentry): allow line breaks in table of + contents entries. + +Thu Jul 18 19:01:53 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\secfonts, \indexfonts): Fix typos. + +Sun Jul 7 16:36:28 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\afourpaper): New command. + + * texinfo.tex (\numberedsec): Renamed from \section. + (\numberedsubsec): Renamed from \subsection. + (\numberedsubsubsec): Renamed from \subsubsection. + (\chapter, \appendix, \unnumbered): Define \section, \subsection, + and \subsubsection here according to type of chapter. + +Thu Jul 4 14:19:32 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\defvarparsebody, \defvrparsebody, \defopvarparsebody): + New functions. + (\defvar, \defvr, \defopt, \defcv, \defivar): Use them. + (\deftypevar, \deftypevr): Likewise. + +Mon Jul 1 13:49:25 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\group): Report error if used outside @example, etc. + + * texinfo.tex (\defname): Reduce \leftskip + to cancel temporarily the increase made in \defparsebody. + + * texinfo.tex (\enumerate): Allow optional arg to specify type + of counting. + + * texinfo.tex (\set, \clear): New commands. + +Mon Jun 24 12:22:44 1991 Roland McGrath (roland@albert.gnu.ai.mit.edu) + + * texinfo.tex (\eleterate): Renamed to \alphaenumerate. Sigh. + (\ecapitate): Likewise \capsenumerate. + +Thu Jun 6 20:02:48 1991 Roland McGrath (roland@geech.gnu.ai.mit.edu) + + * lgpl.texinfo: Created from /fsf/rms/gnuorg/lgpl.text. + + * gpl.texinfo: Created from /fsf/rms/gnuorg/gpl.text (GPL v2). + + * texinfo.tex (\eleterate, \ecapitate): New commands, like @itemize, + but with [a..z] or [A..Z] instead of [1..n]. + +Tue May 21 15:46:32 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\dmn): new command to typeset a dimension. + +Tue May 21 20:58:22 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\doind, \dosubind): Make new group around \indexdummies + and most of body, excluding the \penalty commands. + +Mon May 20 21:16:32 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\tex): Typo in redefining \@. + + * texinfo.tex (\_): Use \lvvmode, not \leavevmode. + (\lvvmode): New macro. + + * texinfo.tex (\authorrm, \titlerm): Move to after section fonts. + +Tue May 14 21:13:29 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\defunargs): Set \hyphenchar in \tensl, not \sl. + +Thu May 9 17:07:08 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\ignore): Standardize catcode of space. + +Wed May 8 13:49:45 1991 Karl Berry (karl at hayley) + + * texinfo.tex (\sffam, \sf): New macros; support sans serif + type style in math. + (top level): Set up \textfonts early on, so we can create boxes w/ it. + (\tenrm...\tensf): Define these to be \textrm...\textsf instead. + (\df, \textfonts, \chapfonts, \secfonts, \subsecfonts): + (\indexfonts): Redefine \tenrm (etc.) instead of just \rm, so that + the math family assignment doesn't get lost; call \resetmathfonts. + (\resetmathfonts): New macro; redefines \textfont of each math family. + (\indsc, \indi, \indsy \chapsc, \chapi, \chapsy, \secsc, \seci): + (\secsy, \ssecsc, \sseci, \ssecsy): New font definitions. + +Mon May 6 21:30:19 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\indexdummies): Write \_ when an _ is seen. + +Mon Apr 29 01:41:44 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\defname): Use \dimen2, \dimen3 for outer margins. + Use outer margins for influencing \rightline. + (\tclose, \key, \t): Turn off line breaks at hyphens. + +Fri Apr 12 03:12:14 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\authorrm): Move definition to top level; copy \secrm. + +Tue Apr 2 22:48:39 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\defname): Adjust size of \rlap box, not \dimen0 + or \dimen1, for current width. + + * texinfo.tex (\Yappendixletterandtype): End with {}. + +Sat Mar 30 16:13:25 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrefX): Really use \cite. + (\inforefzzz): Use \samp for node name. + + * texinfo.tex (\defname): Use current width for \dimen0, \dimen1. + + * texinfo.tex (\doprintindex): Put lots of whitespace before index. + +Fri Mar 29 17:00:58 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrdef): Take out last change. + + * texinfo.tex (\needx): Turn off \baselineskip. Use kern, and no glue. + + * texinfo.tex (\shortcontrm): Renamed from \truesecrm. + (\shortcontbf, \shortcontsl): New fonts for short contents lines. + (\summarycontents): Use them. + + * texinfo.tex (\defname): Don't set \leftskip to 0; just decrease by + one indent level. + (\defparsebody, \def*parsebody): Increment both margins by one level. + +Tue Mar 26 22:41:38 1991 Richard Stallman (rms at mole.gnu.ai.mit.edu) + + * texinfo.tex (\xrdef): Change catcode before reading args. + +Wed Mar 20 14:21:57 1991 Roland McGrath (roland at geech.gnu.ai.mit.edu) + + * texi2dvi: Use p modifier in sed -n command, so it works. + Duplicate code to find the index files, instead of being smart in + one place and dumb in another. + +Thu Mar 7 17:08:32 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\defaultparindent): New variable. + (\footnotezzz): Reset \parindent to default. + (\xrefX): Use \cite for printed manual and node names. + +Tue Mar 5 13:39:34 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\emergencystretch feature): Use \thisisundefined. + +Mon Mar 4 00:35:57 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\ftablex): Define \Eftable; undefine \Etable. + + * texinfo.tex (\footnote): Discard preceding whitespace. + + * texinfo.tex: Use the \emergencystretch feature if available. + +Fri Feb 22 03:50:58 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\tex): Make + not active. + +Fri Feb 15 10:05:24 1991 Roland McGrath (mcgrath at cygint.cygnus.com) + + * texi2dvi: Use $TEXINFO in place of $TEX (falling back to $TEX + if $TEXINFO is undefined). + + * texi2dvi: Renamed from texinfo. Bob (I believe) did this at some + point at and didn't make a ChangeLog entry. I'd shoot him myself if + he weren't the person who signs my paychecks. + +Sun Feb 10 22:51:52 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\doprintindex): If index is empty, print a dummy. + (\need): Use vskips and penalties; don't use \pagetotal. + +Fri Feb 8 17:36:53 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\ignoresections): + Turn off \contents, \smallbook and \titlepage. + + * texinfo.tex (\Etitlepage): Do a page break before ending the group. + + * texinfo.tex (\setref, \unnumbsetref, \appendixsetref): + Comment out recording the chapter title. + +Thu Jan 24 23:28:41 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\top): Synonym for \unnumbered. + (\infotop): Synonym for \infounnumbered. + (\ignoresections): Handle \top. + +Thu Jan 24 12:41:33 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex: Delete spurious character at beginning. + +Thu Jan 17 16:34:25 1991 Roland McGrath (roland at cygint.cygnus.com) + + * texinfo: Check the exit status of tex and texindex. Don't procede + after a failing run. + +Thu Jan 10 15:16:47 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\xrefX): Get rid of blank line. + +Wed Jan 9 18:06:20 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\entry, \secondary): Use \indexdotfill. + (\indexdotfill): New macro. + +Tue Jan 8 17:44:01 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\donoderef): Define a ...-title cross-reference. + (Ytitle): Subroutine for that. + (xrefX): Use the real title by default (but this is commented out). + +Tue Jan 1 23:18:21 1991 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\indexnofonts): Delete troublemaking blank line. + +Sat Dec 22 00:47:21 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\xrefX): Prevent extra space. + +Fri Dec 21 21:14:50 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\comment, \commentxxx): Ignore @ in comment. + +Thu Dec 13 22:38:31 1990 Chris Hanson (cph at kleph) + + * texinfo.tex (\defivarheader): Capitalize "Variable". + +Sun Dec 2 01:46:04 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\indexdummies, \indexnofonts): Handle \t like \r. + + * texinfo.tex (heading fonts): New fonts based on cm...12. + +Tue Nov 27 16:59:35 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\indexnofonts): Also supersede \TeX and \dots. + +Sun Nov 18 16:18:14 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\*): End with \ignorespaces. + +Fri Nov 2 17:41:48 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\*): Output empty hbox to avoid losing whitespace. + (\deftypevarheader, \deftypevrheader): End the paragraph + with suitable penalties. + (\deftypevrheader): Do print the data type. + +Thu Nov 1 12:04:52 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\defmethodheader): Print `method', not `operation'. + +Fri Oct 26 17:11:08 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\indexdummies): Temporarily redefine \_. + (\ptexdots): Copy of plain tex \dots. + (\tex): Temporarily reinstall that. + +Fri Oct 19 16:57:48 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\subsubsecheadingi, \subsecheadingi): New subroutines. + +Mon Oct 8 13:34:19 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (active _): Use \normalunderscore. + +Tue Sep 25 22:32:55 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\deftypefn, \deftypevar, \deftypevr): New macros. + Their subroutines also new. + +Tue Sep 25 16:42:52 1990 Roland McGrath (roland at geech.ai.mit.edu) + + * texinfo: Recognize `.tex' as a suffix. + +Tue Sep 25 01:46:54 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\deftypefun): New macro. + (\deftypefunheader, \deftypefunheaderx, \deftypefunargs): Also new. + +Fri Sep 14 00:38:28 1990 Roland McGrath (roland at churchy.ai.mit.edu) + + * texinfo: Weed out files that have two-letter extensions but don't + start with a backslash, and therefore aren't index files. + + * texinfo: Handle index files that have any two-letter extension, + rather than using a static list of extensions. + + * texinfo: Handle .texi extension as well as .texinfo. + + * texinfo: New file, a sh script to do .texinfo -> .dvi. + +Mon Sep 10 13:14:39 1990 Richard Stallman (rms at mole.ai.mit.edu) + + * texinfo.tex (\math): New macro. + +Tue Sep 4 07:43:33 1990 Karl Berry (karl at hayley) + + * texinfo.tex (\chfplain): Do not print a period after the chapter + number, for consistency with sections et al. + + * texinfo.tex (\refX): hyphenate `undefined' so that the ligature + is not lost. + + * texinfo.tex (_): use \_ unless we're in tt. + (\ifusingtt): new macro for such conditionalization. + + * texinfo.tex (\xrefX): don't use \unhbox to print the node names, + since that loses on hyphens. + Use \ignorespaces rather than \losespace. + +Thu Aug 2 07:03:26 1990 Karl Berry (karl at hayley) + + * texinfo.tex (\linenumber): new macro. + (\refx): give the line number in the message. + +Tue Jul 31 09:13:32 1990 Karl Berry (karl at hayley) + + * texinfo.tex (\refx): improve warning messages, remove + unnecessary groups, and improve logic. + +Thu Jul 26 20:53:38 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\subheading, \subsubheading): Missing macros defined. + +Thu Jul 19 22:48:26 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlepage): Don't print rule for \page unless already + printed a rule. + (\abstract): Deleted. + (\direntry): New command, much like \ignore. + +Sun Jul 15 16:28:42 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\abstract): New construct; trivial in tex. + +Sun Jun 17 01:03:16 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\defcv): Protect space before `of'. + (\defspec): Capitalize `Form'. + +Sat Jun 16 19:36:56 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\kbd, \kbdfoo): Use \par to term. arg to \kbdfoo. + +Fri Jun 15 10:47:12 1990 Robert J. Chassell (bob at pogo.ai.mit.edu) + + * texinfo.tex (\defcv): Use \defcvarheader instead of (undefined) + \defcvheader. + +Fri May 25 18:04:31 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\xrefX): Use \turnoffactive. + +Mon May 21 21:17:34 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\turnoffactive): New command. + (\normaldoublequote, ...): New commands. + (\dosetq): Use \turnoffactive. + +Sat May 19 12:31:17 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\indit): Use slanted font, not italic. + (\smalllispx): Do \indexfonts. + +Fri May 4 17:35:04 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\footnote, \footnotezzz): Make it \long. + +Wed May 2 01:19:55 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlerm): Go back to cmbx10 scaled \magstep5. + (\hsize): Don't set it, use the default. + +Fri Mar 23 21:07:02 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\footnote): Read arg in braces, not as a line. + +Mon Mar 19 19:30:08 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\unnumbsubsubsecentry): Typo in name being defined. + +Tue Mar 13 18:49:27 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\defvarargs): Add penalty at end. + + * texinfo.tex (\synindex, \syncodeindex): Copy one index file name + into the other. + +Tue Mar 6 16:58:54 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\deftt): Make this a distinct font. + + * texinfo.tex (\initial): Define \tt like \tentt. + + * texinfo.tex (\ifinfo): End with \losespace. + (\ignore, \ifsetfailxxx, \ifclearfailxxx): Likewise. + +Sun Mar 4 19:55:57 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\lbrb, \rbrb): Use \bf. + +Sat Mar 3 17:53:22 1990 Richard Stallman (rms at geech) + + * texinfo.tex (\onepageout): Set \escapechar here. + + * texinfo.tex (\rawbackslash): Define using \chardef. + + * texinfo.tex (\@): Use ttfont. + +Thu Mar 1 16:37:46 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (Ysectionnumberandtype, Yappendixletterandtype): + Capitalize "chapter", "appendix" and "section". + +Mon Feb 19 20:26:22 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\xkey): Attempt to eliminate spurious space from + output. Look at y-or-n-p. + +Mon Feb 12 16:34:00 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\errorbox): Get \dimen0 from \tentt. + +Sun Feb 11 15:11:57 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\defunargs): Use ragged right for args. + Add large penalty at end. + + * texinfo.tex: Make active definition for = using \tt, but disable. + (\defparsebody): Make = active. + (\defunheader, etc.): Make inactive again. + + * texinfo.tex (\errorbox): Try to equalize outside space to both sides. + +Fri Feb 2 14:47:21 1990 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\appendix): Don't use \the before \appendixletter. + +Sat Dec 16 14:02:56 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\chapter, \appendix): Make defn of \thischapter + refer to \thischaptername, and store actual name there. + (\chapternofonts): Turn off more macros. + (\indexdummies): Likewise. + +Sun Nov 19 15:29:47 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlerm): There were two definitions of this command. + Put them together and commented out one of them. + (\subtitlerm): Was same as \tenrm, so just copy that. + (\ninett): Always define this. + (\indtt): Copy from \ninett. + +Sat Nov 18 22:57:37 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\ssecrm, etc.): Scale by 1315, rather than to 13pt. + +Wed Nov 8 18:38:33 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlepage): Turn on iffinishedtitlepage so + bottom rule is not printed. + (\titlezzz): Turn it off, so bottom rule is printed. + +Mon Nov 6 09:23:29 1989 Karl Berry (karl at hayley) + + * texinfo.tex (\chapterzzz, \appendixzzz): include `Chapter + \the\chapno' and `Appendix \appendixletter' in \thischapter; use + \xdef instead of \gdef to define \thischapter, to avoid timing + problems with \chapno or \appendixletter. + (\startcontents): don't bother putting `Table of Contents' or + `Short Contents' in the headline. + +Fri Oct 20 09:11:35 1989 Karl Berry (karl at hayley) + + * texinfo.tex (\titlepage): remove obsolete code for subtitles. + (\titlezzz): end with \relax, to avoid misinterpretation of a + following `plus' or `minus' + (\page (inside \titlepage)): call \finishtitlepage. + (\Etitlepage): call \finishtitlepage, if it hasn't been. + (\finishtitlepage): new macro to print a rule and leave some space + at the bottom of the title page. + (\iffinishedtitlepage): new; says whether \finishtitlepage has been + called. + +Mon Nov 6 21:35:34 1989 Robert J. Chassell (bob at rice-chex) + + * texinfo.tex: Replaced `GNU CC' in the copyleft of this file with + the phrase `this texinfo.tex file'. + +Fri Oct 27 10:36:32 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\setfilename): Do nothing except 1st time used. + (\titlepage): Brace misplaced in \titlezzz. + (\indexdummies, \indexnofonts): Handle @w. + + (\readauxfile): Set \ifhavexrefs true. + (\refX): Warn for every use of an undefined xref, + but if no xref values are known, warn just once that none are known. + +Tue Sep 19 04:12:51 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\xrefX): Go back to `section N [Foo], page M'. + (\exp): Delete it. + +Mon Sep 18 15:29:30 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\chapentryfonts): Try using \rm for chap title. + +Tue Sep 12 03:41:10 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlepage): Missing closeparen after \title. + Delete excess paren after \page. + + * texinfo.tex (\samp): Use \tclose. + +Mon Sep 11 23:28:04 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\tclose): Make `@ ' a full-width space. + +Sat Sep 9 20:11:29 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\balancecolumns): Handle properly the case where + the index ends before one page is output, so \partialpage is nonempty. + In this case we may need to output two pages if the data + would just barely fit if not for \partialpage. + +Wed Aug 30 22:45:31 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\refx): New 2nd operand, output if xref is non-null. + (\xrefX): Use that to output the comma after the section number. + (\appendixnoderef, \appendixsetref, \Yappendixletterandtype): + Define xrefs for appendices that say "Appendix N". + Used in \appendix, \appendixsec, etc. + + * texinfo.tex (\smartitalic): The actual italic correction was omitted. + +Mon Aug 28 00:21:33 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) + + * texinfo.tex (\ref): New kind of cross-reference. + (\xrefX): Put single quotes around section name. + (\refx): Allow hyphenation in `undefined'. + + * texinfo.tex (+): Make it active. + (Altmode): Delete active defn. + + * texinfo.tex (\defunargs): Prevent hyphenation at `-' in args. + Move the penalty at the end so that it works. + (\defvarargs): Move the penalty at the end so that it works. + + * texinfo.tex (\defparsebody): Do increase right margin. + + * texinfo.tex (\defbodyindent): Now .4 inch. + + * texinfo.tex (\point, \result, \expansion, \print, \equiv, \error): + New macros for Lisp manual. + + * texinfo.tex (\tex): Set = to code 12. + + * texinfo.tex (\entry): Hairier way to output dots. + + * texinfo.tex (\kbd): If arg consists of one \key command, be a no op. + + * texinfo.tex (\sc): Delete spurious \. + + * texinfo.tex (\smartitalic): New macro, does italic correction at end. + (\i, \var, \dfn, \emph, \cite): Use that. + + * texinfo.tex (\node): Do \ENVcheck. + + * texinfo.tex (\initial): Infinite penalty at end. + + * texinfo.tex (\chapternofonts): New macro, sets \code, etc. to + output selves into file. Also undef \frenchspacing and \rawbackslash. + (\xhapterzzz, etc.): Call that. Make a group to undo it. + (\indexdummies): Do like \chapternofonts. + +Sun Aug 27 16:05:23 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) + + * texinfo.tex (\frenchspacing): Our own definition, using + decimal numbers for all character codes. The standard one fails. + + * texinfo.tex (\indexnofonts): Handle \file, \tt, and many more. + +Fri Aug 25 22:05:24 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) + + * texinfo.tex (\chapter, etc.): Undefine \tclose around \edef\temp. + +Mon Aug 21 15:42:47 1989 Richard Stallman (rms at apple-gunkies.ai.mit.edu) + + * texinfo.tex (\tclose): Like \t but make space same width + as in surrounding text. + (\code, \kbd): Use \tclose. + +Tue Jul 4 20:53:52 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (titlepage): Don't set \everypar; start just one group. + See comments in the code. + + * texinfo.tex (defop,defcv): Use defopparsebody. + * texinfo.tex (defopparsebody): Like defmethparsebody but defines + def...x for more arguments. + +Sat Jun 17 13:49:13 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\titlepage): Rename @subtext, etc., to @subtitle, etc. + + * texinfo.tex (\titlepage): Don't print the title automatically. + Define @title to print it, and the rule underneath it. + This should make @titlepage upward compatible with the old one. + + * texinfo.tex (\titlepage): Revert local definition of @page + to previous. Don't print a rule. + +Mon Jun 12 20:49:17 1989 Karl Berry. (karl at mote) + + * texinfo.tex (\titlepage): allow intensional definition of the + items on the title page. New control sequences (allowed only + within the titlepage environment:) + (@subtext): may take either a paragraph (e.g., a brief + description of the program) or just a line (e.g., the date). + May appear more than once. + (@author): must come after all the @subtext's. Can appear more + than once, also. + Also, use the title defined by @settitle. + (\subtextfont, \authorfont): switch to using the appropriate + fonts with appropriate leading. + (\titlepagetopglue, \titlepagebottomglue): define space that + never stretches or shrinks. + (\realeverypar): formatting for the @subtext's. + +Sun Jun 4 15:04:59 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (\shortchapentry, \shortunnumberedentry): + Use dots, right justify page numbers. Don't use italics. + +Fri Jun 2 14:40:28 1989 Karl Berry. (karl at mote) + + * texinfo.tex (\entry, \secondary): use plain TeX \dotfill for + better leaders than the homegrown one. + (\Dotsbox): Deleted. + (\dotfill): Deleted; use Plain TeX definition. + +Wed May 31 17:19:30 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (ignore): Undefine the chapter/section macros + while reading the args, since they are \outer. + (ifinfo): Likewise + (ifsetxxx, ifclearxxx): Call another macro to parse the + conditionalized text, and do to that macro as with \ignore. + +Tue May 30 15:04:37 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex (unnumbered): Change back from \long to \outer. + + * texinfo.tex: Changes by Karl Berry for toc format. + Rewrite the table of contents for appearance's sake. Add a + synonym for \summarycontents, \shortcontents, since that is the + traditional name. Two subroutines are now shared by \contents and + \summarycontents: \prepareforcontents, to reset the page number + and such; and \startcontents, which begins the \unnumbered and + resets catcodes before \input \jobname.toc. Some other macros -- + \labelspace, \dopageno, \shortpageno -- are shared by the printing + macros. + + * texinfo.tex (\truesecrm): New font, section-size roman, used in the + new toc. (cmr12) + +Sun May 28 07:25:42 1989 Karl Berry. (karl at mote) + + * texinfo.tex (\eatinput): Do not print the `\input texinfo' if a + .fmt file is being used; ignore it, instead. This is the initial + definition for `\' now. + (\fixbackslash): on the other hand, subsequent backslashes should + be printed, and if the file does not have an `\input texinfo', the + first one should be printed. This new macro makes the definition + for `\' be \normalbackslash, if it is \eatinput. + (\setfilename): use \fixbackslash. + +Wed May 24 15:34:59 1989 Joseph Arceneaux (jla at apple-gunkies.ai.mit.edu) + + * texinfo.tex: Changed def of unnumbered from \outer to \long. + +Tue May 23 12:27:59 1989 Karl Berry. (karl at mote) + + * texinfo.tex: Allow one to make a texinfo.fmt file (with the + invocation: + initex \&plain texinfo + and then saying + @dump + after texinfo.tex has been read. + Changes: + (\setfilename): Instead of being a no-op, read the xref info, and + open the contents and index files. These actions were done as + texinfo.tex was read before. + (\opencontents, \openindices): new macros to open those files. + (\readauxfile): and one to read the aux file. + +Sat Apr 29 22:28:02 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex: `@headings on' no longer does a page break. + +Sun Apr 2 11:22:29 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex: Defined `@headings single' and `@headings double'. + `@headings on' picks one of them: `@setchapternewpage odd' + says `@headings on' means double; otherwise it means single. + +Mon Jan 30 22:00:35 1989 Robert J. Chassell (bob at rice-krispies.ai.mit.edu) + + * texinfo.tex: Changed the size of the subsection fonts so they + are scaled at13pt rather than at magstep 2. This makes them + smaller than the section fonts, which are scaled at magstep 2. + In addition, changed the ssecrm font from cmbx to cmb. + +Fri Jan 6 15:00:44 1989 Richard Stallman (rms at sugar-bombs.ai.mit.edu) + + * texinfo.tex: Changed @lisp, @smalllisp, @display not to change + the right margin. + +Mon Dec 5 22:01:49 1988 Robert J. Chassell (bob at rice-krispies.ai.mit.edu) + + * texinfo.tex: Tested the use of `cmbx10' vrs `cmb10' font and + stayed with cmb10 font since cmb10 looks better when the bold face + is part of a sentence although the cmbx10 font looks better on its own. + +Mon Aug 15 14:33:51 1988 Robert J. Chassell (bob at spiff) + + * texinfo.tex: Changed the (undocumented) @today command from a + Month Day, Year format to a Day Month Year format. Left old + version commented out. + + +Local Variables: +mode: indented-text +left-margin: 8 +fill-column: 76 +version-control: never +End: diff --git a/gnu/usr.bin/texinfo/INSTALL b/gnu/usr.bin/texinfo/INSTALL index a2c8722ccaf..50dbe439d09 100644 --- a/gnu/usr.bin/texinfo/INSTALL +++ b/gnu/usr.bin/texinfo/INSTALL @@ -167,7 +167,9 @@ operates. `--quiet' `--silent' `-q' - Do not print messages saying which checks are being made. + Do not print messages saying which checks are being made. To + suppress all normal output, redirect it to `/dev/null' (any error + messages will still be shown). `--srcdir=DIR' Look for the package's source code in directory DIR. Usually diff --git a/gnu/usr.bin/texinfo/INTRODUCTION b/gnu/usr.bin/texinfo/INTRODUCTION index 13e24f7cff6..b87e415bd3d 100644 --- a/gnu/usr.bin/texinfo/INTRODUCTION +++ b/gnu/usr.bin/texinfo/INTRODUCTION @@ -1,3 +1,12 @@ +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01 +Free Software Foundation, Inc. + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. + + Getting Started with Texinfo ============================ diff --git a/gnu/usr.bin/texinfo/NEWS b/gnu/usr.bin/texinfo/NEWS index 18423d50121..76d5a742486 100644 --- a/gnu/usr.bin/texinfo/NEWS +++ b/gnu/usr.bin/texinfo/NEWS @@ -1,5 +1,77 @@ +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02 +Free Software Foundation, Inc. + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. + This file records noteworthy changes. + +*** IMPORTANT NEWS FOR ALL AUTHORS OF TEXINFO MANUALS *** + +As of version 4.2, Texinfo has a new command @copying to define the +copyright and copying permissions for a manual. It's important to +switch to using it as soon as possible (as in your next release), +because the historical method of doing copyright permissions using +@ifinfo failed to output copyright information in the HTML (or XML) +formats. The manual has detailed explanations and examples. For +convenience, here's a url to one of the relevant sections: + http://texinfo.org/manual/Document-Permissions.html + + + +4.2 (1 April 2002) +* Language: + . new command @copying to define copying permissions. See above. + . new conditionals @ifplaintext, @ifnotplaintext for the plain text + (--no-headers) output format. + . new command @\ to produce literal \ inside @math, since \ by itself + no longer works. +* makeinfo: + . emit accesskey attributes for keyboard shortcuts to menu items. + . @{even,every,odd}{footing,header} are ignored by makeinfo now, so + they no longer need to be enclosed in @iftex. +* texinfo.tex: + . bug fix for pdf-format table of contents. +* info: + . bug fixes for -R (--raw-escapes). + . --help shows short option names. +* Distribution: + . the doc.c, funs.h, and key.c files in info/ are no longer generated + at make time, to appease Automake's make distcheck. + . gettext 0.11.1, autoconf 2.53, automake 1.6 (with install-info kludge). + + + +4.1 (4 March 2002) +* Language: + . new commands @verbatim and @verb for printing verbatim inserts. + . new command @verbatiminclude for verbatim include of files. + . new environment @documentdescription for defining the HTML description. + . new command @afivepaper for the A5 paper size. +* makeinfo: + . supports xml and docbook output. + . supports HTML splitting by node, which is now the default. + . new option --split-size to control maximum size of split info files. +* info: + . user-specified key bindings supported. + . ANSI escape sequences (as produced by groff) removed from man output + by default; use --raw-escapes to let them through if your terminal + supports them. +* texinfo.tex: + . @math implies @tex, so all the usual plain TeX math is supported. + . smaller fonts for @smallexample, in all page sizes. + . improvements in the PDF support. +* texi2dvi: + . new option -o to explicitly specify output filename. +* Distribution: + . switch to GNU Free Documentation License (http://www.gnu.org/copyleft/). + . update to GNU gettext 0.11, autoconf 2.52, and automake 1.5. + . Danish, Swedish, and Hebrew message translations. + + 4.0 (28 September 1999) * Language: . New command @anchor for cross references to arbitrary points. @@ -34,6 +106,7 @@ This file records noteworthy changes. . @emph and @i use true italic type (cmti) instead of slanted (cmsl). . implements pdf output when run with pdftex. . better support for internationalization via txi-??.tex files. + . footnotes now set in a smaller point size. * makeinfo: . supports HTML output with the --html option. . implication of --html: @top nodes should be wrapped in @ifnottex diff --git a/gnu/usr.bin/texinfo/README b/gnu/usr.bin/texinfo/README index 0b865efc648..84854944a9d 100644 --- a/gnu/usr.bin/texinfo/README +++ b/gnu/usr.bin/texinfo/README @@ -1,31 +1,42 @@ +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02 +Free Software Foundation, Inc. + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. + + This is the README file for the GNU Texinfo distribution. -The primary distribution point is ftp://ftp.gnu.org/gnu/texinfo/. +The primary distribution point is ftp://ftp.gnu.org/gnu/texinfo/ +and the primary home page is http://www.gnu.org/software/texinfo/, +secondary home page at http://texinfo.org/. Mailing lists: - bug-texinfo@gnu.org for bug reports or enhancement suggestions, - archived at ftp://ftp-mailing-list-archives.gnu.org/. + archived at ftp://ftp-mailing-list-archives.gnu.org/bug-texinfo/. - help-texinfo@gnu.org for authoring questions and general discussion. - archived at the same place. -- texinfo-pretest@tug.org for pretests of new releases, - archived at http://tug.org/archives/texinfo-pretest/. + archived at ftp://ftp-mailing-list-archives.gnu.org/help-texinfo/. +- texinfo-pretest@texinfo.org for pretests of new releases, + archived at ftp://ftp.texinfo.org/texinfo/texinfo-pretest-archive/. There are as yet no corresponding newsgroups. For bug reports, please include enough information for the maintainers to reproduce the problem. Generally speaking, that means: +- the contents of any input files necessary to reproduce the bug (crucial!). +- a description of the problem and any samples of the erroneous output. - the version number of Texinfo and the program(s) involved (use --version). - hardware, operating system, and compiler versions (uname -a). - any unusual options you gave to configure (see config.status). -- the contents of any input files necessary to reproduce the bug (crucial!). -- a description of the problem and any samples of the erroneous output. - anything else that you think would be helpful. Patches are most welcome; if possible, please make them with diff -c and include ChangeLog entries. When sending email, please do not encode or split the messages in any -way if at all possible; it's much easier to deal with one large message -than many small ones. GNU shar is a convenient way of packaging -multiple and/or binary files for email. +way if at all possible; it's easier to deal with one large message than +many small ones. GNU shar is a convenient way of packaging multiple +and/or binary files for email. For generic installation instructions on compiling and installing this @@ -47,7 +58,7 @@ Installation notes specific to Texinfo: to config.h after running configure. * For instructions on compiling this distribution with DJGPP tools - for MS-DOS and MS-Windows, please see the file djgpp/README. + for MS-DOS and MS-Windows, see the file djgpp/README. If you would like to contribute to the GNU project by implementing @@ -56,11 +67,14 @@ great. But please do not write a separate translator texi2foo for your favorite format foo! That is the hard way to do the job, and makes extra work in subsequent maintenance, since the Texinfo language is continually being enhanced and updated. Instead, the best approach is -modify Makeinfo to generate the new format, as it does now for Info and HTML. +modify Makeinfo to generate the new format, as it does now for Info, +HTML, XML, and DocBook. +If you want to convert from DocBook to Texinfo, please see +http://docbook2X.sourceforge.net/. -This distribution includes the following files, among others: +This distribution includes the following files, among others: README This file. NEWS Summary of new features by release. @@ -70,7 +84,6 @@ This distribution includes the following files, among others: Texinfo source files in this distribution. Texinfo source files (in ./doc): - texinfo.txi Describes the Texinfo language and many of the associated tools. It tells how to use Texinfo to write documentation, @@ -93,7 +106,6 @@ Texinfo source files (in ./doc): source (./info). Printing related files: - doc/texinfo.tex This TeX definitions file tells the TeX program how to typeset a Texinfo file into a DVI file ready for @@ -121,7 +133,6 @@ Source files for standalone C programs (./lib, ./makeinfo, ./info): view Info files on an ASCII terminal. Installation files: - configure This file creates creates a Makefile which in turn creates an `info' or `makeinfo' executable, or a C sources @@ -139,7 +150,6 @@ Installation files: Other files: - fixfonts This is a shell script to install the `lcircle10' TeX fonts as an alias for the `circle10' fonts. In some older diff --git a/gnu/usr.bin/texinfo/TODO b/gnu/usr.bin/texinfo/TODO index a06b40c68f3..295a11cf790 100644 --- a/gnu/usr.bin/texinfo/TODO +++ b/gnu/usr.bin/texinfo/TODO @@ -1,21 +1,26 @@ +Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 99, 2000, 01, 02 +Free Software Foundation. + +Permission is granted to copy, distribute and/or modify this document +under the terms of the GNU Free Documentation License, Version 1.1 or +any later version published by the Free Software Foundation; with no +Invariant Sections, with no Front-Cover Texts, and with no Back-Cover Texts. + + If you are interested in working on any of these, email bug-texinfo@gnu.org. * Makeinfo: - - Support output of Docbook format and SGML-Tools format. - - Support output of true 8-bit characters from accent commands, etc. + - Try directory of main source file. + - Support @`{@dotless{i}} et al. in HTML. - A detexinfo program, like detex or delatex. This command would strip all the texinfo commands out, and would be used as a filter on the way to a speller. An option would be to NOT strip comments out. makeinfo --no-headers comes close. - If node name contains an @ command, complain explicitly. - - Better ASCII output: convert menus to single table of contents, - enumerate chapters and sections, convert cross-refs and indices to - chapter/section references. See: - ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp/v2/faq201s.zip - - Call Ghostscript to get ASCII output for the @image command. + - Call Ghostscript to get ASCII/jpg output for the @image command. - Better HTML output: allow settable background color, table colors and spacing, <head> meta tags, back link from footnote marker, etc. - - Could warn if @sc{TEXT} for all-caps TEXT, since it's a no-op. + - Rewrite completely to simplify generation of different formats. * TeX: - Use @ as the escape character, and Texinfo syntax generally, in the @@ -23,16 +28,19 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org. multiple redefinitions of every Texinfo command in different contexts. - Handle @hsep and @vsep in @multitables. - Introduce new command to change \bindingoffset. + - Reasonable way to change fonts from the default (some work has been + done), to allow for PostScript fonts, for example. - How about using latex2html to produce HTML? + - Support 8-bit input characters, perhaps via the ec fonts. + - Repeat table headings if a @multitable is multiple pages long. + - Table of contents gets misaligned if there are 10 or more [sub]sections. * General: - - Better i18n support, including support for 8-bit input characters, - and 8-bit output in info. Perhaps have to use the ec fonts. - - Support compressed image files, automatic generation of .txt - or .jpg from .eps by Ghostscript. + - Rationalize and improve the dir categories in existing manuals. + - @xindexterm [def] primary [,secondary [,tertiary]] or some such? + - Support compressed image files. - Handle reference card creation, perhaps by only paying attention to sectioning and @def... commands. - - Allow : in node names for info files, for names like `class::method'. - Allow @end (and other?) commands to be indented in the source. - Get Info declared as a MIME Content-Type. @@ -45,29 +53,34 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org. @caption ... @end caption <arbitrary Texinfo commands> @end figure + - multicolumn * width to take up `the rest'. + - another table command to take N succeeding items and split them + into M columns (see eplain). - support bibliographies with BibTeX (see web2c/doc for kludge prototype). - @flushboth to combine @flushleft and @flushright, for RFC's. - @part sectioning command. - Allow subitems and `see' and `see also' in indices. - - @verbatim ... @end verbatim. - @exercise/@answer command for, e.g., gawk. - Allow @hsep/@vsep at @item, instead of just in template. - - The dark corner symbol for the gawk manual. - Support automatic line numbering of examples. + - Better macro syntax. + - Allow : in node names for info files, for names like + `class::method'. Likewise index entries. A quoting mechanism such + as surrounding node names with SPACE BACKSPACE is probably the best + solution, although this is an incompatible change to Info format, sigh. - Change bars. This is difficult or impossible in TeX, unfortunately. To do it right requires device driver support. - wdiff or ediff may be better in some cases, anyway. + wdiff or ediff may be all we can do. * Doc: - Include a complete functional summary, as in a reference card, in the manual. - - Improve the manuals for makeinfo, standalone info, etc. - - Page 39, need a new section on doing dedication pages. See gawk.texi + - Improve the manuals, especially for makeinfo, standalone info, etc. + - new section on doing dedication pages. See gawk.texi for an example of doing it in both the tex and info versions. * Info: - Regular expression search. - - Allow key rebinding, perhaps through the readline library. - Full-text search across all info files installed on the system. - Support character sets other than ISO Latin 1. - Perhaps comply with LANGUAGE setting on a per-node basis, to allow @@ -75,21 +88,32 @@ If you are interested in working on any of these, email bug-texinfo@gnu.org. - Search all nodes of dir file at startup, then can have INFO-DIR-SEPARATE-GROUPS and other such. - Better dir file merging. - - Steal interface ideas from Lynx: TAB for navigating to next link - within a page, number links, use color, etc. Perhaps code from the pinfo - viewer can be reused: http://zeus.polsl.gliwice.pl/~pborys/. + - Steal interface ideas from Lynx: number links, use color, etc. + Perhaps code from the pinfo viewer can be reused: + http://zeus.polsl.gliwice.pl/~pborys/. + - More sample .infokey files, so people can choose without writing their own. - q within help should quit help like C-x 0. - Incorporate an X-based viewer, perhaps tkinfo http://www.math.ucsb.edu/~boldt/tkinfo/ or saxinfo. - - Perhaps process Texinfo files directly instead of converting to Info: - ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/tkman.tar.Z - + ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/rman.tar.Z - + Tcl/Tk 8.0 from ftp.smli.com in the /pub/tcl directory. - From: phelps@ecstasy.CS.Berkeley.EDU (Tom Phelps) - (But this has the disadvantage of needing to be updated when the - Texinfo language changes, so don't.) -* Install-info: +* PDF: + - make each letter of the index (A, B, ...) a section in the TOC. + From Carsten Dominik <dominik@astro.uva.nl>. + + +* install-info: - be able to copy the info file to compile-time $(infodir), to simplify by-hand installation. + + +Ideas that will not be implemented: +- Process Texinfo files directly instead of converting to Info: + ftp://ftp.cs.berkeley.edu/ucb/people/phelps/tcltk/tkman.tar.Z, which + uses Tcl/Tk 8.0 from ftp.smli.com in the /pub/tcl directory. + From: phelps@ecstasy.CS.Berkeley.EDU (Tom Phelps) + [This has the disadvantage of needing to be updated when the + Texinfo language changes, so don't.] + +- Split HTML output by chapter. + [Then cross-references in HTML cannot be generated consistently.] diff --git a/gnu/usr.bin/texinfo/aclocal.m4 b/gnu/usr.bin/texinfo/aclocal.m4 index 20d3fd0b45e..39a76cdd998 100644 --- a/gnu/usr.bin/texinfo/aclocal.m4 +++ b/gnu/usr.bin/texinfo/aclocal.m4 @@ -1,16 +1,17 @@ -dnl aclocal.m4 generated automatically by aclocal 1.4 +# aclocal.m4 generated automatically by aclocal 1.6 -*- Autoconf -*- -dnl Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -dnl This file is free software; the Free Software Foundation -dnl gives unlimited permission to copy and/or distribute it, -dnl with or without modifications, as long as this notice is preserved. +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. -dnl This program is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without -dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A -dnl PARTICULAR PURPOSE. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. -# $Id: aclocal.m4,v 1.1.1.3 2000/02/09 01:23:55 espie Exp $ +# $Id: aclocal.m4,v 1.1.1.4 2002/06/10 13:20:08 espie Exp $ # Source file used by aclocal in generating aclocal.m4. #serial 3 @@ -101,84 +102,301 @@ AC_DEFUN(txi_CHECK_DECLS, jm_CHECK_DECLARATIONS($headers, strerror strcasecmp strncasecmp strcoll) ]) -# Like AC_CONFIG_HEADER, but automatically create stamp file. - -AC_DEFUN(AM_CONFIG_HEADER, -[AC_PREREQ([2.12]) -AC_CONFIG_HEADER([$1]) -dnl When config.status generates a header, we must update the stamp-h file. -dnl This file resides in the same directory as the config header -dnl that is generated. We must strip everything past the first ":", -dnl and everything past the last "/". -AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl -ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>, -<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>, -<<am_indx=1 -for am_file in <<$1>>; do - case " <<$>>CONFIG_HEADERS " in - *" <<$>>am_file "*<<)>> - echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx - ;; - esac - am_indx=`expr "<<$>>am_indx" + 1` -done<<>>dnl>>) -changequote([,]))]) - -# Do all the work for Automake. This macro actually does too much -- -# some checks are only needed if your package does certain things. -# But this isn't really a big deal. - -# serial 1 - -dnl Usage: -dnl AM_INIT_AUTOMAKE(package,version, [no-define]) - -AC_DEFUN(AM_INIT_AUTOMAKE, -[AC_REQUIRE([AC_PROG_INSTALL]) -PACKAGE=[$1] -AC_SUBST(PACKAGE) -VERSION=[$2] -AC_SUBST(VERSION) -dnl test to see if srcdir already configured -if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then +# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*- + +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +AC_PREREQ([2.52]) + +# serial 6 + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. We must strip everything past the first ":", +# and everything past the last "/". + +# _AM_DIRNAME(PATH) +# ----------------- +# Like AS_DIRNAME, only do it during macro expansion +AC_DEFUN([_AM_DIRNAME], + [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1, + m4_if(regexp([$1], [^//\([^/]\|$\)]), -1, + m4_if(regexp([$1], [^/.*]), -1, + [.], + patsubst([$1], [^\(/\).*], [\1])), + patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])), + patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl +])# _AM_DIRNAME + + +# The stamp files are numbered to have different names. +# We could number them on a directory basis, but that's additional +# complications, let's have a unique counter. +m4_define([_AM_STAMP_Count], [0]) + + +# _AM_STAMP(HEADER) +# ----------------- +# The name of the stamp file for HEADER. +AC_DEFUN([_AM_STAMP], +[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl +AS_ESCAPE(_AM_DIRNAME(patsubst([$1], + [:.*])))/stamp-h[]_AM_STAMP_Count]) + + +# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS) +# ------------------------------------------------------------ +# We used to try to get a real timestamp in stamp-h. But the fear is that +# that will cause unnecessary cvs conflicts. +AC_DEFUN([_AM_CONFIG_HEADER], +[# Add the stamp file to the list of files AC keeps track of, +# along with our hook. +AC_CONFIG_HEADERS([$1], + [# update the timestamp +echo 'timestamp for $1' >"_AM_STAMP([$1])" +$2], + [$3]) +])# _AM_CONFIG_HEADER + + +# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS) +# -------------------------------------------------------------- +AC_DEFUN([AM_CONFIG_HEADER], +[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])]) +])# AM_CONFIG_HEADER + +# Do all the work for Automake. -*- Autoconf -*- + +# This macro actually does too much some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 8 + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +AC_PREREQ([2.52]) + +# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow +# the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl +# test to see if srcdir already configured +if test "`cd $srcdir && pwd`" != "`pwd`" && + test -f $srcdir/config.status; then AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) fi -ifelse([$3],, -AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])) -AC_REQUIRE([AM_SANITY_CHECK]) -AC_REQUIRE([AC_ARG_PROGRAM]) -dnl FIXME This is truly gross. -missing_dir=`cd $ac_aux_dir && pwd` -AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir) -AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir) -AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir) -AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir) -AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir) -AC_REQUIRE([AC_PROG_MAKE_SET])]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl + AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl + AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) + AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG(ACLOCAL, "aclocal-${am__api_version}") +AM_MISSING_PROG(AUTOCONF, autoconf) +AM_MISSING_PROG(AUTOMAKE, "automake-${am__api_version}") +AM_MISSING_PROG(AUTOHEADER, autoheader) +AM_MISSING_PROG(MAKEINFO, makeinfo) +AM_MISSING_PROG(AMTAR, tar) +AM_PROG_INSTALL_SH +AM_PROG_INSTALL_STRIP +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl + +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_][CC], + [_AM_DEPENDENCIES(CC)], + [define([AC_PROG_][CC], + defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl +AC_PROVIDE_IFELSE([AC_PROG_][CXX], + [_AM_DEPENDENCIES(CXX)], + [define([AC_PROG_][CXX], + defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl +]) +]) + +# Copyright 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"]) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION so it can be traced. +# This function is AC_REQUIREd by AC_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], + [AM_AUTOMAKE_VERSION([1.6])]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# ------------------------------ +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) + +# _AM_SET_OPTIONS(OPTIONS) +# ---------------------------------- +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) # # Check to make sure that the build environment is sane. # -AC_DEFUN(AM_SANITY_CHECK, +# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], [AC_MSG_CHECKING([whether build environment is sane]) # Just in case sleep 1 -echo timestamp > conftestfile +echo timestamp > conftest.file # Do `set' in a subshell so we don't clobber the current shell's # arguments. Must try -L first in case configure is actually a # symlink; some systems play weird games with the mod time of symlinks # (eg FreeBSD returns the mod time of the symlink's containing # directory). if ( - set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null` - if test "[$]*" = "X"; then + set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` + if test "$[*]" = "X"; then # -L didn't work. - set X `ls -t $srcdir/configure conftestfile` + set X `ls -t $srcdir/configure conftest.file` fi - if test "[$]*" != "X $srcdir/configure conftestfile" \ - && test "[$]*" != "X conftestfile $srcdir/configure"; then + rm -f conftest.file + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then # If neither matched, then we have a broken ls. This can happen # if, for instance, CONFIG_SHELL is bash and it inherits a @@ -188,7 +406,7 @@ if ( alias in your environment]) fi - test "[$]2" = conftestfile + test "$[2]" = conftest.file ) then # Ok. @@ -197,421 +415,1968 @@ else AC_MSG_ERROR([newly created file is older than distributed files! Check your system clock]) fi -rm -f conftest* AC_MSG_RESULT(yes)]) -dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY) -dnl The program must properly implement --version. -AC_DEFUN(AM_MISSING_PROG, -[AC_MSG_CHECKING(for working $2) -# Run test in a subshell; some versions of sh will print an error if -# an executable is not found, even if stderr is redirected. -# Redirect stdin to placate older versions of autoconf. Sigh. -if ($2 --version) < /dev/null > /dev/null 2>&1; then - $1=$2 - AC_MSG_RESULT(found) -else - $1="$3/missing $2" - AC_MSG_RESULT(missing) -fi +# -*- Autoconf -*- + + +# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 3 + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} AC_SUBST($1)]) -# Define a conditional. -AC_DEFUN(AM_CONDITIONAL, -[AC_SUBST($1_TRUE) -AC_SUBST($1_FALSE) -if $2; then - $1_TRUE= - $1_FALSE='#' +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it supports --run. +# If it does, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" +# Use eval to expand $SHELL +if eval "$MISSING --run true"; then + am_missing_run="$MISSING --run " else - $1_TRUE='#' - $1_FALSE= -fi]) + am_missing_run= + AC_MSG_WARN([`missing' script is too old or missing]) +fi +]) + +# AM_AUX_DIR_EXPAND + +# Copyright 2001 Free Software Foundation, Inc. -dnl From Jim Meyering. +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. -# serial 1 +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. -AC_DEFUN(AM_SYS_POSIX_TERMIOS, -[AC_CACHE_CHECK([POSIX termios], am_cv_sys_posix_termios, - [AC_TRY_LINK([#include <sys/types.h> -#include <unistd.h> -#include <termios.h>], - [/* SunOS 4.0.3 has termios.h but not the library calls. */ - tcgetattr(0, 0);], - am_cv_sys_posix_termios=yes, - am_cv_sys_posix_termios=no)]) +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to +# `$srcdir', `$srcdir/..', or `$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is `.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +# Rely on autoconf to set up CDPATH properly. +AC_PREREQ([2.50]) + +AC_DEFUN([AM_AUX_DIR_EXPAND], [ +# expand $ac_aux_dir to an absolute path +am_aux_dir=`cd $ac_aux_dir && pwd` ]) -dnl From Jim Meyering. +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. + +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +install_sh=${install_sh-"$am_aux_dir/install-sh"} +AC_SUBST(install_sh)]) + +# AM_PROG_INSTALL_STRIP + +# Copyright 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# One issue with vendor `install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in `make install-strip', and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using `strip' when the user +# run `make install-strip'. However `strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the `STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be `maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# serial 1 +# serial 4 -*- Autoconf -*- -AC_DEFUN(AM_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL, -[AC_REQUIRE([AM_SYS_POSIX_TERMIOS]) - AC_CACHE_CHECK([whether use of TIOCGWINSZ requires sys/ioctl.h], - am_cv_sys_tiocgwinsz_needs_sys_ioctl_h, - [am_cv_sys_tiocgwinsz_needs_sys_ioctl_h=no +# Copyright 1999, 2000, 2001 Free Software Foundation, Inc. - gwinsz_in_termios_h=no - if test $am_cv_sys_posix_termios = yes; then - AC_EGREP_CPP([yes], - [#include <sys/types.h> -# include <termios.h> -# ifdef TIOCGWINSZ - yes -# endif - ], gwinsz_in_termios_h=yes) - fi +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. - if test $gwinsz_in_termios_h = no; then - AC_EGREP_CPP([yes], - [#include <sys/types.h> -# include <sys/ioctl.h> -# ifdef TIOCGWINSZ - yes -# endif - ], am_cv_sys_tiocgwinsz_needs_sys_ioctl_h=yes) - fi - ]) - if test $am_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then - AC_DEFINE(GWINSZ_IN_SYS_IOCTL,1, - [Define if TIOCGWINSZ requires sys/ioctl.h]) +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + + +# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "GCJ", or "OBJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +ifelse([$1], CC, [depcc="$CC" am_compiler_list=], + [$1], CXX, [depcc="$CXX" am_compiler_list=], + [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'] + [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named `D' -- because `-MD' means `put the output + # in D'. + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` fi + for depmode in $am_compiler_list; do + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + echo '#include "conftest.h"' > conftest.c + echo 'int i;' > conftest.h + echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf + + case $depmode in + nosideeffect) + # after this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + none) break ;; + esac + # We check with `-c' and `-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle `-M -o', and we need to detect this. + if depmode=$depmode \ + source=conftest.c object=conftest.o \ + depfile=conftest.Po tmpdepfile=conftest.TPo \ + $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 && + grep conftest.h conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) ]) -# Macro to add for using GNU gettext. -# Ulrich Drepper <drepper@cygnus.com>, 1995. + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES +AC_DEFUN([AM_SET_DEPDIR], +[rm -f .deps 2>/dev/null +mkdir .deps 2>/dev/null +if test -d .deps; then + DEPDIR=.deps +else + # MS-DOS does not allow filenames that begin with a dot. + DEPDIR=_deps +fi +rmdir .deps 2>/dev/null +AC_SUBST([DEPDIR]) +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE(dependency-tracking, +[ --disable-dependency-tracking Speeds up one-time builds + --enable-dependency-tracking Do not reject slow dependency extractors]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH]) +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +#serial 2 + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[for mf in $CONFIG_FILES; do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue + # Extract the definition of DEP_FILES from the Makefile without + # running `make'. + DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"` + test -z "$DEPDIR" && continue + # When using ansi2knr, U may be empty or an underscore; expand it + U=`sed -n -e '/^U = / s///p' < "$mf"` + test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR" + # We invoke sed twice because it is the simplest approach to + # changing $(DEPDIR) to its actual value in the expansion. + for file in `sed -n -e ' + /^DEP_FILES = .*\\\\$/ { + s/^DEP_FILES = // + :loop + s/\\\\$// + p + n + /\\\\$/ b loop + p + } + /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done +done +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. # -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each `.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Copyright 2001 Free Software Foundation, Inc. -*- Autoconf -*- + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. + +# serial 2 + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +doit: + @echo done +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# We grep out `Entering directory' and `Leaving directory' +# messages which can occur if `w' ends up in MAKEFLAGS. +# In particular we don't look at `^make:' because GNU make might +# be invoked under some other name (usually "gmake"), in which +# case it prints its new name instead of `make'. +if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then + am__include=include + am__quote= + _am_result=GNU +fi +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then + am__include=.include + am__quote="\"" + _am_result=BSD + fi +fi +AC_SUBST(am__include) +AC_SUBST(am__quote) +AC_MSG_RESULT($_am_result) +rm -f confinc confmf +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA +# 02111-1307, USA. # serial 5 -AC_DEFUN(AM_WITH_NLS, - [AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) +AC_PREREQ(2.52) - USE_INCLUDED_LIBINTL=no +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE]) +AC_SUBST([$1_FALSE]) +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([conditional \"$1\" was never defined. +Usually this means the macro was only invoked conditionally.]) +fi])]) + +# isc-posix.m4 serial 1 (gettext-0.10.40) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +# This test replaces the one in autoconf. +# Currently this macro should have the same name as the autoconf macro +# because gettext's gettext.m4 (distributed in the automake package) +# still uses it. Otherwise, the use in gettext.m4 makes autoheader +# give these diagnostics: +# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX +# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX + +undefine([AC_ISC_POSIX]) + +AC_DEFUN([AC_ISC_POSIX], + [ + dnl This test replaces the obsolescent AC_ISC_POSIX kludge. + AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) + ] +) + +# gettext.m4 serial 13 (gettext-0.11.1) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. +dnl Bruno Haible <haible@clisp.cons.org>, 2000-2002. + +dnl Macro to add for using GNU gettext. + +dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). +dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The +dnl default (if it is not specified or empty) is 'no-libtool'. +dnl INTLSYMBOL should be 'external' for packages with no intl directory, +dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. +dnl If INTLSYMBOL is 'use-libtool', then a libtool library +dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, +dnl depending on --{enable,disable}-{shared,static} and on the presence of +dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library +dnl $(top_builddir)/intl/libintl.a will be created. +dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext +dnl implementations (in libc or libintl) without the ngettext() function +dnl will be ignored. +dnl INTLDIR is used to find the intl libraries. If empty, +dnl the value `$(top_builddir)/intl/' is used. +dnl +dnl The result of the configuration is one of three cases: +dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled +dnl and used. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 2) GNU gettext has been found in the system's C library. +dnl Catalog format: GNU --> install in $(datadir) +dnl Catalog extension: .mo after installation, .gmo in source tree +dnl 3) No internationalization, always use English msgid. +dnl Catalog format: none +dnl Catalog extension: none +dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. +dnl The use of .gmo is historical (it was needed to avoid overwriting the +dnl GNU format catalogs when building on a platform with an X/Open gettext), +dnl but we keep it in order not to force irrelevant filename changes on the +dnl maintainers. +dnl +AC_DEFUN([AM_GNU_GETTEXT], +[ + dnl Argument checking. + ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , + [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT +])])])])]) + ifelse([$2], [], , [ifelse([$2], [need-ngettext], , + [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT +])])]) + define(gt_included_intl, ifelse([$1], [external], [no], [yes])) + define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) + + AC_REQUIRE([AM_PO_SUBDIRS])dnl + ifelse(gt_included_intl, yes, [ + AC_REQUIRE([AM_INTL_SUBDIR])dnl + ]) + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - AC_DEFINE(ENABLE_NLS) + ifelse(gt_included_intl, yes, [ + BUILD_INCLUDED_LIBINTL=no + USE_INCLUDED_LIBINTL=no + ]) + LIBINTL= + LTLIBINTL= + POSUB= + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + gt_use_preinstalled_gnugettext=no + ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) AC_ARG_WITH(included-gettext, [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=yes) + nls_cv_force_use_gnu_gettext=no) AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then + ]) dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If gettext or catgets are available (in this order) we - dnl use this. Else we have to fall back to GNU NLS library. - dnl catgets is only used if permitted by option --with-catgets. - nls_cv_header_intl= - nls_cv_header_libgt= - CATOBJEXT=NONE - - AC_CHECK_HEADER(libintl.h, - [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, - [AC_TRY_LINK([#include <libintl.h>], [return (int) gettext ("")], - gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) - - if test "$gt_cv_func_gettext_libc" != "yes"; then - AC_CHECK_LIB(intl, bindtextdomain, - [AC_CACHE_CHECK([for gettext in libintl], - gt_cv_func_gettext_libintl, - [AC_CHECK_LIB(intl, gettext, - gt_cv_func_gettext_libintl=yes, - gt_cv_func_gettext_libintl=no)], - gt_cv_func_gettext_libintl=no)]) - fi - - if test "$gt_cv_func_gettext_libc" = "yes" \ - || test "$gt_cv_func_gettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT) - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl - if test "$MSGFMT" != "no"; then - AC_CHECK_FUNCS(dcgettext) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr], - [CATOBJEXT=.gmo - DATADIRNAME=share], - [CATOBJEXT=.mo - DATADIRNAME=lib]) - INSTOBJEXT=.mo - fi - fi - ]) - - if test "$CATOBJEXT" = "NONE"; then - AC_MSG_CHECKING([whether catgets can be used]) - AC_ARG_WITH(catgets, - [ --with-catgets use catgets functions if available], - nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) - AC_MSG_RESULT($nls_cv_use_catgets) - - if test "$nls_cv_use_catgets" = "yes"; then - dnl No gettext in C library. Try catgets next. - AC_CHECK_LIB(i, main) - AC_CHECK_FUNC(catgets, - [AC_DEFINE(HAVE_CATGETS) - INTLOBJS="\$(CATOBJS)" - AC_PATH_PROG(GENCAT, gencat, no)dnl - if test "$GENCAT" != "no"; then - AC_PATH_PROG(GMSGFMT, gmsgfmt, no) - if test "$GMSGFMT" = "no"; then - AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) - fi - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.cat - INSTOBJEXT=.cat - DATADIRNAME=lib - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h - fi]) - fi + dnl to use. If GNU gettext is available we use this. Else we have + dnl to fall back to GNU NLS library. + + dnl Add a version number to the cache macros. + define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1)) + define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) + define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) + + AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, + [AC_TRY_LINK([#include <libintl.h> +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings;], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], + gt_cv_func_gnugettext_libc=yes, + gt_cv_func_gnugettext_libc=no)]) + + if test "$gt_cv_func_gnugettext_libc" != "yes"; then + dnl Sometimes libintl requires libiconv, so first search for libiconv. + ifelse(gt_included_intl, yes, , [ + AM_ICONV_LINK + ]) + dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL + dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) + dnl because that would add "-liconv" to LIBINTL and LTLIBINTL + dnl even if libiconv doesn't exist. + AC_LIB_LINKFLAGS_BODY([intl]) + AC_CACHE_CHECK([for GNU gettext in libintl], + gt_cv_func_gnugettext_libintl, + [gt_save_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $INCINTL" + gt_save_LIBS="$LIBS" + LIBS="$LIBS $LIBINTL" + dnl Now see whether libintl exists and does not depend on libiconv. + AC_TRY_LINK([#include <libintl.h> +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], + gt_cv_func_gnugettext_libintl=yes, + gt_cv_func_gnugettext_libintl=no) + dnl Now see whether libintl exists and depends on libiconv. + if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include <libintl.h> +extern int _nl_msg_cat_cntr; +extern int *_nl_domain_bindings; +extern +#ifdef __cplusplus +"C" +#endif +const char *_nl_expand_alias ();], + [bindtextdomain ("", ""); +return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], + [LIBINTL="$LIBINTL $LIBICONV" + LTLIBINTL="$LTLIBINTL $LTLIBICONV" + gt_cv_func_gnugettext_libintl=yes + ]) + fi + CPPFLAGS="$gt_save_CPPFLAGS" + LIBS="$gt_save_LIBS"]) fi - if test "$CATOBJEXT" = "NONE"; then - dnl Neither gettext nor catgets in included in the C library. - dnl Fall back on GNU gettext library. - nls_cv_use_gnu_gettext=yes + dnl If an already present or preinstalled GNU gettext() is found, + dnl use it. But if this macro is used in GNU gettext, and GNU + dnl gettext is already preinstalled in libintl, we update this + dnl libintl. (Cf. the install rule in intl/Makefile.in.) + if test "$gt_cv_func_gnugettext_libc" = "yes" \ + || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ + && test "$PACKAGE" != gettext; }; then + gt_use_preinstalled_gnugettext=yes + else + dnl Reset the values set by searching for libintl. + LIBINTL= + LTLIBINTL= + INCINTL= + fi + + ifelse(gt_included_intl, yes, [ + if test "$gt_use_preinstalled_gnugettext" != "yes"; then + dnl GNU gettext is not found in the C library. + dnl Fall back on included GNU gettext library. + nls_cv_use_gnu_gettext=yes fi fi if test "$nls_cv_use_gnu_gettext" = "yes"; then dnl Mark actions used to generate GNU NLS library. INTLOBJS="\$(GETTOBJS)" - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) - AC_SUBST(MSGFMT) - USE_INCLUDED_LIBINTL=yes - CATOBJEXT=.gmo - INSTOBJEXT=.mo - DATADIRNAME=share - INTLDEPS='$(top_builddir)/intl/libintl.a' - INTLLIBS=$INTLDEPS - LIBS=`echo $LIBS | sed -e 's/-lintl//'` - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h + BUILD_INCLUDED_LIBINTL=yes + USE_INCLUDED_LIBINTL=yes + LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` fi - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header /dev/null 2> /dev/null; then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + dnl Mark actions to use GNU gettext tools. + CATOBJEXT=.gmo fi + ]) - # We need to process the po/ directory. - POSUB=po + if test "$gt_use_preinstalled_gnugettext" = "yes" \ + || test "$nls_cv_use_gnu_gettext" = "yes"; then + AC_DEFINE(ENABLE_NLS, 1, + [Define to 1 if translation of program messages to the user's native language + is requested.]) else - DATADIRNAME=share - nls_cv_header_intl=intl/libintl.h - nls_cv_header_libgt=intl/libgettext.h + USE_NLS=no fi - AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) - AC_OUTPUT_COMMANDS( - [case "$CONFIG_FILES" in *po/Makefile.in*) - sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile - esac]) + fi + if test "$USE_NLS" = "yes"; then - # If this is used in GNU gettext we have to set USE_NLS to `yes' - # because some of the sources are only built for this goal. - if test "$PACKAGE" = gettext; then - USE_NLS=yes - USE_INCLUDED_LIBINTL=yes + if test "$gt_use_preinstalled_gnugettext" = "yes"; then + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + AC_MSG_CHECKING([how to link with libintl]) + AC_MSG_RESULT([$LIBINTL]) + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) + fi + + dnl For backward compatibility. Some packages may be using this. + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_DEFINE(HAVE_DCGETTEXT, 1, + [Define if the GNU dcgettext() function is already present or preinstalled.]) fi - dnl These rules are solely for the distribution goal. While doing this - dnl we only have to keep exactly one list of the available catalogs - dnl in configure.in. - for lang in $ALL_LINGUAS; do - GMOFILES="$GMOFILES $lang.gmo" - POFILES="$POFILES $lang.po" - done + dnl We need to process the po/ directory. + POSUB=po + fi + + ifelse(gt_included_intl, yes, [ + dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL + dnl to 'yes' because some of the testsuite requires it. + if test "$PACKAGE" = gettext; then + BUILD_INCLUDED_LIBINTL=yes + fi dnl Make all variables we use known to autoconf. + AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) - AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) + AC_SUBST(INTLOBJS) + + dnl For backward compatibility. Some configure.ins may be using this. + nls_cv_header_intl= + nls_cv_header_libgt= + + dnl For backward compatibility. Some Makefiles may be using this. + DATADIRNAME=share AC_SUBST(DATADIRNAME) - AC_SUBST(GMOFILES) + + dnl For backward compatibility. Some Makefiles may be using this. + INSTOBJEXT=.mo AC_SUBST(INSTOBJEXT) - AC_SUBST(INTLDEPS) - AC_SUBST(INTLLIBS) - AC_SUBST(INTLOBJS) - AC_SUBST(POFILES) - AC_SUBST(POSUB) + + dnl For backward compatibility. Some Makefiles may be using this. + GENCAT=gencat + AC_SUBST(GENCAT) + + dnl Enable libtool support if the surrounding package wishes it. + INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix + AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) ]) -AC_DEFUN(AM_GNU_GETTEXT, - [AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ -unistd.h sys/param.h]) - AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ -strdup __argz_count __argz_stringify __argz_next]) - - if test "${ac_cv_func_stpcpy+set}" != "set"; then - AC_CHECK_FUNCS(stpcpy) - fi - if test "${ac_cv_func_stpcpy}" = "yes"; then - AC_DEFINE(HAVE_STPCPY) - fi + dnl For backward compatibility. Some Makefiles may be using this. + INTLLIBS="$LIBINTL" + AC_SUBST(INTLLIBS) - AM_LC_MESSAGES - AM_WITH_NLS - - if test "x$CATOBJEXT" != "x"; then - if test "x$ALL_LINGUAS" = "x"; then - LINGUAS= - else - AC_MSG_CHECKING(for catalogs to be installed) - NEW_LINGUAS= - for lang in ${LINGUAS=$ALL_LINGUAS}; do - case "$ALL_LINGUAS" in - *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; - esac - done - LINGUAS=$NEW_LINGUAS - AC_MSG_RESULT($LINGUAS) - fi - - dnl Construct list of names of catalog files to be constructed. - if test -n "$LINGUAS"; then - for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done - fi - fi + dnl Make all documented variables known to autoconf. + AC_SUBST(LIBINTL) + AC_SUBST(LTLIBINTL) + AC_SUBST(POSUB) +]) - dnl The reference to <locale.h> in the installed <libintl.h> file - dnl must be resolved because we cannot expect the users of this - dnl to define HAVE_LOCALE_H. - if test $ac_cv_header_locale_h = yes; then - INCLUDE_LOCALE_H="#include <locale.h>" - else - INCLUDE_LOCALE_H="\ -/* The system does not provide the header <locale.h>. Take care yourself. */" - fi - AC_SUBST(INCLUDE_LOCALE_H) - - dnl Determine which catalog format we have (if any is needed) - dnl For now we know about two different formats: - dnl Linux libc-5 and the normal X/Open format - test -d intl || mkdir intl - if test "$CATOBJEXT" = ".cat"; then - AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) - - dnl Transform the SED scripts while copying because some dumb SEDs - dnl cannot handle comments. - sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed - fi - dnl po2tbl.sed is always needed. - sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ - $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed - - dnl In the intl/Makefile.in we have a special dependency which makes - dnl only sense for gettext. We comment this out for non-gettext - dnl packages. - if test "$PACKAGE" = "gettext"; then - GT_NO="#NO#" - GT_YES= - else - GT_NO= - GT_YES="#YES#" - fi - AC_SUBST(GT_NO) - AC_SUBST(GT_YES) - - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but ($top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) - - dnl *** For now the libtool support in intl/Makefile is not for real. - l= - AC_SUBST(l) - - dnl Generate list of files to be processed by xgettext which will - dnl be included in po/Makefile. - test -d po || mkdir po - if test "x$srcdir" != "x."; then - changequote(, )dnl - if test "x`echo $srcdir | sed -e 's@^[A-z]:@@' -e 's@/.*@@'`" = "x"; then - posrcprefix="$srcdir/" - else - posrcprefix="../$srcdir/" - fi - changequote([, ])dnl - else - posrcprefix="../" - fi - rm -f po/POTFILES - sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ - < $srcdir/po/POTFILES.in > po/POTFILES + +dnl Checks for all prerequisites of the po subdirectory, +dnl except for USE_NLS. +AC_DEFUN([AM_PO_SUBDIRS], +[ + AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + + dnl Perform the following tests also if --disable-nls has been given, + dnl because they are needed for "make dist" to work. + + dnl Search for GNU msgfmt in the PATH. + dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. + dnl The second test excludes FreeBSD msgfmt. + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + + dnl Search for GNU xgettext 0.11 or newer in the PATH. + dnl The first test excludes Solaris xgettext and early GNU xgettext versions. + dnl The second test excludes FreeBSD xgettext. + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && + (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], + :) + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + + dnl Search for GNU msgmerge 0.11 or newer in the PATH. + AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, + [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU msgfmt. + if test "$GMSGFMT" != ":"; then + dnl If it is no GNU msgfmt we define it as : so that the + dnl Makefiles still can work. + if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && + (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` + AC_MSG_RESULT( + [found $GMSGFMT program is not GNU msgfmt; ignore it]) + GMSGFMT=":" + fi + fi + + dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && + (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi + dnl Remove leftover from FreeBSD xgettext call. + rm -f messages.po + fi + + AC_OUTPUT_COMMANDS([ + for ac_file in $CONFIG_FILES; do + # Support "outfile[:infile[:infile...]]" + case "$ac_file" in + *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; + esac + # PO directories have a Makefile.in generated from Makefile.in.in. + case "$ac_file" in */Makefile.in) + # Adjust a relative srcdir. + ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` + ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" + ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` + # In autoconf-2.13 it is called $ac_given_srcdir. + # In autoconf-2.50 it is called $srcdir. + test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" + case "$ac_given_srcdir" in + .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; + /*) top_srcdir="$ac_given_srcdir" ;; + *) top_srcdir="$ac_dots$ac_given_srcdir" ;; + esac + if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then + rm -f "$ac_dir/POTFILES" + test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" + cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" + # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend + # on $ac_dir but don't depend on user-specified configuration + # parameters. + if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then + # The LINGUAS file contains the set of available languages. + if test -n "$ALL_LINGUAS"; then + test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" + fi + ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` + # Hide the ALL_LINGUAS assigment from automake. + eval 'ALL_LINGUAS''=$ALL_LINGUAS_' + fi + case "$ac_given_srcdir" in + .) srcdirpre= ;; + *) srcdirpre='$(srcdir)/' ;; + esac + POFILES= + GMOFILES= + UPDATEPOFILES= + DUMMYPOFILES= + for lang in $ALL_LINGUAS; do + POFILES="$POFILES $srcdirpre$lang.po" + GMOFILES="$GMOFILES $srcdirpre$lang.gmo" + UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" + DUMMYPOFILES="$DUMMYPOFILES $lang.nop" + done + # CATALOGS depends on both $ac_dir and the user's LINGUAS + # environment variable. + INST_LINGUAS= + if test -n "$ALL_LINGUAS"; then + for presentlang in $ALL_LINGUAS; do + useit=no + if test "%UNSET%" != "$LINGUAS"; then + desiredlanguages="$LINGUAS" + else + desiredlanguages="$ALL_LINGUAS" + fi + for desiredlang in $desiredlanguages; do + # Use the presentlang catalog if desiredlang is + # a. equal to presentlang, or + # b. a variant of presentlang (because in this case, + # presentlang can be used as a fallback for messages + # which are not translated in the desiredlang catalog). + case "$desiredlang" in + "$presentlang"*) useit=yes;; + esac + done + if test $useit = yes; then + INST_LINGUAS="$INST_LINGUAS $presentlang" + fi + done + fi + CATALOGS= + if test -n "$INST_LINGUAS"; then + for lang in $INST_LINGUAS; do + CATALOGS="$CATALOGS $lang.gmo" + done + fi + test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" + sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" + for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do + if test -f "$f"; then + case "$f" in + *.orig | *.bak | *~) ;; + *) cat "$f" >> "$ac_dir/Makefile" ;; + esac + fi + done + fi + ;; + esac + done], + [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute + # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it + # from automake. + eval 'ALL_LINGUAS''="$ALL_LINGUAS"' + # Capture the value of LINGUAS because we need it to compute CATALOGS. + LINGUAS="${LINGUAS-%UNSET%}" + ]) +]) + + +dnl Checks for all prerequisites of the intl subdirectory, +dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, +dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. +AC_DEFUN([AM_INTL_SUBDIR], +[ + AC_REQUIRE([AC_PROG_INSTALL])dnl + AC_REQUIRE([AM_MKINSTALLDIRS])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_CANONICAL_HOST])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + AC_REQUIRE([jm_GLIBC21])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ +stdlib.h string.h unistd.h sys/param.h]) + AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ +geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ +strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) + + AM_ICONV + AM_LANGINFO_CODESET + AM_LC_MESSAGES + + dnl intl/plural.c is generated from intl/plural.y. It requires bison, + dnl because plural.y uses bison specific features. It requires at least + dnl bison-1.26 because earlier versions generate a plural.c that doesn't + dnl compile. + dnl bison is only needed for the maintainer (who touches plural.y). But in + dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put + dnl the rule in general Makefile. Now, some people carelessly touch the + dnl files or have a broken "make" program, hence the plural.c rule will + dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not + dnl present or too old. + AC_CHECK_PROGS([INTLBISON], [bison]) + if test -z "$INTLBISON"; then + ac_verc_fail=yes + else + dnl Found it, now check the version. + AC_MSG_CHECKING([version of bison]) +changequote(<<,>>)dnl + ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` + case $ac_prog_version in + '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; + 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) +changequote([,])dnl + ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; + *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; + esac + AC_MSG_RESULT([$ac_prog_version]) + fi + if test $ac_verc_fail = yes; then + INTLBISON=: + fi +]) + + +AC_DEFUN([AM_MKINSTALLDIRS], +[ + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but $(top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) +]) + +# lib-prefix.m4 serial 1 (gettext-0.11) +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed +dnl to access previously installed libraries. The basic assumption is that +dnl a user will want packages to use other packages he previously installed +dnl with the same --prefix option. +dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate +dnl libraries, but is otherwise very convenient. +AC_DEFUN([AC_LIB_PREFIX], +[ + AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) + AC_REQUIRE([AC_PROG_CC]) + AC_REQUIRE([AC_CANONICAL_HOST]) + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" ]) + AC_ARG_WITH([lib-prefix], +[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib + --without-lib-prefix don't search for libraries in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + if test $use_additional = yes; then + dnl Potentially add $additional_includedir to $CPPFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's already present in $CPPFLAGS, + dnl 3. if it's /usr/local/include and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + for x in $CPPFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $CPPFLAGS. + CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" + fi + fi + fi + fi + dnl Potentially add $additional_libdir to $LDFLAGS. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's already present in $LDFLAGS, + dnl 3. if it's /usr/local/lib and we are using GCC on Linux, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + for x in $LDFLAGS; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LDFLAGS. + LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" + fi + fi + fi + fi + fi +]) -# Search path for a program which passes the given test. -# Ulrich Drepper <drepper@cygnus.com>, 1996. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, +dnl acl_final_exec_prefix, containing the values to which $prefix and +dnl $exec_prefix will expand at the end of the configure script. +AC_DEFUN([AC_LIB_PREPARE_PREFIX], +[ + dnl Unfortunately, prefix and exec_prefix get only finally determined + dnl at the end of configure. + if test "X$prefix" = "XNONE"; then + acl_final_prefix="$ac_default_prefix" + else + acl_final_prefix="$prefix" + fi + if test "X$exec_prefix" = "XNONE"; then + acl_final_exec_prefix='${prefix}' + else + acl_final_exec_prefix="$exec_prefix" + fi + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" + prefix="$acl_save_prefix" +]) + +dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the +dnl variables prefix and exec_prefix bound to the values they will have +dnl at the end of the configure script. +AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], +[ + acl_save_prefix="$prefix" + prefix="$acl_final_prefix" + acl_save_exec_prefix="$exec_prefix" + exec_prefix="$acl_final_exec_prefix" + $1 + exec_prefix="$acl_save_exec_prefix" + prefix="$acl_save_prefix" +]) + +# lib-link.m4 serial 1 (gettext-0.11) +dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and +dnl augments the CPPFLAGS variable. +AC_DEFUN([AC_LIB_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + ac_cv_lib[]Name[]_libs="$LIB[]NAME" + ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" + ac_cv_lib[]Name[]_cppflags="$INC[]NAME" + ]) + LIB[]NAME="$ac_cv_lib[]Name[]_libs" + LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" + INC[]NAME="$ac_cv_lib[]Name[]_cppflags" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the + dnl results of this search when this library appears as a dependency. + HAVE_LIB[]NAME=yes + undefine([Name]) + undefine([NAME]) +]) + +dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) +dnl searches for libname and the libraries corresponding to explicit and +dnl implicit dependencies, together with the specified include files and +dnl the ability to compile and link the specified testcode. If found, it +dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and +dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and +dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs +dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. +AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], +[ + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + define([Name],[translit([$1],[./-], [___])]) + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + + dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([$1], [$2]) + + dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, + dnl because if the user has installed lib[]Name and not disabled its use + dnl via --without-lib[]Name-prefix, he wants to use it. + ac_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) + + AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ + ac_save_LIBS="$LIBS" + LIBS="$LIBS $LIB[]NAME" + AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) + LIBS="$ac_save_LIBS" + ]) + if test "$ac_cv_lib[]Name" = yes; then + HAVE_LIB[]NAME=yes + AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) + AC_MSG_CHECKING([how to link with lib[]$1]) + AC_MSG_RESULT([$LIB[]NAME]) + else + HAVE_LIB[]NAME=no + dnl If $LIB[]NAME didn't lead to a usable library, we don't need + dnl $INC[]NAME either. + CPPFLAGS="$ac_save_CPPFLAGS" + LIB[]NAME= + LTLIB[]NAME= + fi + AC_SUBST([HAVE_LIB]NAME) + AC_SUBST([LIB]NAME) + AC_SUBST([LTLIB]NAME) + undefine([Name]) + undefine([NAME]) +]) + +dnl Determine the platform dependent parameters needed to use rpath: +dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, +dnl hardcode_direct, hardcode_minus_L, +dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec. +AC_DEFUN([AC_LIB_RPATH], +[ + AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS + AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld + AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host + AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir + AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ + ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh + . ./conftest.sh + rm -f ./conftest.sh + acl_cv_rpath=done + ]) + wl="$acl_cv_wl" + libext="$acl_cv_libext" + shlibext="$acl_cv_shlibext" + hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" + hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" + hardcode_direct="$acl_cv_hardcode_direct" + hardcode_minus_L="$acl_cv_hardcode_minus_L" + sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" + sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" +]) + +dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and +dnl the libraries corresponding to explicit and implicit dependencies. +dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. +AC_DEFUN([AC_LIB_LINKFLAGS_BODY], +[ + define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], + [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) + dnl By default, look in $includedir and $libdir. + use_additional=yes + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + AC_ARG_WITH([lib$1-prefix], +[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib + --without-lib$1-prefix don't search for lib$1 in includedir and libdir], +[ + if test "X$withval" = "Xno"; then + use_additional=no + else + if test "X$withval" = "X"; then + AC_LIB_WITH_FINAL_PREFIX([ + eval additional_includedir=\"$includedir\" + eval additional_libdir=\"$libdir\" + ]) + else + additional_includedir="$withval/include" + additional_libdir="$withval/lib" + fi + fi +]) + dnl Search the library and its dependencies in $additional_libdir and + dnl $LDFLAGS. Using breadth-first-seach. + LIB[]NAME= + LTLIB[]NAME= + INC[]NAME= + rpathdirs= + ltrpathdirs= + names_already_handled= + names_next_round='$1 $2' + while test -n "$names_next_round"; do + names_this_round="$names_next_round" + names_next_round= + for name in $names_this_round; do + already_handled= + for n in $names_already_handled; do + if test "$n" = "$name"; then + already_handled=yes + break + fi + done + if test -z "$already_handled"; then + names_already_handled="$names_already_handled $name" + dnl See if it was already located by an earlier AC_LIB_LINKFLAGS + dnl or AC_LIB_HAVE_LINKFLAGS call. + uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` + eval value=\"\$HAVE_LIB$uppername\" + if test -n "$value"; then + if test "$value" = yes; then + eval value=\"\$LIB$uppername\" + test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" + eval value=\"\$LTLIB$uppername\" + test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" + else + dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined + dnl that this library doesn't exist. So just drop it. + : + fi + else + dnl Search the library lib$name in $additional_libdir and $LDFLAGS + dnl and the already constructed $LIBNAME/$LTLIBNAME. + found_dir= + found_la= + found_so= + found_a= + if test $use_additional = yes; then + if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then + found_dir="$additional_libdir" + found_so="$additional_libdir/lib$name.$shlibext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + else + if test -f "$additional_libdir/lib$name.$libext"; then + found_dir="$additional_libdir" + found_a="$additional_libdir/lib$name.$libext" + if test -f "$additional_libdir/lib$name.la"; then + found_la="$additional_libdir/lib$name.la" + fi + fi + fi + fi + if test "X$found_dir" = "X"; then + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + case "$x" in + -L*) + dir=`echo "X$x" | sed -e 's/^X-L//'` + if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then + found_dir="$dir" + found_so="$dir/lib$name.$shlibext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + else + if test -f "$dir/lib$name.$libext"; then + found_dir="$dir" + found_a="$dir/lib$name.$libext" + if test -f "$dir/lib$name.la"; then + found_la="$dir/lib$name.la" + fi + fi + fi + ;; + esac + if test "X$found_dir" != "X"; then + break + fi + done + fi + if test "X$found_dir" != "X"; then + dnl Found the library. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" + if test "X$found_so" != "X"; then + dnl Linking with a shared library. We attempt to hardcode its + dnl directory into the executable's runpath, unless it's the + dnl standard /usr/lib. + if test "X$found_dir" = "X/usr/lib"; then + dnl No hardcoding is needed. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + dnl Potentially add DIR to ltrpathdirs. + dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. + haveit= + for x in $ltrpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + ltrpathdirs="$ltrpathdirs $found_dir" + fi + dnl The hardcoding into $LIBNAME is system dependent. + if test "$hardcode_direct" = yes; then + dnl Using DIR/libNAME.so during linking hardcodes DIR into the + dnl resulting binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then + dnl Use an explicit option to hardcode DIR into the resulting + dnl binary. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + dnl Potentially add DIR to rpathdirs. + dnl The rpathdirs will be appended to $LIBNAME at the end. + haveit= + for x in $rpathdirs; do + if test "X$x" = "X$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + rpathdirs="$rpathdirs $found_dir" + fi + else + dnl Rely on "-L$found_dir". + dnl But don't add it if it's already contained in the LDFLAGS + dnl or the already constructed $LIBNAME + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$found_dir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" + fi + if test "$hardcode_minus_L" != no; then + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" + else + dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH + dnl here, because this doesn't fit in flags passed to the + dnl compiler. So give up. No hardcoding. This affects only + dnl very old systems. + dnl FIXME: Not sure whether we should use + dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" + dnl here. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + fi + fi + fi + fi + else + if test "X$found_a" != "X"; then + dnl Linking with a static library. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" + else + dnl We shouldn't come here, but anyway it's good to have a + dnl fallback. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" + fi + fi + dnl Assume the include files are nearby. + additional_includedir= + case "$found_dir" in + */lib | */lib/) + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` + additional_includedir="$basedir/include" + ;; + esac + if test "X$additional_includedir" != "X"; then + dnl Potentially add $additional_includedir to $INCNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/include, + dnl 2. if it's /usr/local/include and we are using GCC on Linux, + dnl 3. if it's already present in $CPPFLAGS or the already + dnl constructed $INCNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_includedir" != "X/usr/include"; then + haveit= + if test "X$additional_includedir" = "X/usr/local/include"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + for x in $CPPFLAGS $INC[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-I$additional_includedir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_includedir"; then + dnl Really add $additional_includedir to $INCNAME. + INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" + fi + fi + fi + fi + fi + dnl Look for dependencies. + if test -n "$found_la"; then + dnl Read the .la file. It defines the variables + dnl dlname, library_names, old_library, dependency_libs, current, + dnl age, revision, installed, dlopen, dlpreopen, libdir. + save_libdir="$libdir" + case "$found_la" in + */* | *\\*) . "$found_la" ;; + *) . "./$found_la" ;; + esac + libdir="$save_libdir" + dnl We use only dependency_libs. + for dep in $dependency_libs; do + case "$dep" in + -L*) + additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` + dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. + dnl But don't add it + dnl 1. if it's the standard /usr/lib, + dnl 2. if it's /usr/local/lib and we are using GCC on Linux, + dnl 3. if it's already present in $LDFLAGS or the already + dnl constructed $LIBNAME, + dnl 4. if it doesn't exist as a directory. + if test "X$additional_libdir" != "X/usr/lib"; then + haveit= + if test "X$additional_libdir" = "X/usr/local/lib"; then + if test -n "$GCC"; then + case $host_os in + linux*) haveit=yes;; + esac + fi + fi + if test -z "$haveit"; then + haveit= + for x in $LDFLAGS $LIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LIBNAME. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" + fi + fi + haveit= + for x in $LDFLAGS $LTLIB[]NAME; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X-L$additional_libdir"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + if test -d "$additional_libdir"; then + dnl Really add $additional_libdir to $LTLIBNAME. + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" + fi + fi + fi + fi + ;; + -l*) + dnl Handle this in the next round. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` + ;; + *.la) + dnl Handle this in the next round. Throw away the .la's + dnl directory; it is already contained in a preceding -L + dnl option. + names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` + ;; + *) + dnl Most likely an immediate library name. + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" + ;; + esac + done + fi + else + dnl Didn't find the library; assume it is in the system directories + dnl known to the linker and runtime loader. (All the system + dnl directories known to the linker should also be known to the + dnl runtime loader, otherwise the system is severely misconfigured.) + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" + fi + fi + fi + done + done + if test "X$rpathdirs" != "X"; then + if test -n "$hardcode_libdir_separator"; then + dnl Weird platform: only the last -rpath option counts, the user must + dnl pass all path elements in one option. We can arrange that for a + dnl single library, but not when more than one $LIBNAMEs are used. + alldirs= + for found_dir in $rpathdirs; do + alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" + done + dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. + acl_save_libdir="$libdir" + libdir="$alldirs" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + else + dnl The -rpath options are cumulative. + for found_dir in $rpathdirs; do + acl_save_libdir="$libdir" + libdir="$found_dir" + eval flag=\"$hardcode_libdir_flag_spec\" + libdir="$acl_save_libdir" + LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" + done + fi + fi + if test "X$ltrpathdirs" != "X"; then + dnl When using libtool, the option that works for both libraries and + dnl executables is -R. The -R options are cumulative. + for found_dir in $ltrpathdirs; do + LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" + done + fi +]) + +dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, +dnl unless already present in VAR. +dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes +dnl contains two or three consecutive elements that belong together. +AC_DEFUN([AC_LIB_APPENDTOVAR], +[ + for element in [$2]; do + haveit= + for x in $[$1]; do + AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) + if test "X$x" = "X$element"; then + haveit=yes + break + fi + done + if test -z "$haveit"; then + [$1]="${[$1]}${[$1]:+ }$element" + fi + done +]) -# serial 1 +# lib-ld.m4 serial 1 (gettext-0.11) +dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl Subroutines of libtool.m4, +dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision +dnl with libtool.m4. + +dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. +AC_DEFUN([AC_LIB_PROG_LD_GNU], +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[# I'd rather use --version here, but apparently some GNU ld's only accept -v. +if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then + acl_cv_prog_gnu_ld=yes +else + acl_cv_prog_gnu_ld=no +fi]) +with_gnu_ld=$acl_cv_prog_gnu_ld +]) + +dnl From libtool-1.4. Sets the variable LD. +AC_DEFUN([AC_LIB_PROG_LD], +[AC_ARG_WITH(gnu-ld, +[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], +test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) +AC_REQUIRE([AC_PROG_CC])dnl +AC_REQUIRE([AC_CANONICAL_HOST])dnl +ac_prog=ld +if test "$GCC" = yes; then + # Check if gcc -print-prog-name=ld gives a path. + AC_MSG_CHECKING([for ld used by GCC]) + case $host in + *-*-mingw*) + # gcc leaves a trailing carriage return which upsets mingw + ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; + *) + ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; + esac + case $ac_prog in + # Accept absolute paths. + [[\\/]* | [A-Za-z]:[\\/]*)] + [re_direlt='/[^/][^/]*/\.\./'] + # Canonicalize the path of ld + ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` + while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do + ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` + done + test -z "$LD" && LD="$ac_prog" + ;; + "") + # If it fails, then pretend we aren't using GCC. + ac_prog=ld + ;; + *) + # If it is relative, then search for the first ld in PATH. + with_gnu_ld=unknown + ;; + esac +elif test "$with_gnu_ld" = yes; then + AC_MSG_CHECKING([for GNU ld]) +else + AC_MSG_CHECKING([for non-GNU ld]) +fi +AC_CACHE_VAL(acl_cv_path_LD, +[if test -z "$LD"; then + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then + acl_cv_path_LD="$ac_dir/$ac_prog" + # Check to see if the program is GNU ld. I'd rather use --version, + # but apparently some GNU ld's only accept -v. + # Break only if it was the GNU/non-GNU ld that we prefer. + if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then + test "$with_gnu_ld" != no && break + else + test "$with_gnu_ld" != yes && break + fi + fi + done + IFS="$ac_save_ifs" +else + acl_cv_path_LD="$LD" # Let the user override the test with a path. +fi]) +LD="$acl_cv_path_LD" +if test -n "$LD"; then + AC_MSG_RESULT($LD) +else + AC_MSG_RESULT(no) +fi +test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) +AC_LIB_PROG_LD_GNU +]) + +# iconv.m4 serial AM3 (gettext-0.11) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_ICONV_LINK], +[ + dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and + dnl those with the standalone portable GNU libiconv installed). + + dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. + AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) + AC_REQUIRE([AC_LIB_RPATH]) + + dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV + dnl accordingly. + AC_LIB_LINKFLAGS_BODY([iconv]) + + dnl Add $INCICONV to CPPFLAGS before performing the following checks, + dnl because if the user has installed libiconv and not disabled its use + dnl via --without-libiconv-prefix, he wants to use it. The first + dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. + am_save_CPPFLAGS="$CPPFLAGS" + AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) + + AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ + am_cv_func_iconv="no, consider installing GNU libiconv" + am_cv_lib_iconv=no + AC_TRY_LINK([#include <stdlib.h> +#include <iconv.h>], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_func_iconv=yes) + if test "$am_cv_func_iconv" != yes; then + am_save_LIBS="$LIBS" + LIBS="$LIBS $LIBICONV" + AC_TRY_LINK([#include <stdlib.h> +#include <iconv.h>], + [iconv_t cd = iconv_open("",""); + iconv(cd,NULL,NULL,NULL,NULL); + iconv_close(cd);], + am_cv_lib_iconv=yes + am_cv_func_iconv=yes) + LIBS="$am_save_LIBS" + fi + ]) + if test "$am_cv_func_iconv" = yes; then + AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) + fi + if test "$am_cv_lib_iconv" = yes; then + AC_MSG_CHECKING([how to link with libiconv]) + AC_MSG_RESULT([$LIBICONV]) + else + dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV + dnl either. + CPPFLAGS="$am_save_CPPFLAGS" + LIBICONV= + LTLIBICONV= + fi + AC_SUBST(LIBICONV) + AC_SUBST(LTLIBICONV) +]) + +AC_DEFUN([AM_ICONV], +[ + AC_REQUIRE([AM_ICONV_LINK]) + if test "$am_cv_func_iconv" = yes; then + AC_MSG_CHECKING([for iconv declaration]) + AC_CACHE_VAL(am_cv_proto_iconv, [ + AC_TRY_COMPILE([ +#include <stdlib.h> +#include <iconv.h> +extern +#ifdef __cplusplus +"C" +#endif +#if defined(__STDC__) || defined(__cplusplus) +size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); +#else +size_t iconv(); +#endif +], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") + am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) + am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` + AC_MSG_RESULT([$]{ac_t:- + }[$]am_cv_proto_iconv) + AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, + [Define as const if the declaration of iconv() needs const.]) + fi +]) + +# progtest.m4 serial 2 (gettext-0.10.40) +dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1996. + +# Search path for a program which passes the given test. dnl AM_PATH_PROG_WITH_TEST(VARIABLE, PROG-TO-CHECK-FOR, dnl TEST-PERFORMED-ON-FOUND_PROGRAM [, VALUE-IF-NOT-FOUND [, PATH]]) -AC_DEFUN(AM_PATH_PROG_WITH_TEST, +AC_DEFUN([AM_PATH_PROG_WITH_TEST], [# Extract the first word of "$2", so it can be a program name with args. set dummy $2; ac_word=[$]2 AC_MSG_CHECKING([for $ac_word]) @@ -639,7 +2404,7 @@ ifelse([$4], , , [ test -z "[$]ac_cv_path_$1" && ac_cv_path_$1="$4" ;; esac])dnl $1="$ac_cv_path_$1" -if test -n "[$]$1"; then +if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then AC_MSG_RESULT([$]$1) else AC_MSG_RESULT(no) @@ -647,23 +2412,93 @@ fi AC_SUBST($1)dnl ]) -# Check whether LC_MESSAGES is available in <locale.h>. -# Ulrich Drepper <drepper@cygnus.com>, 1995. -# -# This file can be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +# Test for the GNU C Library, version 2.1 or newer. +# From Bruno Haible. + +AC_DEFUN([jm_GLIBC21], + [ + AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, + ac_cv_gnu_library_2_1, + [AC_EGREP_CPP([Lucky GNU user], + [ +#include <features.h> +#ifdef __GNU_LIBRARY__ + #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) + Lucky GNU user + #endif +#endif + ], + ac_cv_gnu_library_2_1=yes, + ac_cv_gnu_library_2_1=no) + ] + ) + AC_SUBST(GLIBC21) + GLIBC21="$ac_cv_gnu_library_2_1" + ] +) + +# codeset.m4 serial AM1 (gettext-0.10.40) +dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. + +dnl From Bruno Haible. + +AC_DEFUN([AM_LANGINFO_CODESET], +[ + AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, + [AC_TRY_LINK([#include <langinfo.h>], + [char* cs = nl_langinfo(CODESET);], + am_cv_langinfo_codeset=yes, + am_cv_langinfo_codeset=no) + ]) + if test $am_cv_langinfo_codeset = yes; then + AC_DEFINE(HAVE_LANGINFO_CODESET, 1, + [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) + fi +]) -# serial 1 +# lcmessage.m4 serial 2 (gettext-0.10.40) +dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. +dnl This file is free software, distributed under the terms of the GNU +dnl General Public License. As a special exception to the GNU General +dnl Public License, this file may be distributed as part of a program +dnl that contains a configuration script generated by Autoconf, under +dnl the same distribution terms as the rest of that program. +dnl +dnl This file can can be used in projects which are not available under +dnl the GNU General Public License or the GNU Library General Public +dnl License but which still want to provide support for the GNU gettext +dnl functionality. +dnl Please note that the actual code of the GNU gettext library is covered +dnl by the GNU Library General Public License, and the rest of the GNU +dnl gettext package package is covered by the GNU General Public License. +dnl They are *not* in the public domain. + +dnl Authors: +dnl Ulrich Drepper <drepper@cygnus.com>, 1995. + +# Check whether LC_MESSAGES is available in <locale.h>. -AC_DEFUN(AM_LC_MESSAGES, +AC_DEFUN([AM_LC_MESSAGES], [if test $ac_cv_header_locale_h = yes; then AC_CACHE_CHECK([for LC_MESSAGES], am_cv_val_LC_MESSAGES, [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], am_cv_val_LC_MESSAGES=yes, am_cv_val_LC_MESSAGES=no)]) if test $am_cv_val_LC_MESSAGES = yes; then - AC_DEFINE(HAVE_LC_MESSAGES) + AC_DEFINE(HAVE_LC_MESSAGES, 1, + [Define if your <locale.h> file defines LC_MESSAGES.]) fi fi]) diff --git a/gnu/usr.bin/texinfo/config.in b/gnu/usr.bin/texinfo/config.in index 3e943f55925..549a66929b5 100644 --- a/gnu/usr.bin/texinfo/config.in +++ b/gnu/usr.bin/texinfo/config.in @@ -1,278 +1,317 @@ -/* config.in. Generated automatically from configure.in by autoheader. */ -/* acconfig.h - This file is in the public domain. - $Id: config.in,v 1.1.1.1 2000/02/09 01:23:57 espie Exp $ - - Descriptive text for the C preprocessor macros that - the distributed Autoconf macros can define. - No software package will use all of them; autoheader copies the ones - your configure.in uses into your configuration header file templates. - - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). Although this order - can split up related entries, it makes it easier to check whether - a given entry is in the file. - - Leave the following blank line there!! Autoheader needs it. */ - +/* config.in. Generated from configure.ac by autoheader. */ +/* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP + systems. This function is required for `alloca.c' support on those systems. + */ +#undef CRAY_STACKSEG_END -/* Define if using alloca.c. */ +/* Define to 1 if using `alloca.c'. */ #undef C_ALLOCA -/* Define to empty if the keyword does not work. */ -#undef const +/* Define to 1 if translation of program messages to the user's native + language is requested. */ +#undef ENABLE_NLS -/* Define to one of _getb67, GETB67, getb67 for Cray-2 and Cray-YMP systems. - This function is required for alloca.c support on those systems. */ -#undef CRAY_STACKSEG_END +/* Define to 1 if `TIOCGWINSZ' requires <sys/ioctl.h>. */ +#undef GWINSZ_IN_SYS_IOCTL -/* Define if you have alloca, as a function or macro. */ +/* Define to 1 if you have `alloca', as a function or macro. */ #undef HAVE_ALLOCA -/* Define if you have <alloca.h> and it should be used (not on Ultrix). */ +/* Define to 1 if you have <alloca.h> and it should be used (not on Ultrix). + */ #undef HAVE_ALLOCA_H -/* Define if you don't have vprintf but do have _doprnt. */ -#undef HAVE_DOPRNT - -/* Define if you have a working `mmap' system call. */ -#undef HAVE_MMAP +/* Define to 1 if you have the <argz.h> header file. */ +#undef HAVE_ARGZ_H -/* Define if you have the strcoll function and it is properly defined. */ -#undef HAVE_STRCOLL +/* Define to 1 if you have the `bzero' function. */ +#undef HAVE_BZERO -/* Define if you have the vprintf function. */ -#undef HAVE_VPRINTF +/* Define if the GNU dcgettext() function is already present or preinstalled. + */ +#undef HAVE_DCGETTEXT -/* Define as __inline if that's what the C compiler calls it. */ -#undef inline +/* Define if this function is declared. */ +#undef HAVE_DECL_STRCASECMP -/* Define if on MINIX. */ -#undef _MINIX +/* Define if this function is declared. */ +#undef HAVE_DECL_STRCOLL -/* Define to `long' if <sys/types.h> doesn't define. */ -#undef off_t +/* Define if this function is declared. */ +#undef HAVE_DECL_STRERROR -/* Define if the system does not provide POSIX.1 features except - with this defined. */ -#undef _POSIX_1_SOURCE +/* Define if this function is declared. */ +#undef HAVE_DECL_STRNCASECMP -/* Define if you need to in order for stat and other things to work. */ -#undef _POSIX_SOURCE +/* Define to 1 if you don't have `vprintf' but do have `_doprnt.' */ +#undef HAVE_DOPRNT -/* Define as the return type of signal handlers (int or void). */ -#undef RETSIGTYPE +/* Define to 1 if you have the <fcntl.h> header file. */ +#undef HAVE_FCNTL_H -/* Define if the setvbuf function takes the buffering type as its second - argument and the buffer pointer as the third, as on System V - before release 3. */ -#undef SETVBUF_REVERSED +/* Define to 1 if you have the `feof_unlocked' function. */ +#undef HAVE_FEOF_UNLOCKED -/* Define to `unsigned' if <sys/types.h> doesn't define. */ -#undef size_t +/* Define to 1 if you have the `fgets_unlocked' function. */ +#undef HAVE_FGETS_UNLOCKED -/* If using the C implementation of alloca, define if you know the - direction of stack growth for your system; otherwise it will be - automatically deduced at run-time. - STACK_DIRECTION > 0 => grows toward higher addresses - STACK_DIRECTION < 0 => grows toward lower addresses - STACK_DIRECTION = 0 => direction of growth unknown - */ -#undef STACK_DIRECTION +/* Define to 1 if you have the `getcwd' function. */ +#undef HAVE_GETCWD -/* Define if the `S_IS*' macros in <sys/stat.h> do not work properly. */ -#undef STAT_MACROS_BROKEN +/* Define to 1 if you have the `getc_unlocked' function. */ +#undef HAVE_GETC_UNLOCKED -/* Define if you have the ANSI C header files. */ -#undef STDC_HEADERS +/* Define to 1 if you have the `getegid' function. */ +#undef HAVE_GETEGID -/* Define if your <sys/time.h> declares struct tm. */ -#undef TM_IN_SYS_TIME +/* Define to 1 if you have the `geteuid' function. */ +#undef HAVE_GETEUID -/* Define to 1 if NLS is requested. */ -#undef ENABLE_NLS +/* Define to 1 if you have the `getgid' function. */ +#undef HAVE_GETGID -/* Define as 1 if you have catgets and don't want to use GNU gettext. */ -#undef HAVE_CATGETS +/* Define to 1 if you have the `getpagesize' function. */ +#undef HAVE_GETPAGESIZE -/* Define as 1 if you have gettext and don't want to use GNU gettext. */ +/* Define if the GNU gettext() function is already present or preinstalled. */ #undef HAVE_GETTEXT -/* Define if your locale.h file contains LC_MESSAGES. */ -#undef HAVE_LC_MESSAGES +/* Define to 1 if you have the `getuid' function. */ +#undef HAVE_GETUID -/* Define as 1 if you have the stpcpy function. */ -#undef HAVE_STPCPY +/* Define if you have the iconv() function. */ +#undef HAVE_ICONV -/* Define if you have the __argz_count function. */ -#undef HAVE___ARGZ_COUNT +/* Define to 1 if you have the <inttypes.h> header file. */ +#undef HAVE_INTTYPES_H -/* Define if you have the __argz_next function. */ -#undef HAVE___ARGZ_NEXT +/* Define to 1 if you have the <io.h> header file. */ +#undef HAVE_IO_H -/* Define if you have the __argz_stringify function. */ -#undef HAVE___ARGZ_STRINGIFY +/* Define if you have <langinfo.h> and nl_langinfo(CODESET). */ +#undef HAVE_LANGINFO_CODESET -/* Define if you have the bzero function. */ -#undef HAVE_BZERO +/* Define if your <locale.h> file defines LC_MESSAGES. */ +#undef HAVE_LC_MESSAGES -/* Define if you have the dcgettext function. */ -#undef HAVE_DCGETTEXT +/* Define to 1 if you have the `bsd' library (-lbsd). */ +#undef HAVE_LIBBSD -/* Define if you have the getcwd function. */ -#undef HAVE_GETCWD +/* Define to 1 if you have the <limits.h> header file. */ +#undef HAVE_LIMITS_H -/* Define if you have the getpagesize function. */ -#undef HAVE_GETPAGESIZE +/* Define to 1 if you have the <locale.h> header file. */ +#undef HAVE_LOCALE_H -/* Define if you have the memcpy function. */ +/* Define to 1 if you have the <malloc.h> header file. */ +#undef HAVE_MALLOC_H + +/* Define to 1 if you have the `memcpy' function. */ #undef HAVE_MEMCPY -/* Define if you have the memmove function. */ +/* Define to 1 if you have the `memmove' function. */ #undef HAVE_MEMMOVE -/* Define if you have the memset function. */ +/* Define to 1 if you have the <memory.h> header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the `mempcpy' function. */ +#undef HAVE_MEMPCPY + +/* Define to 1 if you have the `memset' function. */ #undef HAVE_MEMSET -/* Define if you have the munmap function. */ +/* Define to 1 if you have a working `mmap' system call. */ +#undef HAVE_MMAP + +/* Define to 1 if you have the `munmap' function. */ #undef HAVE_MUNMAP -/* Define if you have the putenv function. */ +/* Define to 1 if you have the <ncurses/termcap.h> header file. */ +#undef HAVE_NCURSES_TERMCAP_H + +/* Define to 1 if you have the <nl_types.h> header file. */ +#undef HAVE_NL_TYPES_H + +/* Define to 1 if you have the `putenv' function. */ #undef HAVE_PUTENV -/* Define if you have the setenv function. */ +/* Define to 1 if you have the <pwd.h> header file. */ +#undef HAVE_PWD_H + +/* Define to 1 if you have the `setenv' function. */ #undef HAVE_SETENV -/* Define if you have the setlocale function. */ +/* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE -/* Define if you have the setvbuf function. */ +/* Define to 1 if you have the `setvbuf' function. */ #undef HAVE_SETVBUF -/* Define if you have the sigprocmask function. */ +/* Define to 1 if you have the `sigprocmask' function. */ #undef HAVE_SIGPROCMASK -/* Define if you have the sigsetmask function. */ +/* Define to 1 if you have the `sigsetmask' function. */ #undef HAVE_SIGSETMASK -/* Define if you have the stpcpy function. */ +/* Define to 1 if you have the <stddef.h> header file. */ +#undef HAVE_STDDEF_H + +/* Define to 1 if you have the <stdint.h> header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the <stdlib.h> header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the `stpcpy' function. */ #undef HAVE_STPCPY -/* Define if you have the strcasecmp function. */ +/* Define to 1 if you have the `strcasecmp' function. */ #undef HAVE_STRCASECMP -/* Define if you have the strchr function. */ +/* Define to 1 if you have the `strchr' function. */ #undef HAVE_STRCHR -/* Define if you have the strdup function. */ +/* Define to 1 if you have the `strcoll' function and it is properly defined. + */ +#undef HAVE_STRCOLL + +/* Define to 1 if you have the `strdup' function. */ #undef HAVE_STRDUP -/* Define if you have the strerror function. */ +/* Define to 1 if you have the `strerror' function. */ #undef HAVE_STRERROR -/* Define if you have the strncasecmp function. */ -#undef HAVE_STRNCASECMP - -/* Define if you have the <argz.h> header file. */ -#undef HAVE_ARGZ_H - -/* Define if you have the <fcntl.h> header file. */ -#undef HAVE_FCNTL_H - -/* Define if you have the <limits.h> header file. */ -#undef HAVE_LIMITS_H - -/* Define if you have the <locale.h> header file. */ -#undef HAVE_LOCALE_H - -/* Define if you have the <malloc.h> header file. */ -#undef HAVE_MALLOC_H - -/* Define if you have the <memory.h> header file. */ -#undef HAVE_MEMORY_H - -/* Define if you have the <ncurses/termcap.h> header file. */ -#undef HAVE_NCURSES_TERMCAP_H - -/* Define if you have the <nl_types.h> header file. */ -#undef HAVE_NL_TYPES_H - -/* Define if you have the <pwd.h> header file. */ -#undef HAVE_PWD_H - -/* Define if you have the <stdlib.h> header file. */ -#undef HAVE_STDLIB_H +/* Define to 1 if you have the <strings.h> header file. */ +#undef HAVE_STRINGS_H -/* Define if you have the <string.h> header file. */ +/* Define to 1 if you have the <string.h> header file. */ #undef HAVE_STRING_H -/* Define if you have the <strings.h> header file. */ -#undef HAVE_STRINGS_H +/* Define to 1 if you have the `strncasecmp' function. */ +#undef HAVE_STRNCASECMP + +/* Define to 1 if you have the `strtoul' function. */ +#undef HAVE_STRTOUL -/* Define if you have the <sys/fcntl.h> header file. */ +/* Define to 1 if you have the <sys/fcntl.h> header file. */ #undef HAVE_SYS_FCNTL_H -/* Define if you have the <sys/file.h> header file. */ +/* Define to 1 if you have the <sys/file.h> header file. */ #undef HAVE_SYS_FILE_H -/* Define if you have the <sys/param.h> header file. */ +/* Define to 1 if you have the <sys/param.h> header file. */ #undef HAVE_SYS_PARAM_H -/* Define if you have the <sys/ptem.h> header file. */ +/* Define to 1 if you have the <sys/ptem.h> header file. */ #undef HAVE_SYS_PTEM_H -/* Define if you have the <sys/time.h> header file. */ +/* Define to 1 if you have the <sys/stat.h> header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the <sys/time.h> header file. */ #undef HAVE_SYS_TIME_H -/* Define if you have the <sys/ttold.h> header file. */ +/* Define to 1 if you have the <sys/ttold.h> header file. */ #undef HAVE_SYS_TTOLD_H -/* Define if you have the <sys/wait.h> header file. */ +/* Define to 1 if you have the <sys/types.h> header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the <sys/wait.h> header file. */ #undef HAVE_SYS_WAIT_H -/* Define if you have the <termcap.h> header file. */ +/* Define to 1 if you have the <termcap.h> header file. */ #undef HAVE_TERMCAP_H -/* Define if you have the <termio.h> header file. */ +/* Define to 1 if you have the <termios.h> header file. */ +#undef HAVE_TERMIOS_H + +/* Define to 1 if you have the <termio.h> header file. */ #undef HAVE_TERMIO_H -/* Define if you have the <termios.h> header file. */ -#undef HAVE_TERMIOS_H +/* Define to 1 if you have the `tsearch' function. */ +#undef HAVE_TSEARCH -/* Define if you have the <unistd.h> header file. */ +/* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define if you have the bsd library (-lbsd). */ -#undef HAVE_LIBBSD +/* Define to 1 if you have the `vprintf' function. */ +#undef HAVE_VPRINTF -/* Define if you have the i library (-li). */ -#undef HAVE_LIBI +/* Define to 1 if you have the `__argz_count' function. */ +#undef HAVE___ARGZ_COUNT + +/* Define to 1 if you have the `__argz_next' function. */ +#undef HAVE___ARGZ_NEXT + +/* Define to 1 if you have the `__argz_stringify' function. */ +#undef HAVE___ARGZ_STRINGIFY + +/* Define as const if the declaration of iconv() needs const. */ +#undef ICONV_CONST /* Name of package */ #undef PACKAGE +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* Define as the return type of signal handlers (`int' or `void'). */ +#undef RETSIGTYPE + +/* If using the C implementation of alloca, define if you know the + direction of stack growth for your system; otherwise it will be + automatically deduced at run-time. + STACK_DIRECTION > 0 => grows toward higher addresses + STACK_DIRECTION < 0 => grows toward lower addresses + STACK_DIRECTION = 0 => direction of growth unknown */ +#undef STACK_DIRECTION + +/* Define to 1 if the `S_IS*' macros in <sys/stat.h> do not work properly. */ +#undef STAT_MACROS_BROKEN + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Define to 1 if your <sys/time.h> declares `struct tm'. */ +#undef TM_IN_SYS_TIME + /* Version number of package */ #undef VERSION -/* Define if TIOCGWINSZ requires sys/ioctl.h */ -#undef GWINSZ_IN_SYS_IOCTL +/* Define to 1 if on MINIX. */ +#undef _MINIX -/* Define if this function is declared. */ -#undef HAVE_DECL_STRERROR +/* Define to 2 if the system does not provide POSIX.1 features except with + this defined. */ +#undef _POSIX_1_SOURCE -/* Define if this function is declared. */ -#undef HAVE_DECL_STRCASECMP +/* Define to 1 if you need to in order for `stat' and other things to work. */ +#undef _POSIX_SOURCE -/* Define if this function is declared. */ -#undef HAVE_DECL_STRNCASECMP +/* Define to empty if `const' does not conform to ANSI C. */ +#undef const -/* Define if this function is declared. */ -#undef HAVE_DECL_STRCOLL +/* Define as `__inline' if that's what the C compiler calls it, or to nothing + if it is not supported. */ +#undef inline +/* Define to `long' if <sys/types.h> does not define. */ +#undef off_t - -/* Leave that blank line there!! Autoheader needs it. - If you're adding to this file, keep in mind: - The entries are in sort -df order: alphabetical, case insensitive, - ignoring punctuation (such as underscores). */ +/* Define to `unsigned' if <sys/types.h> does not define. */ +#undef size_t diff --git a/gnu/usr.bin/texinfo/djgpp/README b/gnu/usr.bin/texinfo/djgpp/README index 064486f4322..bfe96551e96 100644 --- a/gnu/usr.bin/texinfo/djgpp/README +++ b/gnu/usr.bin/texinfo/djgpp/README @@ -12,18 +12,16 @@ distribution, look for the "Installation" section below. a. To compile Texinfo, you will need the following tools:
- basic DJGPP development environment: GCC, Binutils and djdev;
- - a DJGPP port of GNU Make version 3.75 or later;
- - a DJGPP port of Bash;
- - a port of GNU Sed;
- - ginstall and rm from the Fileutils package;
- - DJGPP ports of Fileutils, Diffutils, and Grep (only if you
- need to reconfigure the source distribution);
+ - a DJGPP port of GNU Make version 3.78 or later;
+ - a DJGPP port of Bash 2.04 or later;
+ - a port of GNU Sed 3.02 or later;
+ - DJGPP ports of Fileutils, Textutils, Sh-utils, Diffutils,
+ Gawk and Grep;
- etags (from the Emacs distribution) and mkid (from ID-utils)
if you need the TAGS and ID targets of the Makefile's.
All of the above are available from the DJGPP ftp sites on
- SimTel.NET mirrors, in the pub/simtelnet/gnu/djgpp/v2gnu
- directory.
+ SimTel.NET mirrors, in the v2gnu directory.
b. From the root of your DJGPP installation, unzip the source package:
@@ -48,13 +46,18 @@ distribution, look for the "Installation" section below. pkunzip -d txiXYZs
- If you build Texinfo on Windows 9X, you are advised to use a
- version of Unzip which supports long filenames, so that the
- original long filenames of the source files will be preserved.
- Otherwise, the build procedure will most probably fail.
+ If you build Texinfo on Windows 9X, Windows ME, Windows 2000 or
+ Windows XP, you are advised to use a version of Unzip which
+ supports long filenames, so that the original long filenames of
+ the source files will be preserved. Otherwise, the build
+ procedure will most probably fail.
- Note: do NOT use an unzip program which supports long file names
- on Windows NT, as DJGPP doesn't support long names there.
+ Do NOT use an unzip program which supports long file names on
+ Windows NT 4, as DJGPP doesn't support long names there.
+
+ The program unzip32.exe, available from the SimTel.NET site,
+ will deal correctly with long file names on any platform, so it
+ is the recommended way of unzipping txiXYZs.zip archives.
c. If the source distribution comes with a ready Makefile (this is
usually the case with archives downloaded from the DJGPP sites),
@@ -109,9 +112,9 @@ distribution, look for the "Installation" section below. development environment (djdevNN.zip), then you already have
this file in the info/ subdirectory of your DJGPP installation.
Otherwise, you will need to create it. A minimal DIR file is
- available in this distribution, as a starting point. Copy it to
- the directory where you install the Info files from this
- distribution.
+ available in this distribution under the name `dir-example',
+ which you can use as a starting point. Copy it to the directory
+ where you install the Info files from this distribution.
Even if you already have a DIR file, you should review it to
make sure it is consistent with the names of the Info file you
@@ -125,10 +128,19 @@ distribution, look for the "Installation" section below. * Info-Standalone: (info-stnd).
This topic helps you use the standalone Info-Program (info.exe)
+ * infokey: (info-stnd)Invoking infokey.
+ Compile Info key customizations.
+
+ * Makeinfo: (texinfo)Invoking makeinfo.
+ Convert a .texinfo file (.txi) to an info file suitable for the
+ info reader or Emacs, into plain ASCII, into HTML, into XML,
+ or into DocBook.
+
* Texinfo: (texinfo).
- With one source file, make either a printed manual
- (through TeX) or an Info file (through makeinfo).
- Full documentation in this menu item.
+ With one source file, make either a printed manual (through TeX)
+ or an on-line manual (through makeinfo). This topic includes
+ a full description of the Texinfo language and related
+ facilities, including Emacs commands to work with Texinfo files.
* install-info: (texinfo)Invoking install-info.
How to update info/dir entries when installing GNU packages.
@@ -139,9 +151,6 @@ distribution, look for the "Installation" section below. * texindex: (texinfo)Format with tex/texindex.
Sorting Texinfo index files automatically.
- * makeinfo: (texinfo)makeinfo options.
- Translate Texinfo source into Info, plain ASCII, or HTML.
-
Note that the asterisk `*' should be flushed all the way to the
left, it is indented here just to make reading more convenient.
@@ -237,9 +246,9 @@ distribution, look for the "Installation" section below. variable.
* The default operation of the `print-node' command has been
- changed so that it will automatically print to the local
- printer device connected to the PRN port. (If your printer
- is connected to another port, set the INFO_PRINT_COMMAND
+ changed so that it automatically prints to the local printer
+ device connected to the PRN port. (If your printer is
+ connected to another port, set the INFO_PRINT_COMMAND
environment variable like this:
set INFO_PRINT_COMMAND=>LPT2
@@ -249,10 +258,10 @@ distribution, look for the "Installation" section below. whose name follows the `>' character. (Don't leave any
blanks between `>' and the device name!).
- Note that stock DOS shell won't let you use the `>'
- character in environment variables set from the DOS prompt
- or batch files, but you can set it in the [info] section of
- your DJGPP.ENV file.
+ Note that some old versions of stock DOS shell won't let you
+ use the `>' character in environment variables set from the
+ DOS prompt or batch files, but you can set it in the [info]
+ section of your DJGPP.ENV file.
* The `set-screen-height' command now actually changes the
screen dimensions from within Info if you specify one of the
@@ -374,10 +383,10 @@ distribution, look for the "Installation" section below. this is done *before* Info checks the above butchered names.
Special considerations apply if you are installing Info on dual
- DOS/Windows 9X system, where you'd like Info to work with the same
- files both in plain DOS and from the Windows DOS box. In this
- case, you should make sure your compressed Info files follow the
- 8+3 DOS naming conventions outlined above, even though Info
+ DOS/Windows 9X/ME/2K/XP system, where you'd like Info to work with
+ the same files both in plain DOS and from the Windows DOS box. In
+ this case, you should make sure your compressed Info files follow
+ the 8+3 DOS naming conventions outlined above, even though Info
supports long file names on Windows 9X. Also, you need to turn off
the generation of numeric tails in short 8+3 aliases Windows
creates for long names (if you don't know how, the DJGPP FAQ list
diff --git a/gnu/usr.bin/texinfo/djgpp/config.bat b/gnu/usr.bin/texinfo/djgpp/config.bat index 5b09e0f12a8..c9ca7d55287 100644 --- a/gnu/usr.bin/texinfo/djgpp/config.bat +++ b/gnu/usr.bin/texinfo/djgpp/config.bat @@ -1,88 +1,237 @@ @echo off
+
echo Configuring GNU Texinfo for DJGPP v2.x...
-Rem The SmallEnv tests protect against fixed and too small size
+Rem The small_env tests protect against fixed and too small size
Rem of the environment in stock DOS shell.
-Rem Find out where the sources are
+Rem Find out if NLS is wanted or not, if dependency-tracking is
+Rem wanted or not, if cache is wanted or not, and where the sources are.
+set ARGS=
+set NLS=disabled
+if not "%NLS%" == "disabled" goto small_env
+set CACHE=enabled
+if not "%CACHE%" == "enabled" goto small_env
+set DEPTRAK=disabled
+if not "%DEPTRAK%" == "disabled" goto small_env
set XSRC=.
-if not "%XSRC%" == "." goto SmallEnv
-if "%1" == "" goto InPlace
+if not "%XSRC%" == "." goto small_env
+
+Rem Loop over all arguments.
+Rem Special arguments are: NLS, XSRC CACHE and DEPS.
+Rem All other arguments are stored into ARGS.
+:arg_loop
+set SPECARG=0
+if not "%SPECARG%" == "0" goto small_env
+if not "%1" == "NLS" if not "%1" == "nls" goto cache_opt
+if "%1" == "nls" set NLS=enabled
+if "%1" == "NLS" set NLS=enabled
+if not "%NLS%" == "enabled" goto small_env
+set SPECARG=1
+if not "%SPECARG%" == "1" goto small_env
+shift
+:cache_opt
+set SPECARG=0
+if not "%SPECARG%" == "0" goto small_env
+if "%1" == "no-cache" goto cache_off
+if "%1" == "no-CACHE" goto cache_off
+if not "%1" == "NO-CACHE" goto dependency_opt
+:cache_off
+if "%1" == "no-cache" set CACHE=disabled
+if "%1" == "no-CACHE" set CACHE=disabled
+if "%1" == "NO-CACHE" set CACHE=disabled
+if not "%CACHE%" == "disabled" goto small_env
+set SPECARG=1
+if not "%SPECARG%" == "1" goto small_env
+shift
+:dependency_opt
+set SPECARG=0
+if not "%SPECARG%" == "0" goto small_env
+if "%1" == "dep" goto dep_off
+if not "%1" == "DEP" goto src_dir_opt
+:dep_off
+if "%1" == "dep" set DEPTRAK=enabled
+if "%1" == "DEP" set DEPTRAK=enabled
+if not "%DEPTRAK%" == "enabled" goto small_env
+set SPECARG=1
+if not "%SPECARG%" == "1" goto small_env
+shift
+:src_dir_opt
+set SPECARG=0
+if not "%SPECARG%" == "0" goto small_env
+echo %1 | grep -q "/"
+if errorlevel 1 goto collect_arg
set XSRC=%1
-if not "%XSRC%" == "%1" goto SmallEnv
+if not "%XSRC%" == "%1" goto small_env
+set SPECARG=1
+if not "%SPECARG%" == "1" goto small_env
+:collect_arg
+if "%SPECARG%" == "0" set _ARGS=%ARGS% %1
+if "%SPECARG%" == "0" if not "%_ARGS%" == "%ARGS% %1" goto small_env
+echo %_ARGS% | grep -q "[^ ]"
+if not errorlevel 0 set ARGS=%_ARGS%
+set _ARGS=
+shift
+if not "%1" == "" goto arg_loop
+set SPECARG=
+
+Rem Create a response file for the configure script.
+echo --srcdir=%XSRC% > arguments
+if "%CACHE%" == "enabled" echo --config-cache >>arguments
+if "%DEPTRAK%" == "enabled" echo --enable-dependency-tracking >>arguments
+if "%DEPTRAK%" == "disabled" echo --disable-dependency-tracking >>arguments
+if not "%ARGS%" == "" echo %ARGS% >>arguments
+set ARGS=
+set CACHE=
+set DEPTRAK=
+
+if "%XSRC%" == "." goto in_place
+
+:not_in_place
redir -e /dev/null update %XSRC%/configure.orig ./configure
-if not exist configure update %XSRC%/configure ./configure
+test -f ./configure
+if errorlevel 1 update %XSRC%/configure ./configure
-:InPlace
+:in_place
Rem Update configuration files
echo Updating configuration scripts...
-if not exist configure.orig update configure configure.orig
+test -f ./configure.orig
+if errorlevel 1 update configure configure.orig
sed -f %XSRC%/djgpp/config.sed configure.orig > configure
-if errorlevel 1 goto SedError
+if errorlevel 1 goto sed_error
Rem Make sure they have a config.site file
set CONFIG_SITE=%XSRC%/djgpp/config.site
-if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto SmallEnv
+if not "%CONFIG_SITE%" == "%XSRC%/djgpp/config.site" goto small_env
Rem Make sure crucial file names are not munged by unpacking
-test -f %XSRC%/intl/po2tbl.sed.in
-if not errorlevel 1 mv -f %XSRC%/intl/po2tbl.sed.in %XSRC%/intl/po2tblsed.in
-test -f %XSRC%/intl/po2tblsed.in
-if errorlevel 1 mv -f %XSRC%/intl/po2tbl.sed %XSRC%/intl/po2tblsed.in
-test -f %XSRC%/po/Makefile.in-in
-if errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in
+test -f %XSRC%/po/Makefile.in.in
+if not errorlevel 1 mv -f %XSRC%/po/Makefile.in.in %XSRC%/po/Makefile.in-in
+test -f %XSRC%/po/Makefile.am.in
+if not errorlevel 1 mv -f %XSRC%/po/Makefile.am.in %XSRC%/po/Makefile.am-in
+
+Rem This is required because DOS/Windows are case-insensitive
+Rem to file names, and "make install" will do nothing if Make
+Rem finds a file called `install'.
if exist INSTALL ren INSTALL INSTALL.txt
+Rem Set HOME to a sane default so configure stops complaining.
+if not "%HOME%" == "" goto host_name
+set HOME=%XSRC%/djgpp
+if not "%HOME%" == "%XSRC%/djgpp" goto small_env
+echo No HOME found in the environment, using default value
+
+:host_name
Rem Set HOSTNAME so it shows in config.status
if not "%HOSTNAME%" == "" goto hostdone
if "%windir%" == "" goto msdos
set OS=MS-Windows
-if not "%OS%" == "MS-Windows" goto SmallEnv
+if not "%OS%" == "MS-Windows" goto small_env
goto haveos
:msdos
set OS=MS-DOS
-if not "%OS%" == "MS-DOS" goto SmallEnv
+if not "%OS%" == "MS-DOS" goto small_env
:haveos
if not "%USERNAME%" == "" goto haveuname
if not "%USER%" == "" goto haveuser
echo No USERNAME and no USER found in the environment, using default values
set HOSTNAME=Unknown PC
-if not "%HOSTNAME%" == "Unknown PC" goto SmallEnv
+if not "%HOSTNAME%" == "Unknown PC" goto small_env
+goto userdone
:haveuser
set HOSTNAME=%USER%'s PC
-if not "%HOSTNAME%" == "%USER%'s PC" goto SmallEnv
+if not "%HOSTNAME%" == "%USER%'s PC" goto small_env
goto userdone
:haveuname
set HOSTNAME=%USERNAME%'s PC
-if not "%HOSTNAME%" == "%USERNAME%'s PC" goto SmallEnv
+if not "%HOSTNAME%" == "%USERNAME%'s PC" goto small_env
:userdone
-set HOSTNAME=%HOSTNAME%, %OS%
-if not "%HOSTNAME%" == "%HOSTNAME%, %OS%" goto SmallEnv
+set _HOSTNAME=%HOSTNAME%, %OS%
+if not "%_HOSTNAME%" == "%HOSTNAME%, %OS%" goto small_env
+set HOSTNAME=%_HOSTNAME%
:hostdone
+set _HOSTNAME=
set OS=
-
Rem install-sh is required by the configure script but clashes with the
Rem various Makefile install-foo targets, so we MUST have it before the
Rem script runs and rename it afterwards
-if not exist install-sh if exist install-sh.sh ren install-sh.sh install-sh
+test -f %XSRC%/install-sh
+if not errorlevel 1 goto no_ren0
+test -f %XSRC%/install-sh.sh
+if not errorlevel 1 mv -f %XSRC%/install-sh.sh %XSRC%/install-sh
+:no_ren0
+
+if "%NLS%" == "disabled" goto without_NLS
+
+:with_NLS
+Rem Check for the needed libraries and binaries.
+test -x /dev/env/DJDIR/bin/msgfmt.exe
+if not errorlevel 0 goto missing_NLS_tools
+test -x /dev/env/DJDIR/bin/xgettext.exe
+if not errorlevel 0 goto missing_NLS_tools
+test -f /dev/env/DJDIR/include/libcharset.h
+if not errorlevel 0 goto missing_NLS_tools
+test -f /dev/env/DJDIR/lib/libcharset.a
+if not errorlevel 0 goto missing_NLS_tools
+test -f /dev/env/DJDIR/include/iconv.h
+if not errorlevel 0 goto missing_NLS_tools
+test -f /dev/env/DJDIR/lib/libiconv.a
+if not errorlevel 0 goto missing_NLS_tools
+test -f /dev/env/DJDIR/include/libintl.h
+if not errorlevel 0 goto missing_NLS_tools
+test -f /dev/env/DJDIR/lib/libintl.a
+if not errorlevel 0 goto missing_NLS_tools
+
+Rem Recreate the files in the %XSRC%/po subdir with our ported tools.
+redir -e /dev/null rm %XSRC%/po/*.gmo
+redir -e /dev/null rm %XSRC%/po/diffutil*.pot
+redir -e /dev/null rm %XSRC%/po/cat-id-tbl.c
+redir -e /dev/null rm %XSRC%/po/stamp-cat-id
+
+Rem Update the arguments file for the configure script.
+Rem We prefer without-included-gettext because libintl.a from gettext package
+Rem is the only one that is guaranteed to have been ported to DJGPP.
+echo --enable-nls --without-included-gettext >> arguments
+goto configure_package
+
+:missing_NLS_tools
+echo Needed libs/tools for NLS not found. Configuring without NLS.
+:without_NLS
+Rem Update the arguments file for the configure script.
+echo --disable-nls >> arguments
+
+:configure_package
echo Running the ./configure script...
-sh ./configure --src=%XSRC% --infodir=c:/djgpp/info --disable-nls
-if errorlevel 1 goto CfgError
-if not exist install-sh.sh if exist install-sh ren install-sh install-sh.sh
+sh ./configure @arguments
+if errorlevel 1 goto cfg_error
+rm arguments
echo Done.
goto End
-:SedError
+:sed_error
echo ./configure script editing failed!
goto End
-:CfgError
+:cfg_error
echo ./configure script exited abnormally!
goto End
-:SmallEnv
+:small_env
echo Your environment size is too small. Enlarge it and run me again.
echo Configuration NOT done!
+
:End
+test -f %XSRC%/install-sh.sh
+if not errorlevel 1 goto no_ren1
+test -f %XSRC%/install-sh
+if not errorlevel 1 mv -f %XSRC%/install-sh %XSRC%/install-sh.sh
+:no_ren1
+if "%HOME%" == "%XSRC%/djgpp" set HOME=
+set ARGS=
+set CONFIG_SITE=
+set HOSTNAME=
+set NLS=
+set CACHE=
+set DEPTRAK=
set XSRC=
diff --git a/gnu/usr.bin/texinfo/djgpp/config.sed b/gnu/usr.bin/texinfo/djgpp/config.sed index bad8c8426df..abc6b6f0d3c 100644 --- a/gnu/usr.bin/texinfo/djgpp/config.sed +++ b/gnu/usr.bin/texinfo/djgpp/config.sed @@ -1,26 +1,67 @@ -/for ac_dir in \$PATH; do/,/IFS="\$ac_save_[Ii][Ff][Ss]"/ { - s|test -f \$ac_dir/|test -x $ac_dir/| -} +# Additional editing of configure and Makefiles for DJGPP + +/(echo[ ]*':t/ a\ +# DJGPP specific Makefile changes.\ + /^aliaspath * *=/s,:,";",g;t t\ + /TEXINPUTS=/s,:,";",g;t t\ + /PATH=/s,:,";",g;t t\ + s,\\.deps,_deps,g;t t\ + s,\\.new\\.,_new.,g;t t\ + s,\\.old\\.,_old.,g;t t\ + s,\\.tab\\.,_tab.,g;t t\ + s,Makefile\\.in\\.in,Makefile.in-in,g;t t\ + s,Makefile\\.am\\.in,Makefile.am-in,g;t t\ + /^install-info-am:/,/^$/ {\ + /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\ + s,\\(\\\$\\\$d/\\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$d/\\$\\$file[0-9] \\$\\$d/\\$\\$file[0-9][0-9]\\2,\ + s,\\( \\\$\\\$file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\ + }\ + /^uninstall-info-am:/,/^$/ {\ + /@list=.\\\$(INFO_DEPS)\[^ \]/s,DEPS),& texinf- texin- info-stn.i info.inf,\ + s,\\(file-\\[0-9\\]\\[0-9\\]\\)\\(\[^ \]\\),\\1 \\$\\$file[0-9] \\$\\$file[0-9][0-9]\\2,\ + } -/IFS="\${IFS=/,/IFS="\$ac_save_ifs"/ { - s|test -f \$ac_dir/|test -x $ac_dir/| +# Makefile.in.in is renamed to Makefile.in-in. +/^ac_config_files=/,/_ACEOF/ { + s|po/Makefile\.in|&:po/Makefile.in-in| } +/CONFIG_FILES=/ s|po/Makefile\.in|&:po/Makefile.in-in|2 -s|po2tbl\.sed\.in|po2tblsed.in|g +# We always use _deps instead of .deps, because the latter is an +# invalid name on 8+3 MS-DOS filesystem. This makes the generated +# Makefiles good for every DJGPP installation, not only the one +# where the package was configured (which could happen to be a +# Windows box, where leading dots in file names are allowed). +s,\.deps,_deps,g -/ac_given_INSTALL=/,/^CEOF/ { - /^s%@l@%/a\ - /TEXINPUTS=/s,:,\\\\\\\\\\\\\\;,g\ - /^terminal\\.o:/s,: ,: pcterm.c ,\ - s,po2tbl\\.sed\\.in,po2tblsed.in,g\ - s,Makefile\\.in\\.in,Makefile.in-in,g -} +# The following two items are changes needed for configuring +# and compiling across partitions. +# The given srcdir value is always translated from the +# "x:" syntax into "/dev/x" syntax while we run configure. +/^[ ]*-srcdir=\*.*$/ a\ + ac_optarg=`echo "$ac_optarg" | sed "s,^\\([A-Za-z]\\):,/dev/\\1,"` +/set X `ls -Lt \$srcdir/ i\ + if `echo $srcdir | grep "^/dev/" - > /dev/null`; then\ + srcdir=`echo "$srcdir" | sed -e "s%^/dev/%%" -e "s%/%:/%"`\ + fi -/^CONFIG_FILES=/,/^EOF/ { - s|po/Makefile.in|po/Makefile.in:po/Makefile.in-in| +# Autoconf 2.52e generated configure scripts +# write absolute paths into Makefiles making +# them useless for DJGPP installations for which +# the package has not been configured for. +/MISSING=/,/^$/ { + /^fi$/ a\ +am_missing_run=`echo "$am_missing_run" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'` } +/^install_sh=/a\ +install_sh=`echo "$install_sh" | sed 's%/dev.*/texinfo-\\{0,1\\}4\\.[0-9][a-z]\\{0,1\\}%${top_srcdir}%'` + +# The following makes sure we are not going to remove a directory +# which is the cwd on its drive (DOS doesn't allow to remove such +# a directory). The trick is to chdir to the root directory on +# temp directory's drive before removing $tmp. +/^ *trap 'exit_status=\$\?; rm -rf/s%rm -rf%cd $tmp; cd /; &% -/\*) srcdir=/s,/\*,/*|[A-z]:/*, -/\$]\*) INSTALL=/s,\[/\$\]\*,&|[A-z]:/*, -/\$]\*) ac_rel_source=/s,\[/\$\]\*,&|[A-z]:/*, -/ac_file_inputs=/s,\( -e "s%\^%\$ac_given_srcdir/%"\)\( -e "s%:% $ac_given_srcdir/%g"\),\2\1, +# AC_CONFIG_LINKS fails if the source and destination are on +# different file systems and symlinks don't work. +/^ ln \$srcdir/s%||%|| cp -pf $srcdir/$ac_source $ac_dest ||% diff --git a/gnu/usr.bin/texinfo/djgpp/config.site b/gnu/usr.bin/texinfo/djgpp/config.site index e2238ac4d0c..c7768b11f06 100644 --- a/gnu/usr.bin/texinfo/djgpp/config.site +++ b/gnu/usr.bin/texinfo/djgpp/config.site @@ -1,25 +1,53 @@ #! /bin/sh - -# This is the config.site file for configuring GNU packages -# which are to be built with DJGPP tools. +# Site defaults for the DJGPP configuration # These two variables are required, otherwise looking for # programs along the PATH will not work. PATH_SEPARATOR=: PATH_EXPAND=y +# This is required in for "test -f foo" to find foo.exe. +export TEST_FINDS_EXE=y + # The root of the DJGPP tree serves as the default prefix -test "x$prefix" = xNONE && prefix='${DJDIR}' +# for all paths that are hardcoded in the binaries. +# When installing the installation prefix must be supplied. +test "x$prefix" = xNONE && prefix='/dev/env/DJDIR' # This is required for config.status script to be run, since # ./configure runs it by invoking ${CONFIG_SHELL-/bin/sh} -CONFIG_SHELL=${CONFIG_SHELL='sh'} +# CONFIG_SHELL=${CONFIG_SHELL='sh'} # These are set here so the generated Makefile's will be good # for every DJGPP installation, not only the one where the # package was configured. # $INSTALL must be an absolute path name, otherwise config.status # will try to prepend ./ and ../ to it when it goes into subdirs. -INSTALL=${INSTALL='${DJDIR}/bin/ginstall -c'} +INSTALL=${INSTALL='/dev/env/DJDIR/bin/ginstall -c'} RANLIB=${RANLIB='ranlib'} +GMSGFMT=${GMSGFMT='/dev/env/DJDIR/bin/msgfmt'} +MSGFMT=${MSGFMT='/dev/env/DJDIR/bin/msgfmt'} +XGETTEXT=${XGETTEXT='/dev/env/DJDIR/bin/xgettext'} + +# Sane defaults for standard programs used by the build process. +# We force the values of these variables so that the resultant +# Makefile's will work on any DJGPP platform, not only on the +# machine where the package was configured. +ac_cv_prog_AWK=${AWK='gawk'} +ac_cv_prog_INTLBISON=${INTLBISON='bison'} +ac_cv_prog_CC=${CC='gcc'} + +# These are set here so the generated libtool/Makefile's will +# be good for every DJGPP installation, not only the one where +# the package was configured. +NM=${NM='nm'} +LD=${LD='ld'} +MAKEINFO=${MAKEINFO='makeinfo'} + +# Force the test for 'ln -s' to report 'cp -pf'. +ac_cv_prog_LN_S='cp -pf' +# We have `fork', but it always fails. Don't trust Autoconf to be +# smart enough to detect that... +ac_cv_func_fork=no +ac_cv_func_vfork=no diff --git a/gnu/usr.bin/texinfo/doc/README b/gnu/usr.bin/texinfo/doc/README index c10fad9797a..dc734a6e104 100644 --- a/gnu/usr.bin/texinfo/doc/README +++ b/gnu/usr.bin/texinfo/doc/README @@ -1,6 +1,6 @@ This directory contains documentation on the Texinfo system and the TeX sources needed to process Texinfo sources. We recommend using the -texi2dvi included in the distribution to run a Texinfo manual through +texi2dvi included in this distribution to run a Texinfo manual through TeX to produce a DVI file. The .tex files are not installed automatically because TeX installations @@ -8,14 +8,14 @@ vary so widely. Installing them in the wrong place would give a false sense of security. So, you should simply cp *.tex to the appropriate place. If your installation follows the TeX Directory Structure standard (http://tug.org/tds/), this will be the directory -<texmf>/tex/texinfo/ for texinfo.tex and <texmf>/tex/plain/dvips/ for -epsf.tex. If you use the default installation paths, <texmf> will be -/usr/local/share/texmf. On systems with TeX preinstalled, as most -GNU/Linux distributions offer, <texmf> will often be something like -/usr/share/texmf. +TEXMF/tex/texinfo/ for texinfo.tex, TEXMF/tex/generic/dvips/ for epsf.tex, +and TEXMF/pdftex/plain/misc for pdfcolor.tex. If you use the default +installation paths, TEXMF will be /usr/local/share/texmf. On systems +with TeX preinstalled, as most GNU/Linux distributions offer, TEXMF +will often be something like /usr/share/texmf. It is also possible to put these .tex files in a `local' place instead -of overwriting existing ones, but it is more complicated. See your TeX +of overwriting existing ones, but this is more complicated. See your TeX documentation in general and the texmf.cnf file in particular for information. If you add files to your TeX installations, not just replace existing diff --git a/gnu/usr.bin/texinfo/doc/epsf.tex b/gnu/usr.bin/texinfo/doc/epsf.tex index 7d4a628dd5e..db2cd2031bd 100644 --- a/gnu/usr.bin/texinfo/doc/epsf.tex +++ b/gnu/usr.bin/texinfo/doc/epsf.tex @@ -336,7 +336,7 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}% lly=\epsflly\space urx=\epsfurx\space ury=\epsfury\space - rwi=\number\epsftmp + rwi=\number\epsftmp\space rhi=\number\epsfrsize \epsfclipstring }% @@ -544,3 +544,4 @@ TeX, i.e., somewhere in the TEXINPUTS (or equivalent) path.}% % \let\epsffile=\epsfbox \endinput + diff --git a/gnu/usr.bin/texinfo/doc/info.1 b/gnu/usr.bin/texinfo/doc/info.1 index f572a4f8003..4f7808ae7c5 100644 --- a/gnu/usr.bin/texinfo/doc/info.1 +++ b/gnu/usr.bin/texinfo/doc/info.1 @@ -1,43 +1,45 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.013. -.TH INFO "1" "September 1999" "GNU texinfo 4.0" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. +.TH INFO "1" "April 2002" "GNU texinfo 4.2" FSF .SH NAME info \- read Info documents .SH SYNOPSIS .B info [\fIOPTION\fR]... [\fIMENU-ITEM\fR...] .SH DESCRIPTION -.PP Read documentation in Info format. .SH OPTIONS .TP -\fB\-\-apropos\fR=\fISUBJECT\fR -look up SUBJECT in all indices of all manuals. +\fB\-\-apropos\fR=\fISTRING\fR +look up STRING in all indices of all manuals. .TP -\fB\-\-directory\fR=\fIDIR\fR +\fB\-d\fR, \fB\-\-directory\fR=\fIDIR\fR add DIR to INFOPATH. .TP \fB\-\-dribble\fR=\fIFILENAME\fR remember user keystrokes in FILENAME. .TP -\fB\-\-file\fR=\fIFILENAME\fR +\fB\-f\fR, \fB\-\-file\fR=\fIFILENAME\fR specify Info file to visit. .TP -\fB\-\-help\fR +\fB\-h\fR, \fB\-\-help\fR display this help and exit. .TP \fB\-\-index\-search\fR=\fISTRING\fR go to node pointed by index entry STRING. .TP -\fB\-\-node\fR=\fINODENAME\fR +\fB\-n\fR, \fB\-\-node\fR=\fINODENAME\fR specify nodes in first visited Info file. .TP -\fB\-\-output\fR=\fIFILENAME\fR +\fB\-o\fR, \fB\-\-output\fR=\fIFILENAME\fR output selected nodes to FILENAME. .TP +\fB\-R\fR, \fB\-\-raw\-escapes\fR +don't remove ANSI escapes from man pages. +.TP \fB\-\-restore\fR=\fIFILENAME\fR read initial keystrokes from FILENAME. .TP -\fB\-\-show\-options\fR, \fB\-\-usage\fR +\fB\-O\fR, \fB\-\-show\-options\fR, \fB\-\-usage\fR go to command-line options node. .TP \fB\-\-subnodes\fR @@ -73,8 +75,9 @@ show file ./foo.info, not searching dir .SH "REPORTING BUGS" Email bug reports to bug-texinfo@gnu.org, general questions and discussion to help-texinfo@gnu.org. +Texinfo home page: http://www.gnu.org/software/texinfo/ .SH COPYRIGHT -Copyright \(co 1999 Free Software Foundation, Inc. +Copyright \(co 2002 Free Software Foundation, Inc. There is NO warranty. You may redistribute this software under the terms of the GNU General Public License. For more information about these matters, see the files named COPYING. diff --git a/gnu/usr.bin/texinfo/doc/install-info.1 b/gnu/usr.bin/texinfo/doc/install-info.1 index f2b8c2ace7a..a6fb8bf7f14 100644 --- a/gnu/usr.bin/texinfo/doc/install-info.1 +++ b/gnu/usr.bin/texinfo/doc/install-info.1 @@ -1,29 +1,25 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.013. -.TH INSTALL-INFO "1" "September 1999" "GNU texinfo 4.0" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. +.TH INSTALL-INFO "1" "April 2002" "GNU texinfo 4.2" FSF .SH NAME install-info \- update info/dir entries .SH SYNOPSIS .B install-info [\fIOPTION\fR]... [\fIINFO-FILE \fR[\fIDIR-FILE\fR]] .SH DESCRIPTION -.PP Install or delete dir entries from INFO-FILE in the Info directory file DIR-FILE. .SH OPTIONS .TP \fB\-\-delete\fR delete existing entries for INFO-FILE from DIR-FILE; -.IP don't insert any new entries. .TP \fB\-\-dir\-file\fR=\fINAME\fR specify file name of Info directory file. -.IP This is equivalent to using the DIR-FILE argument. .TP \fB\-\-entry\fR=\fITEXT\fR insert TEXT as an Info directory entry. -.IP TEXT should have the form of an Info menu item line plus zero or more extra lines starting with whitespace. If you specify more than one entry, they are all added. @@ -35,7 +31,6 @@ display this help and exit. .TP \fB\-\-info\-file\fR=\fIFILE\fR specify Info file to install in the directory. -.IP This is equivalent to using the INFO-FILE argument. .TP \fB\-\-info\-dir\fR=\fIDIR\fR @@ -43,7 +38,6 @@ same as \fB\-\-dir\-file\fR=\fIDIR\fR/dir. .TP \fB\-\-item\fR=\fITEXT\fR same as \fB\-\-entry\fR TEXT. -.IP An Info directory entry is actually a menu item. .TP \fB\-\-quiet\fR @@ -54,7 +48,6 @@ same as \fB\-\-delete\fR. .TP \fB\-\-section\fR=\fISEC\fR put this file's entries in section SEC of the directory. -.IP If you specify more than one section, all the entries are added in each of the sections. If you don't specify any sections, they are determined @@ -65,6 +58,12 @@ display version information and exit. .SH "REPORTING BUGS" Email bug reports to bug-texinfo@gnu.org, general questions and discussion to help-texinfo@gnu.org. +Texinfo home page: http://www.gnu.org/software/texinfo/ +.SH COPYRIGHT +Copyright \(co 2002 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING. .SH "SEE ALSO" The full documentation for .B install-info @@ -77,8 +76,3 @@ programs are properly installed at your site, the command .B info install-info .PP should give you access to the complete manual. -.SH COPYRIGHT -Copyright \(co 1999 Free Software Foundation, Inc. -There is NO warranty. You may redistribute this software -under the terms of the GNU General Public License. -For more information about these matters, see the files named COPYING. diff --git a/gnu/usr.bin/texinfo/doc/makeinfo.1 b/gnu/usr.bin/texinfo/doc/makeinfo.1 index 62d22b831b0..3500b6817c7 100644 --- a/gnu/usr.bin/texinfo/doc/makeinfo.1 +++ b/gnu/usr.bin/texinfo/doc/makeinfo.1 @@ -1,69 +1,121 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.013. -.TH MAKEINFO "1" "September 1999" "GNU texinfo 4.0" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. +.TH MAKEINFO "1" "April 2002" "GNU texinfo 4.2" FSF .SH NAME makeinfo \- translate Texinfo documents .SH SYNOPSIS .B makeinfo -[\fIOPTION\fR]...\fI TEXINFO-FILE\fR... +[\fIOPTION\fR]... \fITEXINFO-FILE\fR... .SH DESCRIPTION -.PP -Translate Texinfo source documentation to various other formats: -Info files suitable for reading online with Emacs or standalone GNU Info -(by default); plain text (with \fB\-\-no\-headers\fR); or HTML (with \fB\-\-html\fR). -.SH OPTIONS +Translate Texinfo source documentation to various other formats, by default +Info files suitable for reading online with Emacs or standalone GNU Info. +.SS "General options:" .TP -\fB\-\-commands\-in\-node\-names\fR -allow @ commands in node names. +\fB\-\-error\-limit\fR=\fINUM\fR +quit after NUM errors (default 100). .TP -\fB\-D\fR VAR -define a variable, as with @set. +\fB\-\-force\fR +preserve output even if errors. +.TP +\fB\-\-help\fR +display this help and exit. +.TP +\fB\-\-no\-validate\fR +suppress node cross-reference validation. +.TP +\fB\-\-no\-warn\fR +suppress warnings (but not errors). +.TP +\fB\-\-reference\-limit\fR=\fINUM\fR +warn about at most NUM references (default 1000). +.TP +\fB\-v\fR, \fB\-\-verbose\fR +explain what is being done. +.TP +\fB\-\-version\fR +display version information and exit. +.SS "Output format selection (default is to produce Info):" +.TP +\fB\-\-docbook\fR +output DocBook rather than Info. +.TP +\fB\-\-html\fR +output HTML rather than Info. +.TP +\fB\-\-xml\fR +output XML (TexinfoML) rather than Info. +.SS "General output options:" .TP \fB\-E\fR, \fB\-\-macro\-expand\fR FILE output macro-expanded source to FILE. +ignoring any @setfilename. .TP -\fB\-\-error\-limit\fR=\fINUM\fR -quit after NUM errors (default 100). +\fB\-\-no\-headers\fR +suppress node separators, Node: lines, and menus +from Info output (thus producing plain text) +or from HTML (thus producing shorter output); +also, write to standard output by default. +.TP +\fB\-\-no\-split\fR +suppress splitting of Info or HTML output, +generate only one output file. +.TP +\fB\-\-number\-sections\fR +output chapter and sectioning numbers. +.TP +\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR +output to FILE (directory if split HTML), +.SS "Options for Info and plain text:" +.TP +\fB\-\-enable\-encoding\fR +output accented and special characters in +Info output based on @documentencoding. .TP \fB\-\-fill\-column\fR=\fINUM\fR break Info lines at NUM characters (default 72). .TP \fB\-\-footnote\-style\fR=\fISTYLE\fR -output footnotes according to STYLE: +output footnotes in Info according to STYLE: +`separate' to put them in their own node; +`end' to put them at the end of the node .IP -`separate' to place footnotes in their own node, -`end' to place the footnotes at the end of the -.IP -node in which they are defined (the default). +in which they are defined (default). .TP -\fB\-\-force\fR -preserve output even if errors. +\fB\-\-paragraph\-indent\fR=\fIVAL\fR +indent Info paragraphs by VAL spaces (default 3). +If VAL is `none', do not indent; if VAL is +`asis', preserve existing indentation. .TP -\fB\-\-help\fR -display this help and exit. +\fB\-\-split\-size\fR=\fINUM\fR +split Info files at size NUM (default 50000). +.SS "Input file options:" .TP -\fB\-\-html\fR -output HTML rather than Info format; +\fB\-\-commands\-in\-node\-names\fR +allow @ commands in node names. +.TP +\fB\-D\fR VAR +define the variable VAR, as with @set. .TP \fB\-I\fR DIR append DIR to the @include search path. .TP +\fB\-P\fR DIR +prepend DIR to the @include search path. +.TP +\fB\-U\fR VAR +undefine the variable VAR, as with @clear. +.SS "Conditional processing in input:" +.TP \fB\-\-ifhtml\fR -process @ifhtml and @html text even when not -.IP -generating HTML. +process @ifhtml and @html even if not generating HTML. .TP \fB\-\-ifinfo\fR -process @ifinfo text even when generating HTML. +process @ifinfo even if not generating Info. .TP -\fB\-\-iftex\fR -process @iftex and @tex text. -.IP -implies \fB\-\-no\-split\fR. +\fB\-\-ifplaintext\fR +process @ifplaintext even if not generating plain text. .TP -\fB\-\-no\-headers\fR -suppress Info node separators and Node: lines and -.IP -write to standard output without \fB\-\-output\fR. +\fB\-\-iftex\fR +process @iftex and @tex; implies \fB\-\-no\-split\fR. .TP \fB\-\-no\-ifhtml\fR do not process @ifhtml and @html text. @@ -71,68 +123,45 @@ do not process @ifhtml and @html text. \fB\-\-no\-ifinfo\fR do not process @ifinfo text. .TP +\fB\-\-no\-ifplaintext\fR +do not process @ifplaintext text. +.TP \fB\-\-no\-iftex\fR do not process @iftex and @tex text. -.TP -\fB\-\-no\-split\fR -suppress splitting of large Info output files or -generation of one HTML file per node. -.TP -\fB\-\-no\-validate\fR -suppress node cross-reference validation. -.TP -\fB\-\-no\-warn\fR -suppress warnings (but not errors). -.TP -\fB\-\-number\-sections\fR -include chapter, section, etc. numbers in output. -.TP -\fB\-o\fR, \fB\-\-output\fR=\fIFILE\fR -output to FILE, ignoring any @setfilename. -.TP -\fB\-P\fR DIR -prepend DIR to the @include search path. -.TP -\fB\-\-paragraph\-indent\fR=\fIVAL\fR -indent Info paragraphs by VAL spaces (default 3). .IP -if VAL is `none', do not indent; -if VAL is `asis', preserve existing indentation. -.TP -\fB\-\-reference\-limit\fR=\fINUM\fR -warn about at most NUM references (default 1000). -.TP -\fB\-U\fR VAR -undefine a variable, as with @clear. -.TP -\fB\-v\fR, \fB\-\-verbose\fR -explain what is being done. -.TP -\fB\-\-version\fR -display version information and exit. -.PP The defaults for the @if... conditionals depend on the output format: if generating HTML, \fB\-\-ifhtml\fR is on and the others are off; -if generating Info or plain text, \fB\-\-ifinfo\fR is on and the others are off. +if generating Info, \fB\-\-ifinfo\fR is on and the others are off; +if generating plain text, \fB\-\-ifplaintext\fR is on and the others are off; .SH EXAMPLES .TP makeinfo foo.texi write Info to foo's @setfilename .TP makeinfo \fB\-\-html\fR foo.texi -write HTML to foo's @setfilename +write HTML to @setfilename .TP -makeinfo \fB\-\-no\-headers\fR \fB\-o\fR - foo.texi -write plain text to standard output +makeinfo \fB\-\-xml\fR foo.texi +write XML to @setfilename .TP -makeinfo \fB\-\-number\-sections\fR foo.texi -write Info with numbered sections +makeinfo \fB\-\-docbook\fR foo.texi +write DocBook XML to @setfilename .TP -makeinfo \fB\-\-no\-split\fR foo.texi -write one Info file however big +makeinfo \fB\-\-no\-headers\fR foo.texi +write plain text to standard output +.IP +makeinfo \fB\-\-html\fR \fB\-\-no\-headers\fR foo.texi write html without node lines, menus +makeinfo \fB\-\-number\-sections\fR foo.texi write Info with numbered sections +makeinfo \fB\-\-no\-split\fR foo.texi write one Info file however big .SH "REPORTING BUGS" Email bug reports to bug-texinfo@gnu.org, general questions and discussion to help-texinfo@gnu.org. +Texinfo home page: http://www.gnu.org/software/texinfo/ +.SH COPYRIGHT +Copyright \(co 2002 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING. .SH "SEE ALSO" The full documentation for .B makeinfo @@ -145,8 +174,3 @@ programs are properly installed at your site, the command .B info makeinfo .PP should give you access to the complete manual. -.SH COPYRIGHT -Copyright \(co 1999 Free Software Foundation, Inc. -There is NO warranty. You may redistribute this software -under the terms of the GNU General Public License. -For more information about these matters, see the files named COPYING. diff --git a/gnu/usr.bin/texinfo/doc/mdate-sh b/gnu/usr.bin/texinfo/doc/mdate-sh index 37171f21fbd..c079aed3e22 100644 --- a/gnu/usr.bin/texinfo/doc/mdate-sh +++ b/gnu/usr.bin/texinfo/doc/mdate-sh @@ -1,6 +1,6 @@ #!/bin/sh # Get modification time of a file or directory and pretty-print it. -# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright 1995, 1996, 1997 Free Software Foundation, Inc. # written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, June 1995 # # This program is free software; you can redistribute it and/or modify @@ -17,6 +17,11 @@ # along with this program; if not, write to the Free Software Foundation, # Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + # Prevent date giving response in another language. LANG=C export LANG diff --git a/gnu/usr.bin/texinfo/doc/stamp-vti b/gnu/usr.bin/texinfo/doc/stamp-vti index 2d7c14922ab..c21b39a2cb5 100644 --- a/gnu/usr.bin/texinfo/doc/stamp-vti +++ b/gnu/usr.bin/texinfo/doc/stamp-vti @@ -1,3 +1,4 @@ -@set UPDATED 28 September 1999 -@set EDITION 4.0 -@set VERSION 4.0 +@set UPDATED 28 March 2002 +@set UPDATED-MONTH March 2002 +@set EDITION 4.2 +@set VERSION 4.2 diff --git a/gnu/usr.bin/texinfo/doc/texi2dvi.1 b/gnu/usr.bin/texinfo/doc/texi2dvi.1 index d9e98c4ca5f..f815bb5c061 100644 --- a/gnu/usr.bin/texinfo/doc/texi2dvi.1 +++ b/gnu/usr.bin/texinfo/doc/texi2dvi.1 @@ -1,12 +1,11 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.013. -.TH TEXI2DVI "1" "September 1999" "GNU Texinfo 4.0 0.43" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. +.TH TEXI2DVI "1" "April 2002" "GNU Texinfo 4.2 0.51" FSF .SH NAME texi2dvi \- print Texinfo documents .SH SYNOPSIS .B texi2dvi -[\fIOPTION\fR]...\fI FILE\fR... +[\fIOPTION\fR]... \fIFILE\fR... .SH DESCRIPTION -.PP Run each Texinfo or LaTeX FILE through TeX in turn until all cross-references are resolved, building all indices. The directory containing each FILE is searched for included files. The suffix of FILE @@ -14,50 +13,55 @@ is used to determine its language (LaTeX or Texinfo). .PP Makeinfo is used to perform Texinfo macro expansion before running TeX when needed. -.SH OPTIONS -.TP --@ -Use @input instead of \einput; for preloaded Texinfo. +.SS "Operation modes:" .TP \fB\-b\fR, \fB\-\-batch\fR -No interaction. +no interaction .TP \fB\-c\fR, \fB\-\-clean\fR -Remove all auxiliary files. +remove all auxiliary files .TP \fB\-D\fR, \fB\-\-debug\fR -Turn on shell debugging (set \fB\-x\fR). -.TP -\fB\-e\fR, \fB\-\-expand\fR -Force macro expansion using makeinfo. -.TP -\fB\-I\fR DIR -Search DIR for Texinfo files. +turn on shell debugging (set \fB\-x\fR) .TP \fB\-h\fR, \fB\-\-help\fR -Display this help and exit successfully. -.TP -\fB\-l\fR, \fB\-\-language\fR=\fILANG\fR -Specify the LANG of FILE: LaTeX or Texinfo. +display this help and exit successfully .TP -\fB\-p\fR, \fB\-\-pdf\fR -Use pdftex or pdflatex for processing. +\fB\-o\fR, \fB\-\-output\fR=\fIOFILE\fR +leave output in OFILE (implies \fB\-\-clean\fR); +Only one input FILE may be specified in this case .TP \fB\-q\fR, \fB\-\-quiet\fR -No output unless errors (implies \fB\-\-batch\fR). +no output unless errors (implies \fB\-\-batch\fR) .TP \fB\-s\fR, \fB\-\-silent\fR -Same as \fB\-\-quiet\fR. -.TP -\fB\-t\fR, \fB\-\-texinfo\fR=\fICMD\fR -Insert CMD after @setfilename in copy of input file. -Multiple values accumulate. +same as \fB\-\-quiet\fR .TP \fB\-v\fR, \fB\-\-version\fR -Display version information and exit successfully. +display version information and exit successfully .TP \fB\-V\fR, \fB\-\-verbose\fR -Report on what is done. +report on what is done +.SS "TeX tuning:" +.TP +-@ +use @input instead of \einput; for preloaded Texinfo +.TP +\fB\-e\fR, \fB\-\-expand\fR +force macro expansion using makeinfo +.TP +\fB\-I\fR DIR +search DIR for Texinfo files +.TP +\fB\-l\fR, \fB\-\-language\fR=\fILANG\fR +specify the LANG of FILE (LaTeX or Texinfo) +.TP +\fB\-p\fR, \fB\-\-pdf\fR +use pdftex or pdflatex for processing +.TP +\fB\-t\fR, \fB\-\-texinfo\fR=\fICMD\fR +insert CMD after @setfilename in copy of input file +multiple values accumulate .PP The values of the BIBTEX, LATEX (or PDFLATEX), MAKEINDEX, MAKEINFO, TEX (or PDFTEX), and TEXINDEX environment variables are used to run @@ -65,6 +69,12 @@ those commands, if they are set. .SH "REPORTING BUGS" Email bug reports to <bug-texinfo@gnu.org>, general questions and discussion to <help-texinfo@gnu.org>. +Texinfo home page: http://www.gnu.org/software/texinfo/ +.SH COPYRIGHT +Copyright \(co 2002 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING. .SH "SEE ALSO" The full documentation for .B texi2dvi @@ -77,8 +87,3 @@ programs are properly installed at your site, the command .B info texi2dvi .PP should give you access to the complete manual. -.SH COPYRIGHT -Copyright \(co 1999 Free Software Foundation, Inc. -There is NO warranty. You may redistribute this software -under the terms of the GNU General Public License. -For more information about these matters, see the files named COPYING. diff --git a/gnu/usr.bin/texinfo/doc/texindex.1 b/gnu/usr.bin/texinfo/doc/texindex.1 index 6708829704c..854fed8c30e 100644 --- a/gnu/usr.bin/texinfo/doc/texindex.1 +++ b/gnu/usr.bin/texinfo/doc/texindex.1 @@ -1,12 +1,11 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.013. -.TH TEXINDEX "1" "September 1999" "GNU texinfo 4.0" FSF +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.24. +.TH TEXINDEX "1" "April 2002" "GNU texinfo 4.2" FSF .SH NAME texindex \- sort Texinfo index files .SH SYNOPSIS .B texindex -[\fIOPTION\fR]...\fI FILE\fR... +[\fIOPTION\fR]... \fIFILE\fR... .SH DESCRIPTION -.PP Generate a sorted index for each TeX output FILE. Usually FILE... is specified as `foo.??' for a document `foo.texi'. .SH OPTIONS @@ -28,6 +27,12 @@ display version information and exit .SH "REPORTING BUGS" Email bug reports to bug-texinfo@gnu.org, general questions and discussion to help-texinfo@gnu.org. +Texinfo home page: http://www.gnu.org/software/texinfo/ +.SH COPYRIGHT +Copyright \(co 2002 Free Software Foundation, Inc. +There is NO warranty. You may redistribute this software +under the terms of the GNU General Public License. +For more information about these matters, see the files named COPYING. .SH "SEE ALSO" The full documentation for .B texindex @@ -40,8 +45,3 @@ programs are properly installed at your site, the command .B info texindex .PP should give you access to the complete manual. -.SH COPYRIGHT -Copyright \(co 1999 Free Software Foundation, Inc. -There is NO warranty. You may redistribute this software -under the terms of the GNU General Public License. -For more information about these matters, see the files named COPYING. diff --git a/gnu/usr.bin/texinfo/doc/txi-cs.tex b/gnu/usr.bin/texinfo/doc/txi-cs.tex index d1aa88d3f20..9fa05b4afa1 100644 --- a/gnu/usr.bin/texinfo/doc/txi-cs.tex +++ b/gnu/usr.bin/texinfo/doc/txi-cs.tex @@ -1,72 +1,76 @@ -% Czech translation for texinfo.tex (1999-01-24, GNU Texinfo 3.12c).
-%
-% Copyright (C) 1999 Vladimir Michl <Vladimir.Michl@mujweb.cz>
-%
-% This program is free software; you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
-% (at your option) any later version.
-%
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-%
-% To: Karl Berry <karl@cs.umb.edu>
-%
-\gdef\putwordAppendix{Pøílohy}
-\gdef\putwordChapter{Kapitola}
-\gdef\putwordfile{soubor}
-\gdef\putwordIndexIsEmpty{(Rejstøík je prázdný)}
-\gdef\putwordIndexNonexistent{(Rejstøík neexistuje)}
-\gdef\putwordInfo{Info}
-\gdef\putwordMethodon{Metoda aktivní}
-\gdef\putwordNoTitle{Bez nadpisu}
-\gdef\putwordOf{}
-\gdef\putwordon{zapnuto}
-\gdef\putwordpage{stránka}
-\gdef\putwordsection{podkapitola}
-\gdef\putwordSection{Podkapitola}
-\gdef\putwordsee{vidìt}
-\gdef\putwordSee{Vidìt}
-\gdef\putwordShortTOC{Krátký obsah}
-\gdef\putwordTOC{Obsah}
-%
-\gdef\putwordMJan{ledna}
-\gdef\putwordMFeb{února}
-\gdef\putwordMMar{bøezna}
-\gdef\putwordMApr{dubna}
-\gdef\putwordMMai{kvìtna}
-\gdef\putwordMJun{èervna}
-\gdef\putwordMJul{èervence}
-\gdef\putwordMAug{srpna}
-\gdef\putwordMSep{záøí}
-\gdef\putwordMOct{øíjna}
-\gdef\putwordMNov{listopadu}
-\gdef\putwordMDec{prosince}
-%
-\gdef\putwordDefmac{Makro}
-\gdef\putwordDefspec{Speciální forma}
-\gdef\putwordDefivar{Instance promìnné}
-\gdef\putwordDefvar{Promìnná}
-\gdef\putwordDefopt{Volby}
-\gdef\putwordDeftypevar{Promìnná}
-\gdef\putwordDeffunc{Funkce}
-\gdef\putwordDeftypefun{Funkce}
-%
-% Redefine \today to produce Czech
-% preferred dates such as 28. januar 1999.
-%
-\gdef\today{%
- \number\day.\space
- \ifcase\month
- \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
- \or\putwordMMai\or\putwordMJun\or\putwordMJul\or\putwordMAug
- \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
- \fi
- \space\number\year}
-%
+% $Id: txi-cs.tex,v 1.1.1.2 2002/06/10 13:21:49 espie Exp $ +% Czech translation for texinfo.tex. +% +% Copyright (C) 1999, 2000 Free Software Foundation. +% +% Authors: +% Vladimir Michl <Vladimir.Michl@mujweb.cz> +% Stepan Kasal <kasal@suse.cz> +% +% This program is free software; you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation; either version 2 of the License, or +% (at your option) any later version. +% +% This program is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with this program; if not, write to the Free Software +% Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +% +\gdef\putwordAppendix{Pøílohy} +\gdef\putwordChapter{Kapitola} +\gdef\putwordfile{soubor} +\gdef\putwordin{v~knize} +\gdef\putwordIndexIsEmpty{(Rejstøík je prázdný.)} +\gdef\putwordIndexNonexistent{(Rejstøík neexistuje.)} +\gdef\putwordInfo{Info} +\gdef\putwordInstanceVariableof{Promìnná pro instance tøídy} +\gdef\putwordMethodon{Metoda tøídy} +\gdef\putwordNoTitle{Bez nadpisu} +\gdef\putwordof{tøídy} +\global\let\putwordon\putwordof +\gdef\putwordpage{stránka} +\gdef\putwordsection{oddíl} +\gdef\putwordSection{Oddíl} +\gdef\putwordsee{viz} +\gdef\putwordSee{Viz} +\gdef\putwordShortTOC{Struèný obsah} +\gdef\putwordTOC{Obsah} +% +\gdef\putwordMJan{ledna} +\gdef\putwordMFeb{února} +\gdef\putwordMMar{bøezna} +\gdef\putwordMApr{dubna} +\gdef\putwordMMai{kvìtna} +\gdef\putwordMJun{èervna} +\gdef\putwordMJul{èervence} +\gdef\putwordMAug{srpna} +\gdef\putwordMSep{záøí} +\gdef\putwordMOct{øíjna} +\gdef\putwordMNov{listopadu} +\gdef\putwordMDec{prosince} +% +\gdef\putwordDefmac{Makro} +\gdef\putwordDefspec{Speciální forma} +\gdef\putwordDefvar{Promìnná} +\gdef\putwordDefopt{Volby} +\global\let\putwordDeftypevar\putwordDefvar +\gdef\putwordDeffunc{Funkce} +\global\let\putwordDeftypefun\putwordDeffunc +% +% Redefine \today to produce Czech +% preferred dates such as 28. januar 1999. +% +\gdef\today{% + \number\day.\nobreak\space + \ifcase\month + \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr + \or\putwordMMai\or\putwordMJun\or\putwordMJul\or\putwordMAug + \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec + \fi + \penalty3000\relax\space\number\year} +% diff --git a/gnu/usr.bin/texinfo/doc/txi-no.tex b/gnu/usr.bin/texinfo/doc/txi-no.tex index 899d42cf2a2..aa538d6b551 100644 --- a/gnu/usr.bin/texinfo/doc/txi-no.tex +++ b/gnu/usr.bin/texinfo/doc/txi-no.tex @@ -1,72 +1,71 @@ -% Norwegian translation for texinfo.tex (1999-02-09, GNU Texinfo 3.12d).
-% Enables the use of words like Kapittel instead of Chapter, etc.
-%
-% Copyright (C) 1999 Trond Endrestøl <endrestol@hotmail.com>
-%
-% This program is free software; you can redistribute it and/or modify
-% it under the terms of the GNU General Public License as published by
-% the Free Software Foundation; either version 2 of the License, or
-% (at your option) any later version.
-%
-% This program is distributed in the hope that it will be useful,
-% but WITHOUT ANY WARRANTY; without even the implied warranty of
-% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-% GNU General Public License for more details.
-%
-% You should have received a copy of the GNU General Public License
-% along with this program; if not, write to the Free Software
-% Foundation, Inc., 59 Temple Place - Suite 330, Boston,
-% MA 02111-1307, USA.
-%
-\gdef\putwordAppendix{Vedlegg}
-\gdef\putwordChapter{Kapittel}
-\gdef\putwordfile{fil}
-\gdef\putwordIndexIsEmpty{(Indeks er tom)}
-\gdef\putwordIndexNonexistent{(Indeks eksisterer ikke)}
-\gdef\putwordInfo{Info}
-\gdef\putwordMethodon{Metode p\aa}
-\gdef\putwordNoTitle{Ingen tittel}
-\gdef\putwordof{av}
-\gdef\putwordon{p\aa}
-\gdef\putwordpage{side}
-\gdef\putwordsection{avsnitt}
-\gdef\putwordSection{Avsnitt}
-\gdef\putwordsee{se}
-\gdef\putwordSee{Se}
-\gdef\putwordShortTOC{Kort innholdsfortegnelse}
-\gdef\putwordTOC{Innholdsfortegnelse}
-%
-\gdef\putwordMJan{januar}
-\gdef\putwordMFeb{februar}
-\gdef\putwordMMar{mars}
-\gdef\putwordMApr{april}
-\gdef\putwordMMay{mai}
-\gdef\putwordMJun{juni}
-\gdef\putwordMJul{juli}
-\gdef\putwordMAug{august}
-\gdef\putwordMSep{september}
-\gdef\putwordMOct{oktober}
-\gdef\putwordMNov{november}
-\gdef\putwordMDec{desember}
-%
-\gdef\putwordDefmac{Makro}
-\gdef\putwordDefspec{Spesiell form}
-\gdef\putwordDefivar{Forekomstvariabel}
-\gdef\putwordDefvar{Variabel}
-\gdef\putwordDefopt{Brukervalg}
-\gdef\putwordDeftypevar{Variabel}
-\gdef\putwordDeffunc{Funksjon}
-\gdef\putwordDeftypefun{Funksjon}
-%
-% Redefine \today to produce Norwegian
-% preferred dates such as 28. januar 1999.
-%
-\gdef\today{%
- \number\day.\space
- \ifcase\month
- \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr
- \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug
- \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec
- \fi
- \space\number\year}
-%
+% Norwegian translation for texinfo.tex (1999-10-29, GNU Texinfo 4.0). +% Enables the use of words like Kapittel instead of Chapter, etc. +% +% Copyright (C) 1999 Trond Endrest=F8l <endrestol@hotmail.com> +% +% This program is free software; you can redistribute it and/or modify +% it under the terms of the GNU General Public License as published by +% the Free Software Foundation; either version 2 of the License, or +% (at your option) any later version. +% +% This program is distributed in the hope that it will be useful, +% but WITHOUT ANY WARRANTY; without even the implied warranty of +% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +% GNU General Public License for more details. +% +% You should have received a copy of the GNU General Public License +% along with this program; if not, write to the Free Software +% Foundation, Inc., 59 Temple Place - Suite 330, Boston, +% MA 02111-1307, USA. +% +\gdef\putwordAppendix{Vedlegg} +\gdef\putwordChapter{Kapittel} +\gdef\putwordfile{fil} +\gdef\putwordIndexIsEmpty{(Indeks er tom)} +\gdef\putwordIndexNonexistent{(Indeks eksisterer ikke)} +\gdef\putwordInfo{Info} +\gdef\putwordMethodon{Metode p\aa} +\gdef\putwordNoTitle{Ingen tittel} +\gdef\putwordof{av} +\gdef\putwordon{p\aa} +\gdef\putwordpage{side} +\gdef\putwordsection{avsnitt} +\gdef\putwordSection{Avsnitt} +\gdef\putwordsee{se} +\gdef\putwordSee{Se} +\gdef\putwordShortTOC{Kort innholdsfortegnelse} +\gdef\putwordTOC{Innholdsfortegnelse} +% +\gdef\putwordMJan{januar} +\gdef\putwordMFeb{februar} +\gdef\putwordMMar{mars} +\gdef\putwordMApr{april} +\gdef\putwordMMay{mai} +\gdef\putwordMJun{juni} +\gdef\putwordMJul{juli} +\gdef\putwordMAug{august} +\gdef\putwordMSep{september} +\gdef\putwordMOct{oktober} +\gdef\putwordMNov{november} +\gdef\putwordMDec{desember} +% +\gdef\putwordDefmac{Makro} +\gdef\putwordDefspec{Spesiell form} +\gdef\putwordDefivar{Forekomstvariabel} +\gdef\putwordDefvar{Variabel} +\gdef\putwordDefopt{Brukervalg} +\gdef\putwordDeftypevar{Variabel} +\gdef\putwordDeffunc{Funksjon} +\gdef\putwordDeftypefun{Funksjon} +% +% Redefine \today to produce Norwegian +% preferred dates such as 28. januar 1999. +% +\gdef\today{% + \number\day.\space + \ifcase\month + \or\putwordMJan\or\putwordMFeb\or\putwordMMar\or\putwordMApr + \or\putwordMMay\or\putwordMJun\or\putwordMJul\or\putwordMAug + \or\putwordMSep\or\putwordMOct\or\putwordMNov\or\putwordMDec + \fi + \space\number\year} diff --git a/gnu/usr.bin/texinfo/doc/version.texi b/gnu/usr.bin/texinfo/doc/version.texi index 2d7c14922ab..c21b39a2cb5 100644 --- a/gnu/usr.bin/texinfo/doc/version.texi +++ b/gnu/usr.bin/texinfo/doc/version.texi @@ -1,3 +1,4 @@ -@set UPDATED 28 September 1999 -@set EDITION 4.0 -@set VERSION 4.0 +@set UPDATED 28 March 2002 +@set UPDATED-MONTH March 2002 +@set EDITION 4.2 +@set VERSION 4.2 diff --git a/gnu/usr.bin/texinfo/info/doc.h b/gnu/usr.bin/texinfo/info/doc.h index 423998e37c8..280551f360d 100644 --- a/gnu/usr.bin/texinfo/info/doc.h +++ b/gnu/usr.bin/texinfo/info/doc.h @@ -1,9 +1,7 @@ -/* doc.h -- Structure associating function pointers with documentation. */ +/* doc.h -- Structures associating function pointers with documentation. + $Id: doc.h,v 1.1.1.3 2002/06/10 13:21:02 espie Exp $ -/* 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, 2001 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 @@ -26,12 +24,44 @@ #include "info.h" /* for NAMED_FUNCTIONS, VFunction, etc. */ -typedef struct { +#if defined (INFOKEY) +/* For each function, we keep track of the first defined key sequence + which invokes that function, for each different map. This is so that + the dynamic documentation generation in infodoc.c (a) doesn't have to + search through copious KEYMAP_ENTRYs, and, more importantly, (b) the + user and programmer can choose the preferred key sequence that is + printed for any given function -- it's just the first one that + appears in the user's infokey file or the default keymaps in + infomap.c. + + Each FUNCTION_DOC has a linked list of FUNCTION_KEYSEQ structs + hanging off it, which are created on startup when the user and/or + default keymaps are being parsed. */ +typedef struct function_keyseq +{ + struct function_keyseq *next; + struct keymap_entry *map; + char *keyseq; +} FUNCTION_KEYSEQ; + +#endif /* INFOKEY */ + + +/* An array of FUNCTION_DOC structures is defined in doc.c, which is + automagically generated by the makedoc utility, whose job is to scan + through the source files for command function declarations and + compile a list of all the ones it finds. This saves tedious + housekeeping and avoids errors of omission. */ +typedef struct +{ VFunction *func; #if defined (NAMED_FUNCTIONS) char *func_name; #endif /* NAMED_FUNCTIONS */ - char *doc; +#if defined (INFOKEY) + FUNCTION_KEYSEQ *keys; +#endif /* INFOKEY */ + char *doc; } FUNCTION_DOC; extern FUNCTION_DOC function_doc_array[]; @@ -39,12 +69,31 @@ extern FUNCTION_DOC function_doc_array[]; extern char *function_documentation (); extern char *key_documentation (); extern char *pretty_keyname (); +extern char *pretty_keyseq (); +extern char *where_is (); extern char *replace_in_documentation (); extern void info_document_key (); extern void dump_map_to_message_buffer (); +/* Under the old key-binding system, an info command is specified by + the pointer to its function. Under the new INFOKEY binding system, + it is specified by a pointer to the command's FUNCTION_DOC structure, + defined in doc.c, from which the pointer to the function can be + easily divined using the InfoFunction() extractor. */ +#if defined(INFOKEY) +typedef FUNCTION_DOC InfoCommand; +#define InfoFunction(ic) ((ic) ? (ic)->func : NULL) +#define InfoCmd(fn) (&function_doc_array[A_##fn]) +#define DocInfoCmd(fd) ((fd) && (fd)->func ? (fd) : NULL) +#else /* !INFOKEY */ +typedef VFunction InfoCommand; +#define InfoFunction(vf) ((vf)) +#define InfoCmd(fn) fn +#define DocInfoCmd(fd) ((fd)->func) +#endif /* !INFOKEY */ + #if defined (NAMED_FUNCTIONS) extern char *function_name (); -extern VFunction *named_function (); +extern InfoCommand *named_function (); #endif /* NAMED_FUNCTIONS */ #endif /* !DOC_H */ diff --git a/gnu/usr.bin/texinfo/info/info-utils.c b/gnu/usr.bin/texinfo/info/info-utils.c index 18eebe777ec..50010cf84f6 100644 --- a/gnu/usr.bin/texinfo/info/info-utils.c +++ b/gnu/usr.bin/texinfo/info/info-utils.c @@ -1,5 +1,5 @@ /* info-utils.c -- miscellanous. - $Id: info-utils.c,v 1.1.1.3 2000/02/09 01:24:44 espie Exp $ + $Id: info-utils.c,v 1.1.1.4 2002/06/10 13:21:04 espie Exp $ Copyright (C) 1993, 98 Free Software Foundation, Inc. @@ -443,9 +443,11 @@ printed_representation (character, hpos) { register int i = 0; int printable_limit = ISO_Latin_p ? 255 : 127; - + + if (raw_escapes_p && character == '\033') + the_rep[i++] = character; /* Show CTRL-x as ^X. */ - if (iscntrl (character) && character < 127) + else if (iscntrl (character) && character < 127) { switch (character) { diff --git a/gnu/usr.bin/texinfo/info/infomap.h b/gnu/usr.bin/texinfo/info/infomap.h index 65968cbdff4..524e8f61f7d 100644 --- a/gnu/usr.bin/texinfo/info/infomap.h +++ b/gnu/usr.bin/texinfo/info/infomap.h @@ -1,9 +1,7 @@ -/* infomap.h -- Description of a keymap in Info and related functions. */ +/* infomap.h -- description of a keymap in Info and related functions. + $Id: infomap.h,v 1.1.1.3 2002/06/10 13:21:06 espie Exp $ -/* 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, 2001 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 @@ -52,9 +50,10 @@ FUNCTION is the address of a function to run, or the address of a keymap to indirect through. TYPE says which kind of thing FUNCTION is. */ -typedef struct { +typedef struct keymap_entry +{ char type; - VFunction *function; + InfoCommand *function; } KEYMAP_ENTRY; typedef KEYMAP_ENTRY *Keymap; diff --git a/gnu/usr.bin/texinfo/info/nodes.c b/gnu/usr.bin/texinfo/info/nodes.c index e90fd2eda07..97bd2a30c48 100644 --- a/gnu/usr.bin/texinfo/info/nodes.c +++ b/gnu/usr.bin/texinfo/info/nodes.c @@ -1,7 +1,7 @@ /* nodes.c -- how to get an Info file and node. - $Id: nodes.c,v 1.1.1.3 2000/02/09 01:24:52 espie Exp $ + $Id: nodes.c,v 1.1.1.4 2002/06/10 13:21:07 espie Exp $ - Copyright (C) 1993, 98, 99 Free Software Foundation, Inc. + Copyright (C) 1993, 98, 99, 2000 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -222,11 +222,12 @@ info_find_file_internal (filename, get_tags) if (info_loaded_files) { for (i = 0; (file_buffer = info_loaded_files[i]); i++) - if ((FILENAME_CMP (filename, file_buffer->filename) == 0) || - (FILENAME_CMP (filename, file_buffer->fullpath) == 0) || - (!IS_ABSOLUTE (filename) && - FILENAME_CMP (filename, - filename_non_directory (file_buffer->fullpath)) == 0)) + if ((FILENAME_CMP (filename, file_buffer->filename) == 0) + || (FILENAME_CMP (filename, file_buffer->fullpath) == 0) + || (!IS_ABSOLUTE (filename) + && FILENAME_CMP (filename, + filename_non_directory (file_buffer->fullpath)) + == 0)) { struct stat new_info, *old_info; @@ -241,9 +242,8 @@ info_find_file_internal (filename, get_tags) return file_buffer; #endif /* HANDLE_MAN_PAGES */ - /* The file appears to be already loaded, and it is not "dir". - Check to see if it has changed since the last time it was - loaded. */ + /* The file appears to be already loaded, and is not "dir". Check + to see if it's changed since the last time it was loaded. */ if (stat (file_buffer->fullpath, &new_info) == -1) { filesys_error_number = errno; @@ -252,8 +252,8 @@ info_find_file_internal (filename, get_tags) old_info = &file_buffer->finfo; - if ((new_info.st_size != old_info->st_size) || - (new_info.st_mtime != old_info->st_mtime)) + if (new_info.st_size != old_info->st_size + || new_info.st_mtime != old_info->st_mtime) { /* The file has changed. Forget that we ever had loaded it in the first place. */ @@ -267,13 +267,13 @@ info_find_file_internal (filename, get_tags) for this file, and there isn't one here, build the nodes for this file_buffer. In any case, return the file_buffer object. */ - if (!file_buffer->contents) - { - /* The file's contents have been gc'ed. Reload it. */ - info_reload_file_buffer_contents (file_buffer); - if (!file_buffer->contents) - return NULL; - } + if (!file_buffer->contents) + { + /* The file's contents have been gc'ed. Reload it. */ + info_reload_file_buffer_contents (file_buffer); + if (!file_buffer->contents) + return NULL; + } if (get_tags && !file_buffer->tags) build_tags_and_nodes (file_buffer); @@ -770,20 +770,20 @@ get_tags_of_indirect_tags_table (file_buffer, indirect_binding, tags_binding) /* Build the file buffer's list of subfiles. */ { char *containing_dir = xstrdup (file_buffer->fullpath); - char *temp = filename_non_directory (containing_dir); + char *temp = filename_non_directory (containing_dir); int len_containing_dir; - if (temp > containing_dir) - { - if (HAVE_DRIVE (file_buffer->fullpath) && - temp == containing_dir + 2) - { - /* Avoid converting "d:foo" into "d:/foo" below. */ - *temp = '.'; - temp += 2; - } - temp[-1] = 0; - } + if (temp > containing_dir) + { + if (HAVE_DRIVE (file_buffer->fullpath) && + temp == containing_dir + 2) + { + /* Avoid converting "d:foo" into "d:/foo" below. */ + *temp = '.'; + temp += 2; + } + temp[-1] = 0; + } len_containing_dir = strlen (containing_dir); @@ -940,20 +940,22 @@ info_node_of_file_buffer_tags (file_buffer, nodename) TAG *tag; int i; + /* If no tags at all (possibly a misformatted info file), quit. */ + if (!file_buffer->tags) { + return NULL; + } + for (i = 0; (tag = file_buffer->tags[i]); i++) if (strcmp (nodename, tag->nodename) == 0) { - FILE_BUFFER *subfile; - - subfile = info_find_file_internal (tag->filename, INFO_NO_TAGS); - + FILE_BUFFER *subfile = info_find_file_internal (tag->filename, + INFO_NO_TAGS); if (!subfile) return NULL; if (!subfile->contents) { info_reload_file_buffer_contents (subfile); - if (!subfile->contents) return NULL; } @@ -1187,7 +1189,7 @@ info_reload_file_buffer_contents (fb) /* Let the filesystem do all the work for us. */ fb->contents = filesys_read_info_file (fb->fullpath, &(fb->filesize), &(fb->finfo), - &is_compressed); + &is_compressed); if (is_compressed) fb->flags |= N_IsCompressed; } diff --git a/gnu/usr.bin/texinfo/info/pcterm.c b/gnu/usr.bin/texinfo/info/pcterm.c index a7aa4f3704b..7e5b0626ab0 100644 --- a/gnu/usr.bin/texinfo/info/pcterm.c +++ b/gnu/usr.bin/texinfo/info/pcterm.c @@ -1,5 +1,5 @@ /* pc_term.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows. - $Id: pcterm.c,v 1.1.1.1 2000/02/09 01:25:07 espie Exp $ + $Id: pcterm.c,v 1.1.1.2 2002/06/10 13:21:14 espie Exp $ Copyright (C) 1998, 99 Free Software Foundation, Inc. @@ -329,6 +329,13 @@ pc_initialize_terminal (term_name) term_kP = (char *)find_sequence (K_PageUp); term_kN = (char *)find_sequence (K_PageDown); +#if defined(INFOKEY) + term_kh = (char *)find_sequence (K_Home); + term_ke = (char *)find_sequence (K_End); + term_ki = (char *)find_sequence (K_Insert); + term_kx = (char *)find_sequence (K_Delete); +#endif + /* Set all the hooks to our PC-specific functions. */ terminal_begin_inverse_hook = pc_begin_inverse; terminal_end_inverse_hook = pc_end_inverse; @@ -381,8 +388,13 @@ static struct {K_Control_Down, "\033\061m"}, {K_Control_Center, "\033\061l"}, - {K_Home, "\001"}, /* ...and these are for moving IN a node */ - {K_End, "\005"}, /* they're Numeric-Keypad-Keys, so */ +#if defined(INFOKEY) + {K_Home, "\033[H"}, /* ...and these are for moving IN a node */ + {K_End, "\033[F"}, /* they're Numeric-Keypad-Keys, so */ +#else + {K_Home, "\001"}, + {K_End, "\005"}, +#endif {K_Left, "\033[D"}, /* NUMLOCK should be off !! */ {K_Right, "\033[C"}, {K_Down, "\033[B"}, @@ -394,8 +406,13 @@ static struct {K_Control_Home, "\033<"}, {K_Control_End, "\033>"}, - {K_EHome, "\001"}, /* these are also for moving IN a node */ - {K_EEnd, "\005"}, /* they're the "extended" (Grey) keys */ +#if defined(INFOKEY) + {K_EHome, "\033[H"}, /* these are also for moving IN a node */ + {K_EEnd, "\033[F"}, /* they're the "extended" (Grey) keys */ +#else + {K_EHome, "\001"}, + {K_EEnd, "\005"}, +#endif {K_ELeft, "\033[D"}, {K_ERight, "\033[C"}, {K_EDown, "\033[B"}, @@ -411,6 +428,10 @@ static struct {K_F1, "\10"}, /* YEAH, gimme that good old F-one-thing */ {K_Delete, "\177"}, /* to make Kp-Del be DEL (0x7f) */ {K_EDelete, "\177"}, /* to make Delete be DEL (0x7f) */ +#if defined(INFOKEY) + {K_Insert, "\033[L"}, + {K_EInsert, "\033[L"}, +#endif /* These are here to map more Alt-X keys to ESC X sequences. */ {K_Alt_Q, "\033q"}, diff --git a/gnu/usr.bin/texinfo/info/search.c b/gnu/usr.bin/texinfo/info/search.c index 89720f410cf..442bf683f29 100644 --- a/gnu/usr.bin/texinfo/info/search.c +++ b/gnu/usr.bin/texinfo/info/search.c @@ -1,5 +1,5 @@ /* search.c -- searching large bodies of text. - $Id: search.c,v 1.1.1.3 2000/02/09 01:24:52 espie Exp $ + $Id: search.c,v 1.1.1.4 2002/06/10 13:21:08 espie Exp $ Copyright (C) 1993, 97, 98 Free Software Foundation, Inc. @@ -301,7 +301,7 @@ skip_non_whitespace (string) { register int i; - for (i = 0; string && !whitespace (string[i]); i++); + for (i = 0; string && string[i] && !whitespace (string[i]); i++); return (i); } diff --git a/gnu/usr.bin/texinfo/info/session.h b/gnu/usr.bin/texinfo/info/session.h index 09aca7e4fe8..7309e94a978 100644 --- a/gnu/usr.bin/texinfo/info/session.h +++ b/gnu/usr.bin/texinfo/info/session.h @@ -1,7 +1,7 @@ /* session.h -- Functions found in session.c. - $Id: session.h,v 1.1.1.3 2000/02/09 01:24:59 espie Exp $ + $Id: session.h,v 1.1.1.4 2002/06/10 13:21:10 espie Exp $ - Copyright (C) 1993, 98, 99 Free Software Foundation, Inc. + Copyright (C) 1993, 98, 99, 2001 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 @@ -65,7 +65,6 @@ extern unsigned char info_get_input_char (), info_get_another_input_char (); extern unsigned char info_input_pending_p (); extern void remember_window_and_node (), set_remembered_pagetop_and_point (); extern void set_window_pagetop (), info_set_node_of_window (); -extern char *pretty_keyseq (); extern void initialize_keyseq (), add_char_to_keyseq (); extern void info_gather_typeahead (); extern FILE_BUFFER *file_buffer_of_window (); diff --git a/gnu/usr.bin/texinfo/info/terminal.h b/gnu/usr.bin/texinfo/info/terminal.h index 2e27268ea7f..e2fa2969c14 100644 --- a/gnu/usr.bin/texinfo/info/terminal.h +++ b/gnu/usr.bin/texinfo/info/terminal.h @@ -1,9 +1,7 @@ -/* terminal.h -- The external interface to terminal I/O. */ +/* terminal.h -- The external interface to terminal I/O. + $Id: terminal.h,v 1.1.1.4 2002/06/10 13:21:11 espie Exp $ -/* This file is part of GNU Info, a program for reading online documentation - stored in Info format. - - Copyright (C) 1993, 96, 97 Free Software Foundation, Inc. + Copyright (C) 1993, 96, 97, 2001 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 @@ -118,8 +116,11 @@ extern VFunction *terminal_scroll_terminal_hook; extern void terminal_ring_bell (); extern VFunction *terminal_ring_bell_hook; -/* The key sequences output by the arrow keys, if this terminal has any. */ +/* The key sequences output by special keys, if this terminal has any. */ extern char *term_ku, *term_kd, *term_kr, *term_kl; extern char *term_kP, *term_kN; +extern char *term_ke, *term_kh; +extern char *term_kx, *term_ki; +extern char *term_kD; #endif /* !TERMINAL_H */ diff --git a/gnu/usr.bin/texinfo/install-sh b/gnu/usr.bin/texinfo/install-sh index ebc66913e94..b41a2459161 100644 --- a/gnu/usr.bin/texinfo/install-sh +++ b/gnu/usr.bin/texinfo/install-sh @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/sh # # install - install a program, script, or datafile # This comes from X11R5 (mit/util/scripts/install.sh). @@ -118,8 +118,9 @@ if [ x"$dir_arg" != x ]; then if [ -d $dst ]; then instcmd=: + chmodcmd="" else - instcmd=mkdir + instcmd=$mkdirprog fi else @@ -162,8 +163,8 @@ dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'` # Skip lots of stat calls in the usual case. if [ ! -d "$dstdir" ]; then -defaultIFS=' -' +defaultIFS=' + ' IFS="${IFS-${defaultIFS}}" oIFS="${IFS}" diff --git a/gnu/usr.bin/texinfo/intl/ChangeLog b/gnu/usr.bin/texinfo/intl/ChangeLog index 198950159da..478d83460ba 100644 --- a/gnu/usr.bin/texinfo/intl/ChangeLog +++ b/gnu/usr.bin/texinfo/intl/ChangeLog @@ -1,1086 +1,4 @@ -1998-04-29 Ulrich Drepper <drepper@cygnus.com> +2002-03-12 GNU <bug-gnu-gettext@gnu.org> - * intl/localealias.c (read_alias_file): Use unsigned char for - local variables. Remove unused variable tp. - * intl/l10nflist.c (_nl_normalize_codeset): Use unsigned char * - for type of codeset. For loosing Solaris systems. - * intl/loadinfo.h: Adapt prototype of _nl_normalize_codeset. - * intl/bindtextdom.c (BINDTEXTDOMAIN): Don't define local variable - len if not needed. - Patches by Jim Meyering. + * Version 0.11.1 released. -1998-04-28 Ulrich Drepper <drepper@cygnus.com> - - * loadmsgcat.c (_nl_load_domain): Don't assign the element use_mmap if - mmap is not supported. - - * hash-string.h: Don't include <values.h>. - -1998-04-27 Ulrich Drepper <drepper@cygnus.com> - - * textdomain.c: Use strdup is available. - - * localealias.c: Define HAVE_MEMPCPY so that we can use this - function. Define and use semapahores to protect modfication of - global objects when compiling for glibc. Add code to allow - freeing alias table. - - * l10nflist.c: Don't assume stpcpy not being a macro. - - * gettextP.h: Define internal_function macri if not already done. - Use glibc byte-swap macros instead of defining SWAP when compiled - for glibc. - (struct loaded_domain): Add elements to allow unloading. - - * Makefile.in (distclean): Don't remove libintl.h here. - - * bindtextdomain.c: Carry over changes from glibc. Use strdup if - available. - - * dcgettext.c: Don't assume stpcpy not being a macro. Mark internal - functions. Add memory freeing code for glibc. - - * dgettext.c: Update copyright. - - * explodename.c: Include stdlib.h and string.h only if they exist. - Use strings.h eventually. - - * finddomain.c: Mark internal functions. Use strdup if available. - Add memory freeing code for glibc. - -1997-10-10 20:00 Ulrich Drepper <drepper@cygnus.com> - - * libgettext.h: Fix dummy textdomain and bindtextdomain macros. - They should return reasonable values. - Reported by Tom Tromey <tromey@cygnus.com>. - -1997-09-16 03:33 Ulrich Drepper <drepper@cygnus.com> - - * libgettext.h: Define PARAMS also to `args' if __cplusplus is defined. - * intlh.inst.in: Likewise. - Reported by Jean-Marc Lasgouttes <Jean-Marc.Lasgouttes@inria.fr>. - - * libintl.glibc: Update from current glibc version. - -1997-09-06 02:10 Ulrich Drepper <drepper@cygnus.com> - - * intlh.inst.in: Reformat copyright. - -1997-08-19 15:22 Ulrich Drepper <drepper@cygnus.com> - - * dcgettext.c (DCGETTEXT): Remove wrong comment. - -1997-08-16 00:13 Ulrich Drepper <drepper@cygnus.com> - - * Makefile.in (install-data): Don't change directory to install. - -1997-08-01 14:30 Ulrich Drepper <drepper@cygnus.com> - - * cat-compat.c: Fix copyright. - - * localealias.c: Don't define strchr unless !HAVE_STRCHR. - - * loadmsgcat.c: Update copyright. Fix typos. - - * l10nflist.c: Don't define strchr unless !HAVE_STRCHR. - (_nl_make_l10nflist): Handle sponsor and revision correctly. - - * gettext.c: Update copyright. - * gettext.h: Likewise. - * hash-string.h: Likewise. - - * finddomain.c: Remoave dead code. Define strchr only if - !HAVE_STRCHR. - - * explodename.c: Include <sys/types.h>. - - * explodename.c: Reformat copyright text. - (_nl_explode_name): Fix typo. - - * dcgettext.c: Define and use __set_errno. - (guess_category_value): Don't use setlocale if HAVE_LC_MESSAGES is - not defined. - - * bindtextdom.c: Pretty printing. - -1997-05-01 02:25 Ulrich Drepper <drepper@cygnus.com> - - * dcgettext.c (guess_category_value): Don't depend on - HAVE_LC_MESSAGES. We don't need the macro here. - Patch by Bruno Haible <haible@ilog.fr>. - - * cat-compat.c (textdomain): DoN't refer to HAVE_SETLOCALE_NULL - macro. Instead use HAVE_LOCALE_NULL and define it when using - glibc, as in dcgettext.c. - Patch by Bruno Haible <haible@ilog.fr>. - - * Makefile.in (CPPFLAGS): New variable. Reported by Franc,ois - Pinard. - -Mon Mar 10 06:51:17 1997 Ulrich Drepper <drepper@cygnus.com> - - * Makefile.in: Implement handling of libtool. - - * gettextP.h: Change data structures for use of generic lowlevel - i18n file handling. - -Wed Dec 4 20:21:18 1996 Ulrich Drepper <drepper@cygnus.com> - - * textdomain.c: Put parentheses around arguments of memcpy macro - definition. - * localealias.c: Likewise. - * l10nflist.c: Likewise. - * finddomain.c: Likewise. - * bindtextdom.c: Likewise. - Reported by Thomas Esken. - -Mon Nov 25 22:57:51 1996 Ulrich Drepper <drepper@cygnus.com> - - * textdomain.c: Move definition of `memcpy` macro to right - position. - -Fri Nov 22 04:01:58 1996 Ulrich Drepper <drepper@cygnus.com> - - * finddomain.c [!HAVE_STRING_H && !_LIBC]: Define memcpy using - bcopy if not already defined. Reported by Thomas Esken. - * bindtextdom.c: Likewise. - * l10nflist.c: Likewise. - * localealias.c: Likewise. - * textdomain.c: Likewise. - -Tue Oct 29 11:10:27 1996 Ulrich Drepper <drepper@cygnus.com> - - * Makefile.in (libdir): Change to use exec_prefix instead of - prefix. Reported by Knut-HåvardAksnes <etokna@eto.ericsson.se>. - -Sat Aug 31 03:07:09 1996 Ulrich Drepper <drepper@cygnus.com> - - * l10nflist.c (_nl_normalize_codeset): We convert to lower case, - so don't prepend uppercase `ISO' for only numeric arg. - -Fri Jul 19 00:15:46 1996 Ulrich Drepper <drepper@cygnus.com> - - * l10nflist.c: Move inclusion of argz.h, ctype.h, stdlib.h after - definition of _GNU_SOURCE. Patch by Roland McGrath. - - * Makefile.in (uninstall): Fix another bug with `for' loop and - empty arguments. Patch by Jim Meyering. Correct name os - uninstalled files: no intl- prefix anymore. - - * Makefile.in (install-data): Again work around shells which - cannot handle mpty for list. Reported by Jim Meyering. - -Sat Jul 13 18:11:35 1996 Ulrich Drepper <drepper@cygnus.com> - - * Makefile.in (install): Split goal. Now depend on install-exec - and install-data. - (install-exec, install-data): New goals. Created from former - install goal. - Reported by Karl Berry. - -Sat Jun 22 04:58:14 1996 Ulrich Drepper <drepper@cygnus.com> - - * Makefile.in (MKINSTALLDIRS): New variable. Path to - mkinstalldirs script. - (install): use MKINSTALLDIRS variable or if the script is not present - try to find it in the $top_scrdir). - -Wed Jun 19 02:56:56 1996 Ulrich Drepper <drepper@cygnus.com> - - * l10nflist.c: Linux libc *partly* includes the argz_* functions. - Grr. Work around by renaming the static version and use macros - for renaming. - -Tue Jun 18 20:11:17 1996 Ulrich Drepper <drepper@cygnus.com> - - * l10nflist.c: Correct presence test macros of __argz_* functions. - - * l10nflist.c: Include <argz.h> based on test of it instead when - __argz_* functions are available. - Reported by Andreas Schwab. - -Thu Jun 13 15:17:44 1996 Ulrich Drepper <drepper@cygnus.com> - - * explodename.c, l10nflist.c: Define NULL for dumb systems. - -Tue Jun 11 17:05:13 1996 Ulrich Drepper <drepper@cygnus.com> - - * intlh.inst.in, libgettext.h (dcgettext): Rename local variable - result to __result to prevent name clash. - - * l10nflist.c, localealias.c, dcgettext.c: Define _GNU_SOURCE to - get prototype for stpcpy and strcasecmp. - - * intlh.inst.in, libgettext.h: Move declaration of - `_nl_msg_cat_cntr' outside __extension__ block to prevent warning - from gcc's -Wnested-extern option. - -Fri Jun 7 01:58:00 1996 Ulrich Drepper <drepper@cygnus.com> - - * Makefile.in (install): Remove comment. - -Thu Jun 6 17:28:17 1996 Ulrich Drepper <drepper@cygnus.com> - - * Makefile.in (install): Work around for another Buglix stupidity. - Always use an `else' close for `if's. Reported by Nelson Beebe. - - * Makefile.in (intlh.inst): Correct typo in phony rule. - Reported by Nelson Beebe. - -Thu Jun 6 01:49:52 1996 Ulrich Drepper <drepper@cygnus.com> - - * dcgettext.c (read_alias_file): Rename variable alloca_list to - block_list as the macro calls assume. - Patch by Eric Backus. - - * localealias.c [!HAVE_ALLOCA]: Define alloca as macro using - malloc. - (read_alias_file): Rename varriabe alloca_list to block_list as the - macro calls assume. - Patch by Eric Backus. - - * l10nflist.c: Correct conditional for <argz.h> inclusion. - Reported by Roland McGrath. - - * Makefile.in (all): Depend on all-@USE_INCLUDED_LIBINTL@, not - all-@USE_NLS@. - - * Makefile.in (install): intlh.inst comes from local dir, not - $(srcdir). - - * Makefile.in (intlh.inst): Special handling of this goal. If - used in gettext, this is really a rul to construct this file. If - used in any other package it is defined as a .PHONY rule with - empty body. - - * finddomain.c: Extract locale file information handling into - l10nfile.c. Rename local stpcpy__ function to stpcpy. - - * dcgettext.c (stpcpy): Add local definition. - - * l10nflist.c: Solve some portability problems. Patches partly by - Thomas Esken. Add local definition of stpcpy. - -Tue Jun 4 02:47:49 1996 Ulrich Drepper <drepper@cygnus.com> - - * intlh.inst.in: Don't depend including <locale.h> on - HAVE_LOCALE_H. Instead configure must rewrite this fiile - depending on the result of the configure run. - - * Makefile.in (install): libintl.inst is now called intlh.inst. - Add rules for updating intlh.inst from intlh.inst.in. - - * libintl.inst: Renamed to intlh.inst.in. - - * localealias.c, dcgettext.c [__GNUC__]: Define HAVE_ALLOCA to 1 - because gcc has __buitlin_alloca. - Reported by Roland McGrath. - -Mon Jun 3 00:32:16 1996 Ulrich Drepper <drepper@cygnus.com> - - * Makefile.in (installcheck): New goal to fulfill needs of - automake's distcheck. - - * Makefile.in (install): Reorder commands so that VERSION is - found. - - * Makefile.in (gettextsrcdir): Now use subdirectory intl/ in - @datadir@/gettext. - (COMSRCS): Add l10nfile.c. - (OBJECTS): Add l10nfile.o. - (DISTFILES): Rename to DISTFILE.normal. Remove $(DISTFILES.common). - (DISTFILE.gettext): Remove $(DISTFILES.common). - (all-gettext): Remove goal. - (install): If $(PACKAGE) = gettext install, otherwose do nothing. No - package but gettext itself should install libintl.h + headers. - (dist): Extend goal to work for gettext, too. - (dist-gettext): Remove goal. - - * dcgettext.c [!HAVE_ALLOCA]: Define macro alloca by using malloc. - -Sun Jun 2 17:33:06 1996 Ulrich Drepper <drepper@cygnus.com> - - * loadmsgcat.c (_nl_load_domain): Parameter is now comes from - find_l10nfile. - -Sat Jun 1 02:23:03 1996 Ulrich Drepper <drepper@cygnus.com> - - * l10nflist.c (__argz_next): Add definition. - - * dcgettext.c [!HAVE_ALLOCA]: Add code for handling missing alloca - code. Use new l10nfile handling. - - * localealias.c [!HAVE_ALLOCA]: Add code for handling missing - alloca code. - - * l10nflist.c: Initial revision. - -Tue Apr 2 18:51:18 1996 Ulrich Drepper <drepper@myware> - - * Makefile.in (all-gettext): New goal. Same as all-yes. - -Thu Mar 28 23:01:22 1996 Karl Eichwalder <ke@ke.central.de> - - * Makefile.in (gettextsrcdir): Define using @datadir@. - -Tue Mar 26 12:39:14 1996 Ulrich Drepper <drepper@myware> - - * finddomain.c: Include <ctype.h>. Reported by Roland McGrath. - -Sat Mar 23 02:00:35 1996 Ulrich Drepper <drepper@myware> - - * finddomain.c (stpcpy): Rename to stpcpy__ to prevent clashing - with external declaration. - -Sat Mar 2 00:47:09 1996 Ulrich Drepper <drepper@myware> - - * Makefile.in (all-no): Rename from all_no. - -Sat Feb 17 00:25:59 1996 Ulrich Drepper <drepper@myware> - - * gettextP.h [loaded_domain]: Array `successor' must now contain up - to 63 elements (because of codeset name normalization). - - * finddomain.c: Implement codeset name normalization. - -Thu Feb 15 04:39:09 1996 Ulrich Drepper <drepper@myware> - - * Makefile.in (all): Define to `all-@USE_NLS@'. - (all-yes, all_no): New goals. `all-no' is noop, `all-yes' - is former all. - -Mon Jan 15 21:46:01 1996 Howard Gayle <howard@hal.com> - - * localealias.c (alias_compare): Increment string pointers in loop - of strcasecmp replacement. - -Fri Dec 29 21:16:34 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (install-src): Who commented this goal out ? :-) - -Fri Dec 29 15:08:16 1995 Ulrich Drepper <drepper@myware> - - * dcgettext.c (DCGETTEXT): Save `errno'. Failing system calls - should not effect it because a missing catalog is no error. - Reported by Harald K<o:>nig <koenig@tat.physik.uni-tuebingen.de>. - -Tue Dec 19 22:09:13 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (Makefile): Explicitly use $(SHELL) for running - shell scripts. - -Fri Dec 15 17:34:59 1995 Andreas Schwab <schwab@issan.informatik.uni-dortmund.de> - - * Makefile.in (install-src): Only install library and header when - we use the own implementation. Don't do it when using the - system's gettext or catgets functions. - - * dcgettext.c (find_msg): Must not swap domain->hash_size here. - -Sat Dec 9 16:24:37 1995 Ulrich Drepper <drepper@myware> - - * localealias.c, libintl.inst, libgettext.h, hash-string.h, - gettextP.h, finddomain.c, dcgettext.c, cat-compat.c: - Use PARAMS instead of __P. Suggested by Roland McGrath. - -Tue Dec 5 11:39:14 1995 Larry Schwimmer <rosebud@cyclone.stanford.edu> - - * libgettext.h: Use `#if !defined (_LIBINTL_H)' instead of `#if - !_LIBINTL_H' because Solaris defines _LIBINTL_H as empty. - -Mon Dec 4 15:42:07 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (install-src): - Install libintl.inst instead of libintl.h.install. - -Sat Dec 2 22:51:38 1995 Marcus Daniels <marcus@sysc.pdx.edu> - - * cat-compat.c (textdomain): - Reverse order in which files are tried you load. First - try local file, when this failed absolute path. - -Wed Nov 29 02:03:53 1995 Nelson H. F. Beebe <beebe@math.utah.edu> - - * cat-compat.c (bindtextdomain): Add missing { }. - -Sun Nov 26 18:21:41 1995 Ulrich Drepper <drepper@myware> - - * libintl.inst: Add missing __P definition. Reported by Nelson Beebe. - - * Makefile.in: - Add dummy `all' and `dvi' goals. Reported by Tom Tromey. - -Sat Nov 25 16:12:01 1995 Franc,ois Pinard <pinard@iro.umontreal.ca> - - * hash-string.h: Capitalize arguments of macros. - -Sat Nov 25 12:01:36 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (DISTFILES): Prevent files names longer than 13 - characters. libintl.h.glibc->libintl.glibc, - libintl.h.install->libintl.inst. Reported by Joshua R. Poulson. - -Sat Nov 25 11:31:12 1995 Eric Backus <ericb@lsid.hp.com> - - * dcgettext.c: Fix bug in preprocessor conditionals. - -Sat Nov 25 02:35:27 1995 Nelson H. F. Beebe <beebe@math.utah.edu> - - * libgettext.h: Solaris cc does not understand - #if !SYMBOL1 && !SYMBOL2. Sad but true. - -Thu Nov 23 16:22:14 1995 Ulrich Drepper <drepper@myware> - - * hash-string.h (hash_string): - Fix for machine with >32 bit `unsigned long's. - - * dcgettext.c (DCGETTEXT): - Fix horrible bug in loop for alternative translation. - -Thu Nov 23 01:45:29 1995 Ulrich Drepper <drepper@myware> - - * po2tbl.sed.in, linux-msg.sed, xopen-msg.sed: - Some further simplifications in message number generation. - -Mon Nov 20 21:08:43 1995 Ulrich Drepper <drepper@myware> - - * libintl.h.glibc: Use __const instead of const in prototypes. - - * Makefile.in (install-src): - Install libintl.h.install instead of libintl.h. This - is a stripped-down version. Suggested by Peter Miller. - - * libintl.h.install, libintl.h.glibc: Initial revision. - - * localealias.c (_nl_expand_alias, read_alias_file): - Protect prototypes in type casts by __P. - -Tue Nov 14 16:43:58 1995 Ulrich Drepper <drepper@myware> - - * hash-string.h: Correct prototype for hash_string. - -Sun Nov 12 12:42:30 1995 Ulrich Drepper <drepper@myware> - - * hash-string.h (hash_string): Add prototype. - - * gettextP.h: Fix copyright. - (SWAP): Add prototype. - -Wed Nov 8 22:56:33 1995 Ulrich Drepper <drepper@myware> - - * localealias.c (read_alias_file): Forgot sizeof. - Avoid calling *printf function. This introduces a big overhead. - Patch by Roland McGrath. - -Tue Nov 7 14:21:08 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c, cat-compat.c: Wrong indentation in #if for stpcpy. - - * finddomain.c (stpcpy): - Define substitution function local. The macro was to flaky. - - * cat-compat.c: Fix typo. - - * xopen-msg.sed, linux-msg.sed: - While bringing message number to right place only accept digits. - - * linux-msg.sed, xopen-msg.sed: Now that the counter does not have - leading 0s we don't need to remove them. Reported by Marcus - Daniels. - - * Makefile.in (../po/cat-id-tbl.o): Use $(top_srdir) in - dependency. Reported by Marcus Daniels. - - * cat-compat.c: (stpcpy) [!_LIBC && !HAVE_STPCPY]: Define replacement. - Generally cleanup using #if instead of #ifndef. - - * Makefile.in: Correct typos in comment. By Franc,ois Pinard. - -Mon Nov 6 00:27:02 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (install-src): Don't install libintl.h and libintl.a - if we use an available gettext implementation. - -Sun Nov 5 22:02:08 1995 Ulrich Drepper <drepper@myware> - - * libgettext.h: Fix typo: HAVE_CATGETTS -> HAVE_CATGETS. Reported - by Franc,ois Pinard. - - * libgettext.h: Use #if instead of #ifdef/#ifndef. - - * finddomain.c: - Comments describing what has to be done should start with FIXME. - -Sun Nov 5 19:38:01 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (DISTFILES): Split. Use DISTFILES with normal meaning. - DISTFILES.common names the files common to both dist goals. - DISTFILES.gettext are the files only distributed in GNU gettext. - -Sun Nov 5 17:32:54 1995 Ulrich Drepper <drepper@myware> - - * dcgettext.c (DCGETTEXT): Correct searching in derived locales. - This was necessary since a change in _nl_find_msg several weeks - ago. I really don't know this is still not fixed. - -Sun Nov 5 12:43:12 1995 Ulrich Drepper <drepper@myware> - - * loadmsgcat.c (_nl_load_domain): Test for FILENAME == NULL. This - might mark a special condition. - - * finddomain.c (make_entry_rec): Don't make illegal entry as decided. - - * Makefile.in (dist): Suppress error message when ln failed. - Get files from $(srcdir) explicitly. - - * libgettext.h (gettext_const): Rename to gettext_noop. - -Fri Nov 3 07:36:50 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c (make_entry_rec): - Protect against wrong locale names by testing mask. - - * libgettext.h (gettext_const): Add macro definition. - Capitalize macro arguments. - -Thu Nov 2 23:15:51 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c (_nl_find_domain): - Test for pointer != NULL before accessing value. - Reported by Tom Tromey. - - * gettext.c (NULL): - Define as (void*)0 instad of 0. Reported by Franc,ois Pinard. - -Mon Oct 30 21:28:52 1995 Ulrich Drepper <drepper@myware> - - * po2tbl.sed.in: Serious typo bug fixed by Jim Meyering. - -Sat Oct 28 23:20:47 1995 Ulrich Drepper <drepper@myware> - - * libgettext.h: Disable dcgettext optimization for Solaris 2.3. - - * localealias.c (alias_compare): - Peter Miller reported that tolower in some systems is - even dumber than I thought. Protect call by `isupper'. - -Fri Oct 27 22:22:51 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (libdir, includedir): New variables. - (install-src): Install libintl.a and libintl.h in correct dirs. - -Fri Oct 27 22:07:29 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (SOURCES): Fix typo: intrl.compat.c -> intl-compat.c. - - * po2tbl.sed.in: Patch for buggy SEDs by Christian von Roques. - - * localealias.c: - Fix typo and superflous test. Reported by Christian von Roques. - -Fri Oct 6 11:52:05 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c (_nl_find_domain): - Correct some remainder from the pre-CEN syntax. Now - we don't have a constant number of successors anymore. - -Wed Sep 27 21:41:13 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (DISTFILES): Add libintl.h.glibc. - - * Makefile.in (dist-libc): Add goal for packing sources for glibc. - (COMSRCS, COMHDRS): Splitted to separate sources shared with glibc. - - * loadmsgcat.c: Forget to continue #if line. - - * localealias.c: - [_LIBC]: Rename strcasecmp to __strcasecmp to keep ANSI C name - space clean. - - * dcgettext.c, finddomain.c: Better comment to last change. - - * loadmsgcat.c: - [_LIBC]: Rename fstat, open, close, read, mmap, and munmap to - __fstat, __open, __close, __read, __mmap, and __munmap resp - to keep ANSI C name space clean. - - * finddomain.c: - [_LIBC]: Rename stpcpy to __stpcpy to keep ANSI C name space clean. - - * dcgettext.c: - [_LIBC]: Rename getced and stpcpy to __getcwd and __stpcpy resp to - keep ANSI C name space clean. - - * libgettext.h: - Include sys/types.h for those old SysV systems out there. - Reported by Francesco Potorti`. - - * loadmsgcat.c (use_mmap): Define if compiled for glibc. - - * bindtextdom.c: Include all those standard headers - unconditionally if _LIBC is defined. - - * finddomain.c: Fix 2 times defiend -> defined. - - * textdomain.c: Include libintl.h instead of libgettext.h when - compiling for glibc. Include all those standard headers - unconditionally if _LIBC is defined. - - * localealias.c, loadmsgcat.c: Prepare to be compiled in glibc. - - * gettext.c: - Include libintl.h instead of libgettext.h when compiling for glibc. - Get NULL from stddef.h if we compile for glibc. - - * finddomain.c: Include libintl.h instead of libgettext.h when - compiling for glibc. Include all those standard headers - unconditionally if _LIBC is defined. - - * dcgettext.c: Include all those standard headers unconditionally - if _LIBC is defined. - - * dgettext.c: If compiled in glibc include libintl.h instead of - libgettext.h. - (locale.h): Don't rely on HAVE_LOCALE_H when compiling for glibc. - - * dcgettext.c: If compiled in glibc include libintl.h instead of - libgettext.h. - (getcwd): Don't rely on HAVE_GETCWD when compiling for glibc. - - * bindtextdom.c: - If compiled in glibc include libintl.h instead of libgettext.h. - -Mon Sep 25 22:23:06 1995 Ulrich Drepper <drepper@myware> - - * localealias.c (_nl_expand_alias): Don't call bsearch if NMAP <= 0. - Reported by Marcus Daniels. - - * cat-compat.c (bindtextdomain): - String used in putenv must not be recycled. - Reported by Marcus Daniels. - - * libgettext.h (__USE_GNU_GETTEXT): - Additional symbol to signal that we use GNU gettext - library. - - * cat-compat.c (bindtextdomain): - Fix bug with the strange stpcpy replacement. - Reported by Nelson Beebe. - -Sat Sep 23 08:23:51 1995 Ulrich Drepper <drepper@myware> - - * cat-compat.c: Include <string.h> for stpcpy prototype. - - * localealias.c (read_alias_file): - While expand strdup code temporary variable `cp' hided - higher level variable with same name. Rename to `tp'. - - * textdomain.c (textdomain): - Avoid warning by using temporary variable in strdup code. - - * finddomain.c (_nl_find_domain): Remove unused variable `application'. - -Thu Sep 21 15:51:44 1995 Ulrich Drepper <drepper@myware> - - * localealias.c (alias_compare): - Use strcasecmp() only if available. Else use - implementation in place. - - * intl-compat.c: - Wrapper functions now call *__ functions instead of __*. - - * libgettext.h: Declare prototypes for *__ functions instead for __*. - - * cat-compat.c, loadmsgcat.c: - Don't use xmalloc, xstrdup, and stpcpy. These functions are not part - of the standard libc and so prevent libintl.a from being used - standalone. - - * bindtextdom.c: - Don't use xmalloc, xstrdup, and stpcpy. These functions are not part - of the standard libc and so prevent libintl.a from being used - standalone. - Rename to bindtextdomain__ if not used in GNU C Library. - - * dgettext.c: - Rename function to dgettext__ if not used in GNU C Library. - - * gettext.c: - Don't use xmalloc, xstrdup, and stpcpy. These functions are not part - of the standard libc and so prevent libintl.a from being used - standalone. - Functions now called gettext__ if not used in GNU C Library. - - * dcgettext.c, localealias.c, textdomain.c, finddomain.c: - Don't use xmalloc, xstrdup, and stpcpy. These functions are not part - of the standard libc and so prevent libintl.a from being used - standalone. - -Sun Sep 17 23:14:49 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c: Correct some bugs in handling of CEN standard - locale definitions. - -Thu Sep 7 01:49:28 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c: Implement CEN syntax. - - * gettextP.h (loaded_domain): Extend number of successors to 31. - -Sat Aug 19 19:25:29 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (aliaspath): Remove path to X11 locale dir. - - * Makefile.in: Make install-src depend on install. This helps - gettext to install the sources and other packages can use the - install goal. - -Sat Aug 19 15:19:33 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (uninstall): Remove stuff installed by install-src. - -Tue Aug 15 13:13:53 1995 Ulrich Drepper <drepper@myware> - - * VERSION.in: Initial revision. - - * Makefile.in (DISTFILES): - Add VERSION file. This is not necessary for gettext, but - for other packages using this library. - -Tue Aug 15 06:16:44 1995 Ulrich Drepper <drepper@myware> - - * gettextP.h (_nl_find_domain): - New prototype after changing search strategy. - - * finddomain.c (_nl_find_domain): - We now try only to find a specified catalog. Fall back to other - catalogs listed in the locale list is now done in __dcgettext. - - * dcgettext.c (__dcgettext): - Now we provide message fall back even to different languages. - I.e. if a message is not available in one language all the other - in the locale list a tried. Formerly fall back was only possible - within one language. Implemented by moving one loop from - _nl_find_domain to here. - -Mon Aug 14 23:45:50 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (gettextsrcdir): - Directory where source of GNU gettext library are made - available. - (INSTALL, INSTALL_DATA): Programs used for installing sources. - (gettext-src): New. Rule to install GNU gettext sources for use in - gettextize shell script. - -Sun Aug 13 14:40:48 1995 Ulrich Drepper <drepper@myware> - - * loadmsgcat.c (_nl_load_domain): - Use mmap for loading only when munmap function is - also available. - - * Makefile.in (install): Depend on `all' goal. - -Wed Aug 9 11:04:33 1995 Ulrich Drepper <drepper@myware> - - * localealias.c (read_alias_file): - Do not overwrite '\n' when terminating alias value string. - - * localealias.c (read_alias_file): - Handle long lines. Ignore the rest not fitting in - the buffer after the initial `fgets' call. - -Wed Aug 9 00:54:29 1995 Ulrich Drepper <drepper@myware> - - * gettextP.h (_nl_load_domain): - Add prototype, replacing prototype for _nl_load_msg_cat. - - * finddomain.c (_nl_find_domain): - Remove unneeded variable filename and filename_len. - (expand_alias): Remove prototype because functions does not - exist anymore. - - * localealias.c (read_alias_file): - Change type of fname_len parameter to int. - (xmalloc): Add prototype. - - * loadmsgcat.c: Better prototypes for xmalloc. - -Tue Aug 8 22:30:39 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c (_nl_find_domain): - Allow alias name to be constructed from the four components. - - * Makefile.in (aliaspath): New variable. Set to preliminary value. - (SOURCES): Add localealias.c. - (OBJECTS): Add localealias.o. - - * gettextP.h: Add prototype for _nl_expand_alias. - - * finddomain.c: Aliasing handled in intl/localealias.c. - - * localealias.c: Aliasing for locale names. - - * bindtextdom.c: Better prototypes for xmalloc and xstrdup. - -Mon Aug 7 23:47:42 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (DISTFILES): gettext.perl is now found in misc/. - - * cat-compat.c (bindtextdomain): - Correct implementation. dirname parameter was not used. - Reported by Marcus Daniels. - - * gettextP.h (loaded_domain): - New fields `successor' and `decided' for oo, lazy - message handling implementation. - - * dcgettext.c: - Adopt for oo, lazy message handliing. - Now we can inherit translations from less specific locales. - (find_msg): New function. - - * loadmsgcat.c, finddomain.c: - Complete rewrite. Implement oo, lazy message handling :-). - We now have an additional environment variable `LANGUAGE' with - a higher priority than LC_ALL for the LC_MESSAGE locale. - Here we can set a colon separated list of specifications each - of the form `language[_territory[.codeset]][@modifier]'. - -Sat Aug 5 09:55:42 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c (unistd.h): - Include to get _PC_PATH_MAX defined on system having it. - -Fri Aug 4 22:42:00 1995 Ulrich Drepper <drepper@myware> - - * finddomain.c (stpcpy): Include prototype. - - * Makefile.in (dist): Remove `copying instead' message. - -Wed Aug 2 18:52:03 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (ID, TAGS): Do not use $^. - -Tue Aug 1 20:07:11 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (TAGS, ID): Use $^ as command argument. - (TAGS): Give etags -o option t write to current directory, - not $(srcdir). - (ID): Use $(srcdir) instead os $(top_srcdir)/src. - (distclean): Remove ID. - -Sun Jul 30 11:51:46 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (gnulocaledir): - New variable, always using share/ for data directory. - (DEFS): Add GNULOCALEDIR, used in finddomain.c. - - * finddomain.c (_nl_default_dirname): - Set to GNULOCALEDIR, because it always has to point - to the directory where GNU gettext Library writes it to. - - * intl-compat.c (textdomain, bindtextdomain): - Undefine macros before function definition. - -Sat Jul 22 01:10:02 1995 Ulrich Drepper <drepper@myware> - - * libgettext.h (_LIBINTL_H): - Protect definition in case where this file is included as - libgettext.h on Solaris machines. Add comment about this. - -Wed Jul 19 02:36:42 1995 Ulrich Drepper <drepper@myware> - - * intl-compat.c (textdomain): Correct typo. - -Wed Jul 19 01:51:35 1995 Ulrich Drepper <drepper@myware> - - * dcgettext.c (dcgettext): Function now called __dcgettext. - - * dgettext.c (dgettext): Now called __dgettext and calls - __dcgettext. - - * gettext.c (gettext): - Function now called __gettext and calls __dgettext. - - * textdomain.c (textdomain): Function now called __textdomain. - - * bindtextdom.c (bindtextdomain): Function now called - __bindtextdomain. - - * intl-compat.c: Initial revision. - - * Makefile.in (SOURCES): Add intl-compat.c. - (OBJECTS): We always compile the GNU gettext library functions. - OBJECTS contains all objects but cat-compat.o, ../po/cat-if-tbl.o, - and intl-compat.o. - (GETTOBJS): Contains now only intl-compat.o. - - * libgettext.h: - Re-include protection matches dualistic character of libgettext.h. - For all functions in GNU gettext library define __ counter part. - - * finddomain.c (strchr): Define as index if not found in C library. - (_nl_find_domain): For relative paths paste / in between. - -Tue Jul 18 16:37:45 1995 Ulrich Drepper <drepper@myware> - - * loadmsgcat.c, finddomain.c: Add inclusion of sys/types.h. - - * xopen-msg.sed: Fix bug with `msgstr ""' lines. - A little bit better comments. - -Tue Jul 18 01:18:27 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in: - po-mode.el, makelinks, combine-sh are now found in ../misc. - - * po-mode.el, makelinks, combine-sh, elisp-comp: - Moved to ../misc/. - - * libgettext.h, gettextP.h, gettext.h: Uniform test for __STDC__. - -Sun Jul 16 22:33:02 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (INSTALL, INSTALL_DATA): New variables. - (install-data, uninstall): Install/uninstall .elc file. - - * po-mode.el (Installation comment): - Add .pox as possible extension of .po files. - -Sun Jul 16 13:23:27 1995 Ulrich Drepper <drepper@myware> - - * elisp-comp: Complete new version by Franc,ois: This does not - fail when not compiling in the source directory. - -Sun Jul 16 00:12:17 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (../po/cat-id-tbl.o): - Use $(MAKE) instead of make for recursive make. - - * Makefile.in (.el.elc): Use $(SHELL) instead of /bin/sh. - (install-exec): Add missing dummy goal. - (install-data, uninstall): @ in multi-line shell command at - beginning, not in front of echo. Reported by Eric Backus. - -Sat Jul 15 00:21:28 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (DISTFILES): - Rename libgettext.perl to gettext.perl to fit in 14 chars - file systems. - - * gettext.perl: - Rename to gettext.perl to fit in 14 chars file systems. - -Thu Jul 13 23:17:20 1995 Ulrich Drepper <drepper@myware> - - * cat-compat.c: If !STDC_HEADERS try to include malloc.h. - -Thu Jul 13 20:55:02 1995 Ulrich Drepper <drepper@myware> - - * po2tbl.sed.in: Pretty printing. - - * linux-msg.sed, xopen-msg.sed: - Correct bugs with handling substitute flags in branches. - - * hash-string.h (hash_string): - Old K&R compilers don't under stand `unsigned char'. - - * gettext.h (nls_uint32): - Some old K&R compilers (eg HP) don't understand `unsigned int'. - - * cat-compat.c (msg_to_cat_id): De-ANSI-fy prototypes. - -Thu Jul 13 01:34:33 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (ELCFILES): New variable. - (DISTFILES): Add elisp-comp. - Add implicit rule for .el -> .elc compilation. - (install-data): install $ELCFILES - (clean): renamed po-to-tbl and po-to-msg to po2tbl and po2msg resp. - - * elisp-comp: Initial revision - -Wed Jul 12 16:14:52 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in: - cat-id-tbl.c is now found in po/. This enables us to use an identical - intl/ directory in all packages. - - * dcgettext.c (dcgettext): hashing does not work for table size <= 2. - - * textdomain.c: fix typo (#if def -> #if defined) - -Tue Jul 11 18:44:43 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in (stamp-cat-id): use top_srcdir to address source files - (DISTFILES,distclean): move tupdate.perl to src/ - - * po-to-tbl.sed.in: - add additional jump to clear change flag to recognize multiline strings - -Tue Jul 11 01:32:50 1995 Ulrich Drepper <drepper@myware> - - * textdomain.c: Protect inclusion of stdlib.h and string.h. - - * loadmsgcat.c: Protect inclusion of stdlib.h. - - * libgettext.h: Protect inclusion of locale.h. - Allow use in C++ programs. - Define NULL is not happened already. - - * Makefile.in (DISTFILES): ship po-to-tbl.sed.in instead of - po-to-tbl.sed. - (distclean): remove po-to-tbl.sed and tupdate.perl. - - * tupdate.perl.in: Substitute Perl path even in exec line. - Don't include entries without translation from old .po file. - -Tue Jul 4 00:41:51 1995 Ulrich Drepper <drepper@myware> - - * tupdate.perl.in: use "Updated: " in msgid "". - - * cat-compat.c: Fix typo (LOCALDIR -> LOCALEDIR). - Define getenv if !__STDC__. - - * bindtextdom.c: Protect stdlib.h and string.h inclusion. - Define free if !__STDC__. - - * finddomain.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. - Define free if !__STDC__. - - * cat-compat.c: Change DEF_MSG_DOM_DIR to LOCALEDIR. - -Mon Jul 3 23:56:30 1995 Ulrich Drepper <drepper@myware> - - * Makefile.in: Use LOCALEDIR instead of DEF_MSG_DOM_DIR. - Remove unneeded $(srcdir) from Makefile.in dependency. - - * makelinks: Add copyright and short description. - - * po-mode.el: Last version for 0.7. - - * tupdate.perl.in: Fix die message. - - * dcgettext.c: Protect include of string.h. - - * gettext.c: Protect include of stdlib.h and further tries to get NULL. - - * finddomain.c: Some corrections in includes. - - * Makefile.in (INCLUDES): Prune list correct path to Makefile.in. - - * po-to-tbl.sed: Adopt for new .po file format. - - * linux-msg.sed, xopen-msg.sed: Adopt for new .po file format. - -Sun Jul 2 23:55:03 1995 Ulrich Drepper <drepper@myware> - - * tupdate.perl.in: Complete rewrite for new .po file format. - -Sun Jul 2 02:06:50 1995 Ulrich Drepper <drepper@myware> - - * First official release. This directory contains all the code - needed to internationalize own packages. It provides functions - which allow to use the X/Open catgets function with an interface - like the Uniforum gettext function. For system which does not - have neither of those a complete implementation is provided. diff --git a/gnu/usr.bin/texinfo/intl/Makefile.in b/gnu/usr.bin/texinfo/intl/Makefile.in index 970253a111a..c2cb20f1138 100644 --- a/gnu/usr.bin/texinfo/intl/Makefile.in +++ b/gnu/usr.bin/texinfo/intl/Makefile.in @@ -1,19 +1,20 @@ # Makefile for directory with message catalog handling in GNU NLS Utilities. -# Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +# Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc. # -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2, or (at your option) +# This program is free software; you can redistribute it and/or modify it +# under the terms of the GNU Library General Public License as published +# by the Free Software Foundation; either version 2, or (at your option) # any later version. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Library General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# You should have received a copy of the GNU Library General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, +# USA. PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -28,75 +29,107 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ transform = @program_transform_name@ -libdir = $(exec_prefix)/lib -includedir = $(prefix)/include -datadir = $(prefix)/@DATADIRNAME@ +libdir = @libdir@ +includedir = @includedir@ +datadir = @datadir@ localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale -gettextsrcdir = @datadir@/gettext/intl -aliaspath = $(localedir):. +gettextsrcdir = $(datadir)/gettext/intl +aliaspath = $(localedir) subdir = intl INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` -l = @l@ +l = @INTL_LIBTOOL_SUFFIX_PREFIX@ AR = ar CC = @CC@ LIBTOOL = @LIBTOOL@ RANLIB = @RANLIB@ +YACC = @INTLBISON@ -y -d +YFLAGS = --name-prefix=__gettext -DEFS = -DLOCALEDIR=\"$(localedir)\" -DGNULOCALEDIR=\"$(gnulocaledir)\" \ --DLOCALE_ALIAS_PATH=\"$(aliaspath)\" @DEFS@ +DEFS = -DLOCALEDIR=\"$(localedir)\" -DLOCALE_ALIAS_PATH=\"$(aliaspath)\" \ +-DLIBDIR=\"$(libdir)\" -DIN_LIBINTL @DEFS@ CPPFLAGS = @CPPFLAGS@ CFLAGS = @CFLAGS@ LDFLAGS = @LDFLAGS@ COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) -HEADERS = $(COMHDRS) libgettext.h loadinfo.h -COMHDRS = gettext.h gettextP.h hash-string.h -SOURCES = $(COMSRCS) intl-compat.c cat-compat.c +HEADERS = $(COMHDRS) libgnuintl.h loadinfo.h +COMHDRS = gmo.h gettextP.h hash-string.h plural-exp.h eval-plural.h os2compat.h +SOURCES = $(COMSRCS) intl-compat.c COMSRCS = bindtextdom.c dcgettext.c dgettext.c gettext.c \ finddomain.c loadmsgcat.c localealias.c textdomain.c l10nflist.c \ -explodename.c +explodename.c dcigettext.c dcngettext.c dngettext.c ngettext.c plural.y \ +plural-exp.c localcharset.c localename.c osdep.c os2compat.c OBJECTS = @INTLOBJS@ bindtextdom.$lo dcgettext.$lo dgettext.$lo gettext.$lo \ finddomain.$lo loadmsgcat.$lo localealias.$lo textdomain.$lo l10nflist.$lo \ -explodename.$lo -CATOBJS = cat-compat.$lo ../po/cat-id-tbl.$lo +explodename.$lo dcigettext.$lo dcngettext.$lo dngettext.$lo ngettext.$lo \ +plural.$lo plural-exp.$lo localcharset.$lo localename.$lo osdep.$lo GETTOBJS = intl-compat.$lo -DISTFILES.common = ChangeLog Makefile.in linux-msg.sed po2tbl.sed.in \ -xopen-msg.sed $(HEADERS) $(SOURCES) +DISTFILES.common = Makefile.in \ +config.charset locale.alias ref-add.sin ref-del.sin $(HEADERS) $(SOURCES) +DISTFILES.generated = plural.c DISTFILES.normal = VERSION -DISTFILES.gettext = libintl.glibc intlh.inst.in +DISTFILES.gettext = COPYING.LIB-2.0 COPYING.LIB-2.1 libintl.glibc +DISTFILES.obsolete = xopen-msg.sed linux-msg.sed po2tbl.sed.in cat-compat.c \ +COPYING.LIB-2 gettext.h libgettext.h plural-eval.c + +# Libtool's library version information for libintl. +# Before making a gettext release, the gettext maintainer must change this +# according to the libtool documentation, section "Library interface versions". +# Maintainers of other packages that include the intl directory must *not* +# change these values. +LTV_CURRENT=2 +LTV_REVISION=0 +LTV_AGE=0 .SUFFIXES: -.SUFFIXES: .c .o .lo +.SUFFIXES: .c .y .o .lo .sin .sed .c.o: $(COMPILE) $< .c.lo: $(LIBTOOL) --mode=compile $(COMPILE) $< -INCLUDES = -I.. -I. -I$(top_srcdir)/intl -I$(top_srcdir)/lib +.y.c: + $(YACC) $(YFLAGS) --output $@ $< + rm -f $*.h -all: all-@USE_INCLUDED_LIBINTL@ +.sin.sed: + sed -e '/^#/d' -e 's/@''PACKAGE''@/@PACKAGE@/g' $< > t-$@ + mv t-$@ $@ + +INCLUDES = -I.. -I. -I$(top_srcdir)/intl -all-yes: libintl.$la intlh.inst -all-no: +all: all-@USE_INCLUDED_LIBINTL@ +all-yes: libintl.$la libintl.h charset.alias ref-add.sed ref-del.sed +all-no: all-no-@BUILD_INCLUDED_LIBINTL@ +all-no-yes: libgnuintl.$la +all-no-no: -libintl.a: $(OBJECTS) +libintl.a libgnuintl.a: $(OBJECTS) rm -f $@ $(AR) cru $@ $(OBJECTS) $(RANLIB) $@ -libintl.la: $(OBJECTS) - $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) -o $@ $(OBJECTS) \ - -version-info 1:0 -rpath $(libdir) +libintl.la libgnuintl.la: $(OBJECTS) + $(LIBTOOL) --mode=link \ + $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ + $(OBJECTS) @LTLIBICONV@ -lc \ + -version-info $(LTV_CURRENT):$(LTV_REVISION):$(LTV_AGE) \ + -rpath $(libdir) \ + -no-undefined -../po/cat-id-tbl.$lo: ../po/cat-id-tbl.c $(top_srcdir)/po/$(PACKAGE).pot - cd ../po && $(MAKE) cat-id-tbl.$lo +libintl.h: libgnuintl.h + cp $(srcdir)/libgnuintl.h libintl.h + +charset.alias: config.charset + $(SHELL) $(srcdir)/config.charset '@host@' > t-$@ + mv t-$@ $@ check: all @@ -104,37 +137,92 @@ check: all # only use the library should use install instead. # We must not install the libintl.h/libintl.a files if we are on a -# system which has the gettext() function in its C library or in a -# separate library or use the catgets interface. A special case is -# where configure found a previously installed GNU gettext library. +# system which has the GNU gettext() function in its C library or in a +# separate library. # If you want to use the one which comes with this version of the # package, you have to use `configure --with-included-gettext'. install: install-exec install-data install-exec: all if test "$(PACKAGE)" = "gettext" \ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ - if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(libdir) $(includedir); \ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + $(INSTALL_DATA) libintl.h $(DESTDIR)$(includedir)/libintl.h; \ + $(LIBTOOL) --mode=install \ + $(INSTALL_DATA) libintl.$la $(DESTDIR)$(libdir)/libintl.$la; \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ + temp=$(DESTDIR)$(libdir)/t-charset.alias; \ + dest=$(DESTDIR)$(libdir)/charset.alias; \ + if test -f $(DESTDIR)$(libdir)/charset.alias; then \ + orig=$(DESTDIR)$(libdir)/charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ else \ - $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ + if test @GLIBC21@ = no; then \ + orig=charset.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ + fi; \ fi; \ - $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ - $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + test -f $(DESTDIR)$(localedir)/locale.alias \ + && orig=$(DESTDIR)$(localedir)/locale.alias \ + || orig=$(srcdir)/locale.alias; \ + temp=$(DESTDIR)$(localedir)/t-locale.alias; \ + dest=$(DESTDIR)$(localedir)/locale.alias; \ + sed -f ref-add.sed $$orig > $$temp; \ + $(INSTALL_DATA) $$temp $$dest; \ + rm -f $$temp; \ else \ : ; \ fi install-data: all if test "$(PACKAGE)" = "gettext"; then \ - if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(gettextsrcdir); \ - else \ - $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ - dists="$(DISTFILES.common)"; \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ + $(INSTALL_DATA) ChangeLog.inst $(DESTDIR)$(gettextsrcdir)/ChangeLog; \ + dists="COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common)"; \ for file in $$dists; do \ - $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ + chmod a+x $(DESTDIR)$(gettextsrcdir)/config.charset; \ + dists="$(DISTFILES.generated)"; \ + for file in $$dists; do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + $(INSTALL_DATA) $$dir/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + dists="$(DISTFILES.obsolete)"; \ + for file in $$dists; do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi + +install-strip: install + +installdirs: + if test "$(PACKAGE)" = "gettext" \ + && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ + $(mkinstalldirs) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + test @GLIBC21@ != no || $(mkinstalldirs) $(DESTDIR)$(libdir); \ + $(mkinstalldirs) $(DESTDIR)$(localedir); \ + else \ + : ; \ + fi + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ else \ : ; \ fi @@ -143,18 +231,56 @@ install-data: all installcheck: uninstall: + if test "$(PACKAGE)" = "gettext" \ + && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ + rm -f $(DESTDIR)$(includedir)/libintl.h; \ + $(LIBTOOL) --mode=uninstall \ + rm -f $(DESTDIR)$(libdir)/libintl.$la; \ + else \ + : ; \ + fi + if test '@USE_INCLUDED_LIBINTL@' = yes; then \ + if test -f $(DESTDIR)$(libdir)/charset.alias; then \ + temp=$(DESTDIR)$(libdir)/t-charset.alias; \ + dest=$(DESTDIR)$(libdir)/charset.alias; \ + sed -f ref-del.sed $$dest > $$temp; \ + if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ + rm -f $$dest; \ + else \ + $(INSTALL_DATA) $$temp $$dest; \ + fi; \ + rm -f $$temp; \ + fi; \ + if test -f $(DESTDIR)$(localedir)/locale.alias; then \ + temp=$(DESTDIR)$(localedir)/t-locale.alias; \ + dest=$(DESTDIR)$(localedir)/locale.alias; \ + sed -f ref-del.sed $$dest > $$temp; \ + if grep '^# Packages using this file: $$' $$temp > /dev/null; then \ + rm -f $$dest; \ + else \ + $(INSTALL_DATA) $$temp $$dest; \ + fi; \ + rm -f $$temp; \ + fi; \ + else \ + : ; \ + fi if test "$(PACKAGE)" = "gettext"; then \ - dists="$(DISTFILES.common)"; \ - for file in $$dists; do \ - rm -f $(gettextsrcdir)/$$file; \ + for file in VERSION ChangeLog COPYING.LIB-2.0 COPYING.LIB-2.1 $(DISTFILES.common) $(DISTFILES.generated); do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ done; \ + else \ + : ; \ fi info dvi: -$(OBJECTS): ../config.h libgettext.h -bindtextdom.$lo finddomain.$lo loadmsgcat.$lo: gettextP.h gettext.h loadinfo.h -dcgettext.$lo: gettextP.h gettext.h hash-string.h loadinfo.h +$(OBJECTS): ../config.h libgnuintl.h +bindtextdom.$lo dcgettext.$lo dcigettext.$lo dcngettext.$lo dgettext.$lo dngettext.$lo finddomain.$lo gettext.$lo intl-compat.$lo loadmsgcat.$lo localealias.$lo ngettext.$lo textdomain.$lo: gettextP.h gmo.h loadinfo.h +dcigettext.$lo: hash-string.h +explodename.$lo l10nflist.$lo: loadinfo.h +dcigettext.$lo loadmsgcat.$lo plural.$lo plural-exp.$lo: plural-exp.h +dcigettext.$lo: eval-plural.h tags: TAGS @@ -168,12 +294,19 @@ ID: $(HEADERS) $(SOURCES) mostlyclean: - rm -f *.a *.o *.lo core core.* + rm -f *.a *.la *.o *.lo core core.* + rm -f libintl.h charset.alias ref-add.sed ref-del.sed + rm -f -r .libs _libs clean: mostlyclean distclean: clean - rm -f Makefile ID TAGS po2msg.sed po2tbl.sed + rm -f Makefile ID TAGS + if test "$(PACKAGE)" = gettext; then \ + rm -f ChangeLog.inst $(DISTFILES.normal); \ + else \ + : ; \ + fi maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @@ -183,34 +316,22 @@ maintainer-clean: distclean # GNU gettext needs not contain the file `VERSION' but contains some # other files which should not be distributed in other packages. distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) -dist distdir: Makefile $(DISTFILES) +dist distdir: Makefile if test "$(PACKAGE)" = gettext; then \ additional="$(DISTFILES.gettext)"; \ else \ additional="$(DISTFILES.normal)"; \ fi; \ - for file in $(DISTFILES.common) $$additional; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + $(MAKE) $(DISTFILES.common) $(DISTFILES.generated) $$additional; \ + for file in ChangeLog $(DISTFILES.common) $(DISTFILES.generated) $$additional; do \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir); \ done -dist-libc: - tar zcvf intl-glibc.tar.gz $(COMSRCS) $(COMHDRS) libintl.h.glibc - Makefile: Makefile.in ../config.status cd .. \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status -# The dependency for intlh.inst is different in gettext and all other -# packages. Because we cannot you GNU make features we have to solve -# the problem while rewriting Makefile.in. -@GT_YES@intlh.inst: intlh.inst.in ../config.status -@GT_YES@ cd .. \ -@GT_YES@ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= \ -@GT_YES@ $(SHELL) ./config.status -@GT_NO@.PHONY: intlh.inst -@GT_NO@intlh.inst: - # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/gnu/usr.bin/texinfo/intl/VERSION b/gnu/usr.bin/texinfo/intl/VERSION index ee66b0612bc..abe3915e693 100644 --- a/gnu/usr.bin/texinfo/intl/VERSION +++ b/gnu/usr.bin/texinfo/intl/VERSION @@ -1 +1 @@ -GNU gettext library from gettext-0.10.35 +GNU gettext library from gettext-0.11.1 diff --git a/gnu/usr.bin/texinfo/intl/bindtextdom.c b/gnu/usr.bin/texinfo/intl/bindtextdom.c index d9c3f349e04..07e073d6425 100644 --- a/gnu/usr.bin/texinfo/intl/bindtextdom.c +++ b/gnu/usr.bin/texinfo/intl/bindtextdom.c @@ -1,50 +1,58 @@ /* Implementation of the bindtextdomain(3) function - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995-1998, 2000, 2001 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> -#else -# ifdef HAVE_MALLOC_H -# include <malloc.h> -# else -void free (); -# endif -#endif +#include <stddef.h> +#include <stdlib.h> +#include <string.h> -#if defined HAVE_STRING_H || defined _LIBC -# include <string.h> +#ifdef _LIBC +# include <libintl.h> #else -# include <strings.h> -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif +# include "libgnuintl.h" #endif +#include "gettextP.h" #ifdef _LIBC -# include <libintl.h> +/* We have to handle multi-threaded applications. */ +# include <bits/libc-lock.h> #else -# include "libgettext.h" +/* Provide dummy implementation if this is outside glibc. */ +# define __libc_rwlock_define(CLASS, NAME) +# define __libc_rwlock_wrlock(NAME) +# define __libc_rwlock_unlock(NAME) +#endif + +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_dirname _nl_default_dirname__ +# define _nl_domain_bindings _nl_domain_bindings__ +#endif + +/* Some compilers, like SunOS4 cc, don't have offsetof in <stddef.h>. */ +#ifndef offsetof +# define offsetof(type,ident) ((size_t)&(((type*)0)->ident)) #endif -#include "gettext.h" -#include "gettextP.h" /* @@ end of prolog @@ */ @@ -54,6 +62,9 @@ extern const char _nl_default_dirname[]; /* List with bindings of specific domains. */ extern struct binding *_nl_domain_bindings; +/* Lock variable to protect the global data in the gettext implementation. */ +__libc_rwlock_define (extern, _nl_state_lock) + /* Names for the libintl functions are a problem. They must not clash with existing names and they should follow ANSI C. But this source @@ -61,25 +72,48 @@ extern struct binding *_nl_domain_bindings; prefix. So we have to make a difference here. */ #ifdef _LIBC # define BINDTEXTDOMAIN __bindtextdomain +# define BIND_TEXTDOMAIN_CODESET __bind_textdomain_codeset # ifndef strdup # define strdup(str) __strdup (str) # endif #else # define BINDTEXTDOMAIN bindtextdomain__ +# define BIND_TEXTDOMAIN_CODESET bind_textdomain_codeset__ #endif -/* Specify that the DOMAINNAME message catalog will be found - in DIRNAME rather than in the system locale data base. */ -char * -BINDTEXTDOMAIN (domainname, dirname) +/* Prototypes for local functions. */ +static void set_binding_values PARAMS ((const char *domainname, + const char **dirnamep, + const char **codesetp)); + +/* Specifies the directory name *DIRNAMEP and the output codeset *CODESETP + to be used for the DOMAINNAME message catalog. + If *DIRNAMEP or *CODESETP is NULL, the corresponding attribute is not + modified, only the current value is returned. + If DIRNAMEP or CODESETP is NULL, the corresponding attribute is neither + modified nor returned. */ +static void +set_binding_values (domainname, dirnamep, codesetp) const char *domainname; - const char *dirname; + const char **dirnamep; + const char **codesetp; { struct binding *binding; + int modified; /* Some sanity checks. */ if (domainname == NULL || domainname[0] == '\0') - return NULL; + { + if (dirnamep) + *dirnamep = NULL; + if (codesetp) + *codesetp = NULL; + return; + } + + __libc_rwlock_wrlock (_nl_state_lock); + + modified = 0; for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) { @@ -95,83 +129,173 @@ BINDTEXTDOMAIN (domainname, dirname) } } - if (dirname == NULL) - /* The current binding has be to returned. */ - return binding == NULL ? (char *) _nl_default_dirname : binding->dirname; - if (binding != NULL) { - /* The domain is already bound. If the new value and the old - one are equal we simply do nothing. Otherwise replace the - old binding. */ - if (strcmp (dirname, binding->dirname) != 0) + if (dirnamep) { - char *new_dirname; + const char *dirname = *dirnamep; - if (strcmp (dirname, _nl_default_dirname) == 0) - new_dirname = (char *) _nl_default_dirname; + if (dirname == NULL) + /* The current binding has be to returned. */ + *dirnamep = binding->dirname; else { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + char *result = binding->dirname; + if (strcmp (dirname, result) != 0) + { + if (strcmp (dirname, _nl_default_dirname) == 0) + result = (char *) _nl_default_dirname; + else + { #if defined _LIBC || defined HAVE_STRDUP - new_dirname = strdup (dirname); - if (new_dirname == NULL) - return NULL; + result = strdup (dirname); #else - size_t len = strlen (dirname) + 1; - new_dirname = (char *) malloc (len); - if (new_dirname == NULL) - return NULL; - - memcpy (new_dirname, dirname, len); + size_t len = strlen (dirname) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result != NULL, 1)) + memcpy (result, dirname, len); #endif + } + + if (__builtin_expect (result != NULL, 1)) + { + if (binding->dirname != _nl_default_dirname) + free (binding->dirname); + + binding->dirname = result; + modified = 1; + } + } + *dirnamep = result; } + } - if (binding->dirname != _nl_default_dirname) - free (binding->dirname); + if (codesetp) + { + const char *codeset = *codesetp; - binding->dirname = new_dirname; + if (codeset == NULL) + /* The current binding has be to returned. */ + *codesetp = binding->codeset; + else + { + /* The domain is already bound. If the new value and the old + one are equal we simply do nothing. Otherwise replace the + old binding. */ + char *result = binding->codeset; + if (result == NULL || strcmp (codeset, result) != 0) + { +#if defined _LIBC || defined HAVE_STRDUP + result = strdup (codeset); +#else + size_t len = strlen (codeset) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result != NULL, 1)) + memcpy (result, codeset, len); +#endif + + if (__builtin_expect (result != NULL, 1)) + { + if (binding->codeset != NULL) + free (binding->codeset); + + binding->codeset = result; + binding->codeset_cntr++; + modified = 1; + } + } + *codesetp = result; + } } } + else if ((dirnamep == NULL || *dirnamep == NULL) + && (codesetp == NULL || *codesetp == NULL)) + { + /* Simply return the default values. */ + if (dirnamep) + *dirnamep = _nl_default_dirname; + if (codesetp) + *codesetp = NULL; + } else { /* We have to create a new binding. */ -#if !defined _LIBC && !defined HAVE_STRDUP - size_t len; -#endif + size_t len = strlen (domainname) + 1; struct binding *new_binding = - (struct binding *) malloc (sizeof (*new_binding)); + (struct binding *) malloc (offsetof (struct binding, domainname) + len); + + if (__builtin_expect (new_binding == NULL, 0)) + goto failed; + + memcpy (new_binding->domainname, domainname, len); - if (new_binding == NULL) - return NULL; + if (dirnamep) + { + const char *dirname = *dirnamep; + if (dirname == NULL) + /* The default value. */ + dirname = _nl_default_dirname; + else + { + if (strcmp (dirname, _nl_default_dirname) == 0) + dirname = _nl_default_dirname; + else + { + char *result; #if defined _LIBC || defined HAVE_STRDUP - new_binding->domainname = strdup (domainname); - if (new_binding->domainname == NULL) - return NULL; + result = strdup (dirname); + if (__builtin_expect (result == NULL, 0)) + goto failed_dirname; #else - len = strlen (domainname) + 1; - new_binding->domainname = (char *) malloc (len); - if (new_binding->domainname == NULL) - return NULL; - memcpy (new_binding->domainname, domainname, len); + size_t len = strlen (dirname) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result == NULL, 0)) + goto failed_dirname; + memcpy (result, dirname, len); #endif - - if (strcmp (dirname, _nl_default_dirname) == 0) - new_binding->dirname = (char *) _nl_default_dirname; + dirname = result; + } + } + *dirnamep = dirname; + new_binding->dirname = (char *) dirname; + } else + /* The default value. */ + new_binding->dirname = (char *) _nl_default_dirname; + + new_binding->codeset_cntr = 0; + + if (codesetp) { + const char *codeset = *codesetp; + + if (codeset != NULL) + { + char *result; + #if defined _LIBC || defined HAVE_STRDUP - new_binding->dirname = strdup (dirname); - if (new_binding->dirname == NULL) - return NULL; + result = strdup (codeset); + if (__builtin_expect (result == NULL, 0)) + goto failed_codeset; #else - len = strlen (dirname) + 1; - new_binding->dirname = (char *) malloc (len); - if (new_binding->dirname == NULL) - return NULL; - memcpy (new_binding->dirname, dirname, len); + size_t len = strlen (codeset) + 1; + result = (char *) malloc (len); + if (__builtin_expect (result == NULL, 0)) + goto failed_codeset; + memcpy (result, codeset, len); #endif + codeset = result; + new_binding->codeset_cntr++; + } + *codesetp = codeset; + new_binding->codeset = (char *) codeset; } + else + new_binding->codeset = NULL; /* Now enqueue it. */ if (_nl_domain_bindings == NULL @@ -191,13 +315,55 @@ BINDTEXTDOMAIN (domainname, dirname) binding->next = new_binding; } - binding = new_binding; + modified = 1; + + /* Here we deal with memory allocation failures. */ + if (0) + { + failed_codeset: + if (new_binding->dirname != _nl_default_dirname) + free (new_binding->dirname); + failed_dirname: + free (new_binding); + failed: + if (dirnamep) + *dirnamep = NULL; + if (codesetp) + *codesetp = NULL; + } } - return binding->dirname; + /* If we modified any binding, we flush the caches. */ + if (modified) + ++_nl_msg_cat_cntr; + + __libc_rwlock_unlock (_nl_state_lock); +} + +/* Specify that the DOMAINNAME message catalog will be found + in DIRNAME rather than in the system locale data base. */ +char * +BINDTEXTDOMAIN (domainname, dirname) + const char *domainname; + const char *dirname; +{ + set_binding_values (domainname, &dirname, NULL); + return (char *) dirname; +} + +/* Specify the character encoding in which the messages from the + DOMAINNAME message catalog will be returned. */ +char * +BIND_TEXTDOMAIN_CODESET (domainname, codeset) + const char *domainname; + const char *codeset; +{ + set_binding_values (domainname, NULL, &codeset); + return (char *) codeset; } #ifdef _LIBC -/* Alias for function name in GNU C Library. */ +/* Aliases for function names in GNU C Library. */ weak_alias (__bindtextdomain, bindtextdomain); +weak_alias (__bind_textdomain_codeset, bind_textdomain_codeset); #endif diff --git a/gnu/usr.bin/texinfo/intl/dcgettext.c b/gnu/usr.bin/texinfo/intl/dcgettext.c index c4c7a2c7d14..b7c96523dd8 100644 --- a/gnu/usr.bin/texinfo/intl/dcgettext.c +++ b/gnu/usr.bin/texinfo/intl/dcgettext.c @@ -1,220 +1,44 @@ /* Implementation of the dcgettext(3) function. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2001 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#include <sys/types.h> - -#ifdef __GNUC__ -# define alloca __builtin_alloca -# define HAVE_ALLOCA 1 -#else -# if defined HAVE_ALLOCA_H || defined _LIBC -# include <alloca.h> -# else -# ifdef _AIX - #pragma alloca -# else -# ifndef alloca -char *alloca (); -# endif -# endif -# endif -#endif - -#include <errno.h> -#ifndef errno -extern int errno; -#endif -#ifndef __set_errno -# define __set_errno(val) errno = (val) -#endif - -#if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> -#else -char *getenv (); -# ifdef HAVE_MALLOC_H -# include <malloc.h> -# else -void free (); -# endif -#endif - -#if defined HAVE_STRING_H || defined _LIBC -# ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -# endif -# include <string.h> -#else -# include <strings.h> -#endif -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#if defined HAVE_UNISTD_H || defined _LIBC -# include <unistd.h> -#endif - -#include "gettext.h" #include "gettextP.h" #ifdef _LIBC # include <libintl.h> #else -# include "libgettext.h" +# include "libgnuintl.h" #endif -#include "hash-string.h" /* @@ end of prolog @@ */ -#ifdef _LIBC -/* Rename the non ANSI C functions. This is required by the standard - because some ANSI C functions will require linking with this object - file and the name space must not be polluted. */ -# define getcwd __getcwd -# ifndef stpcpy -# define stpcpy __stpcpy -# endif -#else -# if !defined HAVE_GETCWD -char *getwd (); -# define getcwd(buf, max) getwd (buf) -# else -char *getcwd (); -# endif -# ifndef HAVE_STPCPY -static char *stpcpy PARAMS ((char *dest, const char *src)); -# endif -#endif - -/* Amount to increase buffer size by in each try. */ -#define PATH_INCR 32 - -/* The following is from pathmax.h. */ -/* Non-POSIX BSD systems might have gcc's limits.h, which doesn't define - PATH_MAX but might cause redefinition warnings when sys/param.h is - later included (as on MORE/BSD 4.3). */ -#if defined(_POSIX_VERSION) || (defined(HAVE_LIMITS_H) && !defined(__GNUC__)) -# include <limits.h> -#endif - -#ifndef _POSIX_PATH_MAX -# define _POSIX_PATH_MAX 255 -#endif - -#if !defined(PATH_MAX) && defined(_PC_PATH_MAX) -# define PATH_MAX (pathconf ("/", _PC_PATH_MAX) < 1 ? 1024 : pathconf ("/", _PC_PATH_MAX)) -#endif - -/* Don't include sys/param.h if it already has been. */ -#if defined(HAVE_SYS_PARAM_H) && !defined(PATH_MAX) && !defined(MAXPATHLEN) -# include <sys/param.h> -#endif - -#if !defined(PATH_MAX) && defined(MAXPATHLEN) -# define PATH_MAX MAXPATHLEN -#endif - -#ifndef PATH_MAX -# define PATH_MAX _POSIX_PATH_MAX -#endif - -/* XPG3 defines the result of `setlocale (category, NULL)' as: - ``Directs `setlocale()' to query `category' and return the current - setting of `local'.'' - However it does not specify the exact format. And even worse: POSIX - defines this not at all. So we can use this feature only on selected - system (e.g. those using GNU C Library). */ -#ifdef _LIBC -# define HAVE_LOCALE_NULL -#endif - -/* Name of the default domain used for gettext(3) prior any call to - textdomain(3). The default value for this is "messages". */ -const char _nl_default_default_domain[] = "messages"; - -/* Value used as the default domain for gettext(3). */ -const char *_nl_current_default_domain = _nl_default_default_domain; - -/* Contains the default location of the message catalogs. */ -const char _nl_default_dirname[] = GNULOCALEDIR; - -/* List with bindings of specific domains created by bindtextdomain() - calls. */ -struct binding *_nl_domain_bindings; - -/* Prototypes for local functions. */ -static char *find_msg PARAMS ((struct loaded_l10nfile *domain_file, - const char *msgid)) internal_function; -static const char *category_to_name PARAMS ((int category)) internal_function; -static const char *guess_category_value PARAMS ((int category, - const char *categoryname)) - internal_function; - - -/* For those loosing systems which don't have `alloca' we have to add - some additional code emulating it. */ -#ifdef HAVE_ALLOCA -/* Nothing has to be done. */ -# define ADD_BLOCK(list, address) /* nothing */ -# define FREE_BLOCKS(list) /* nothing */ -#else -struct block_list -{ - void *address; - struct block_list *next; -}; -# define ADD_BLOCK(list, addr) \ - do { \ - struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ - /* If we cannot get a free block we cannot add the new element to \ - the list. */ \ - if (newp != NULL) { \ - newp->address = (addr); \ - newp->next = (list); \ - (list) = newp; \ - } \ - } while (0) -# define FREE_BLOCKS(list) \ - do { \ - while (list != NULL) { \ - struct block_list *old = list; \ - list = list->next; \ - free (old); \ - } \ - } while (0) -# undef alloca -# define alloca(size) (malloc (size)) -#endif /* have alloca */ - - /* Names for the libintl functions are a problem. They must not clash with existing names and they should follow ANSI C. But this source code is also used in GNU C Library where the names have a __ prefix. So we have to make a difference here. */ #ifdef _LIBC # define DCGETTEXT __dcgettext +# define DCIGETTEXT __dcigettext #else # define DCGETTEXT dcgettext__ +# define DCIGETTEXT dcigettext__ #endif /* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY @@ -225,400 +49,10 @@ DCGETTEXT (domainname, msgid, category) const char *msgid; int category; { -#ifndef HAVE_ALLOCA - struct block_list *block_list = NULL; -#endif - struct loaded_l10nfile *domain; - struct binding *binding; - const char *categoryname; - const char *categoryvalue; - char *dirname, *xdomainname; - char *single_locale; - char *retval; - int saved_errno = errno; - - /* If no real MSGID is given return NULL. */ - if (msgid == NULL) - return NULL; - - /* If DOMAINNAME is NULL, we are interested in the default domain. If - CATEGORY is not LC_MESSAGES this might not make much sense but the - defintion left this undefined. */ - if (domainname == NULL) - domainname = _nl_current_default_domain; - - /* First find matching binding. */ - for (binding = _nl_domain_bindings; binding != NULL; binding = binding->next) - { - int compare = strcmp (domainname, binding->domainname); - if (compare == 0) - /* We found it! */ - break; - if (compare < 0) - { - /* It is not in the list. */ - binding = NULL; - break; - } - } - - if (binding == NULL) - dirname = (char *) _nl_default_dirname; - else if (binding->dirname[0] == '/') - dirname = binding->dirname; - else - { - /* We have a relative path. Make it absolute now. */ - size_t dirname_len = strlen (binding->dirname) + 1; - size_t path_max; - char *ret; - - path_max = (unsigned) PATH_MAX; - path_max += 2; /* The getcwd docs say to do this. */ - - dirname = (char *) alloca (path_max + dirname_len); - ADD_BLOCK (block_list, dirname); - - __set_errno (0); - while ((ret = getcwd (dirname, path_max)) == NULL && errno == ERANGE) - { - path_max += PATH_INCR; - dirname = (char *) alloca (path_max + dirname_len); - ADD_BLOCK (block_list, dirname); - __set_errno (0); - } - - if (ret == NULL) - { - /* We cannot get the current working directory. Don't signal an - error but simply return the default string. */ - FREE_BLOCKS (block_list); - __set_errno (saved_errno); - return (char *) msgid; - } - - stpcpy (stpcpy (strchr (dirname, '\0'), "/"), binding->dirname); - } - - /* Now determine the symbolic name of CATEGORY and its value. */ - categoryname = category_to_name (category); - categoryvalue = guess_category_value (category, categoryname); - - xdomainname = (char *) alloca (strlen (categoryname) - + strlen (domainname) + 5); - ADD_BLOCK (block_list, xdomainname); - - stpcpy (stpcpy (stpcpy (stpcpy (xdomainname, categoryname), "/"), - domainname), - ".mo"); - - /* Creating working area. */ - single_locale = (char *) alloca (strlen (categoryvalue) + 1); - ADD_BLOCK (block_list, single_locale); - - - /* Search for the given string. This is a loop because we perhaps - got an ordered list of languages to consider for th translation. */ - while (1) - { - /* Make CATEGORYVALUE point to the next element of the list. */ - while (categoryvalue[0] != '\0' && categoryvalue[0] == ':') - ++categoryvalue; - if (categoryvalue[0] == '\0') - { - /* The whole contents of CATEGORYVALUE has been searched but - no valid entry has been found. We solve this situation - by implicitly appending a "C" entry, i.e. no translation - will take place. */ - single_locale[0] = 'C'; - single_locale[1] = '\0'; - } - else - { - char *cp = single_locale; - while (categoryvalue[0] != '\0' && categoryvalue[0] != ':') - *cp++ = *categoryvalue++; - *cp = '\0'; - } - - /* If the current locale value is C (or POSIX) we don't load a - domain. Return the MSGID. */ - if (strcmp (single_locale, "C") == 0 - || strcmp (single_locale, "POSIX") == 0) - { - FREE_BLOCKS (block_list); - __set_errno (saved_errno); - return (char *) msgid; - } - - - /* Find structure describing the message catalog matching the - DOMAINNAME and CATEGORY. */ - domain = _nl_find_domain (dirname, single_locale, xdomainname); - - if (domain != NULL) - { - retval = find_msg (domain, msgid); - - if (retval == NULL) - { - int cnt; - - for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) - { - retval = find_msg (domain->successor[cnt], msgid); - - if (retval != NULL) - break; - } - } - - if (retval != NULL) - { - FREE_BLOCKS (block_list); - __set_errno (saved_errno); - return retval; - } - } - } - /* NOTREACHED */ + return DCIGETTEXT (domainname, msgid, NULL, 0, 0, category); } #ifdef _LIBC /* Alias for function name in GNU C Library. */ weak_alias (__dcgettext, dcgettext); #endif - - -static char * -internal_function -find_msg (domain_file, msgid) - struct loaded_l10nfile *domain_file; - const char *msgid; -{ - size_t top, act, bottom; - struct loaded_domain *domain; - - if (domain_file->decided == 0) - _nl_load_domain (domain_file); - - if (domain_file->data == NULL) - return NULL; - - domain = (struct loaded_domain *) domain_file->data; - - /* Locate the MSGID and its translation. */ - if (domain->hash_size > 2 && domain->hash_tab != NULL) - { - /* Use the hashing table. */ - nls_uint32 len = strlen (msgid); - nls_uint32 hash_val = hash_string (msgid); - nls_uint32 idx = hash_val % domain->hash_size; - nls_uint32 incr = 1 + (hash_val % (domain->hash_size - 2)); - nls_uint32 nstr = W (domain->must_swap, domain->hash_tab[idx]); - - if (nstr == 0) - /* Hash table entry is empty. */ - return NULL; - - if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len - && strcmp (msgid, - domain->data + W (domain->must_swap, - domain->orig_tab[nstr - 1].offset)) == 0) - return (char *) domain->data + W (domain->must_swap, - domain->trans_tab[nstr - 1].offset); - - while (1) - { - if (idx >= domain->hash_size - incr) - idx -= domain->hash_size - incr; - else - idx += incr; - - nstr = W (domain->must_swap, domain->hash_tab[idx]); - if (nstr == 0) - /* Hash table entry is empty. */ - return NULL; - - if (W (domain->must_swap, domain->orig_tab[nstr - 1].length) == len - && strcmp (msgid, - domain->data + W (domain->must_swap, - domain->orig_tab[nstr - 1].offset)) - == 0) - return (char *) domain->data - + W (domain->must_swap, domain->trans_tab[nstr - 1].offset); - } - /* NOTREACHED */ - } - - /* Now we try the default method: binary search in the sorted - array of messages. */ - bottom = 0; - top = domain->nstrings; - while (bottom < top) - { - int cmp_val; - - act = (bottom + top) / 2; - cmp_val = strcmp (msgid, domain->data - + W (domain->must_swap, - domain->orig_tab[act].offset)); - if (cmp_val < 0) - top = act; - else if (cmp_val > 0) - bottom = act + 1; - else - break; - } - - /* If an translation is found return this. */ - return bottom >= top ? NULL : (char *) domain->data - + W (domain->must_swap, - domain->trans_tab[act].offset); -} - - -/* Return string representation of locale CATEGORY. */ -static const char * -internal_function -category_to_name (category) - int category; -{ - const char *retval; - - switch (category) - { -#ifdef LC_COLLATE - case LC_COLLATE: - retval = "LC_COLLATE"; - break; -#endif -#ifdef LC_CTYPE - case LC_CTYPE: - retval = "LC_CTYPE"; - break; -#endif -#ifdef LC_MONETARY - case LC_MONETARY: - retval = "LC_MONETARY"; - break; -#endif -#ifdef LC_NUMERIC - case LC_NUMERIC: - retval = "LC_NUMERIC"; - break; -#endif -#ifdef LC_TIME - case LC_TIME: - retval = "LC_TIME"; - break; -#endif -#ifdef LC_MESSAGES - case LC_MESSAGES: - retval = "LC_MESSAGES"; - break; -#endif -#ifdef LC_RESPONSE - case LC_RESPONSE: - retval = "LC_RESPONSE"; - break; -#endif -#ifdef LC_ALL - case LC_ALL: - /* This might not make sense but is perhaps better than any other - value. */ - retval = "LC_ALL"; - break; -#endif - default: - /* If you have a better idea for a default value let me know. */ - retval = "LC_XXX"; - } - - return retval; -} - -/* Guess value of current locale from value of the environment variables. */ -static const char * -internal_function -guess_category_value (category, categoryname) - int category; - const char *categoryname; -{ - const char *retval; - - /* The highest priority value is the `LANGUAGE' environment - variable. This is a GNU extension. */ - retval = getenv ("LANGUAGE"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* `LANGUAGE' is not set. So we have to proceed with the POSIX - methods of looking to `LC_ALL', `LC_xxx', and `LANG'. On some - systems this can be done by the `setlocale' function itself. */ -#if defined HAVE_SETLOCALE && defined HAVE_LC_MESSAGES && defined HAVE_LOCALE_NULL - return setlocale (category, NULL); -#else - /* Setting of LC_ALL overwrites all other. */ - retval = getenv ("LC_ALL"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* Next comes the name of the desired category. */ - retval = getenv (categoryname); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* Last possibility is the LANG environment variable. */ - retval = getenv ("LANG"); - if (retval != NULL && retval[0] != '\0') - return retval; - - /* We use C as the default domain. POSIX says this is implementation - defined. */ - return "C"; -#endif -} - -/* @@ begin of epilog @@ */ - -/* We don't want libintl.a to depend on any other library. So we - avoid the non-standard function stpcpy. In GNU C Library this - function is available, though. Also allow the symbol HAVE_STPCPY - to be defined. */ -#if !_LIBC && !HAVE_STPCPY -static char * -stpcpy (dest, src) - char *dest; - const char *src; -{ - while ((*dest++ = *src++) != '\0') - /* Do nothing. */ ; - return dest - 1; -} -#endif - - -#ifdef _LIBC -/* If we want to free all resources we have to do some work at - program's end. */ -static void __attribute__ ((unused)) -free_mem (void) -{ - struct binding *runp; - - for (runp = _nl_domain_bindings; runp != NULL; runp = runp->next) - { - free (runp->domainname); - if (runp->dirname != _nl_default_dirname) - /* Yes, this is a pointer comparison. */ - free (runp->dirname); - } - - if (_nl_current_default_domain != _nl_default_default_domain) - /* Yes, again a pointer comparison. */ - free ((char *) _nl_current_default_domain); -} - -text_set_element (__libc_subfreeres, free_mem); -#endif diff --git a/gnu/usr.bin/texinfo/intl/dgettext.c b/gnu/usr.bin/texinfo/intl/dgettext.c index 0510c2b071f..3651207a0f6 100644 --- a/gnu/usr.bin/texinfo/intl/dgettext.c +++ b/gnu/usr.bin/texinfo/intl/dgettext.c @@ -1,32 +1,32 @@ -/* Implementation of the dgettext(3) function - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Implementation of the dgettext(3) function. + Copyright (C) 1995-1997, 2000, 2001 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#if defined HAVE_LOCALE_H || defined _LIBC -# include <locale.h> -#endif +#include <locale.h> +#include "gettextP.h" #ifdef _LIBC # include <libintl.h> #else -# include "libgettext.h" +# include "libgnuintl.h" #endif /* @@ end of prolog @@ */ diff --git a/gnu/usr.bin/texinfo/intl/explodename.c b/gnu/usr.bin/texinfo/intl/explodename.c index 8066dc29962..2985064c924 100644 --- a/gnu/usr.bin/texinfo/intl/explodename.c +++ b/gnu/usr.bin/texinfo/intl/explodename.c @@ -1,33 +1,27 @@ -/* Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. +/* Copyright (C) 1995-1998, 2000, 2001 Free Software Foundation, Inc. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> -#endif - -#if defined HAVE_STRING_H || defined _LIBC -# include <string.h> -#else -# include <strings.h> -#endif +#include <stdlib.h> +#include <string.h> #include <sys/types.h> #include "loadinfo.h" @@ -43,6 +37,18 @@ /* @@ end of prolog @@ */ +char * +_nl_find_language (name) + const char *name; +{ + while (name[0] != '\0' && name[0] != '_' && name[0] != '@' + && name[0] != '+' && name[0] != ',') + ++name; + + return (char *) name; +} + + int _nl_explode_name (name, language, modifier, territory, codeset, normalized_codeset, special, sponsor, revision) @@ -74,9 +80,7 @@ _nl_explode_name (name, language, modifier, territory, codeset, mask = 0; syntax = undecided; *language = cp = name; - while (cp[0] != '\0' && cp[0] != '_' && cp[0] != '@' - && cp[0] != '+' && cp[0] != ',') - ++cp; + cp = _nl_find_language (*language); if (*language == cp) /* This does not make sense: language has to be specified. Use diff --git a/gnu/usr.bin/texinfo/intl/finddomain.c b/gnu/usr.bin/texinfo/intl/finddomain.c index 81ea29bf4e4..2f103d55636 100644 --- a/gnu/usr.bin/texinfo/intl/finddomain.c +++ b/gnu/usr.bin/texinfo/intl/finddomain.c @@ -1,64 +1,40 @@ /* Handle list of needed message catalogs - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Written by Ulrich Drepper <drepper@gnu.org>, 1995. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#include <ctype.h> -#include <errno.h> #include <stdio.h> #include <sys/types.h> - -#if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> -#else -# ifdef HAVE_MALLOC_H -# include <malloc.h> -# else -void free (); -# endif -#endif - -#if defined HAVE_STRING_H || defined _LIBC -# include <string.h> -#else -# include <strings.h> -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif -#endif -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif +#include <stdlib.h> +#include <string.h> #if defined HAVE_UNISTD_H || defined _LIBC # include <unistd.h> #endif -#include "gettext.h" #include "gettextP.h" #ifdef _LIBC # include <libintl.h> #else -# include "libgettext.h" +# include "libgnuintl.h" #endif /* @@ end of prolog @@ */ @@ -71,10 +47,11 @@ static struct loaded_l10nfile *_nl_loaded_domains; established bindings. */ struct loaded_l10nfile * internal_function -_nl_find_domain (dirname, locale, domainname) +_nl_find_domain (dirname, locale, domainname, domainbinding) const char *dirname; char *locale; const char *domainname; + struct binding *domainbinding; { struct loaded_l10nfile *retval; const char *language; @@ -120,7 +97,7 @@ _nl_find_domain (dirname, locale, domainname) int cnt; if (retval->decided == 0) - _nl_load_domain (retval); + _nl_load_domain (retval, domainbinding); if (retval->data != NULL) return retval; @@ -128,7 +105,7 @@ _nl_find_domain (dirname, locale, domainname) for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt]); + _nl_load_domain (retval->successor[cnt], domainbinding); if (retval->successor[cnt]->data != NULL) break; @@ -175,14 +152,14 @@ _nl_find_domain (dirname, locale, domainname) return NULL; if (retval->decided == 0) - _nl_load_domain (retval); + _nl_load_domain (retval, domainbinding); if (retval->data == NULL) { int cnt; for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt]); + _nl_load_domain (retval->successor[cnt], domainbinding); if (retval->successor[cnt]->data != NULL) break; } @@ -192,6 +169,10 @@ _nl_find_domain (dirname, locale, domainname) if (alias_value != NULL) free (locale); + /* The space for normalized_codeset is dynamically allocated. Free it. */ + if (mask & XPG_NORM_CODESET) + free ((void *) normalized_codeset); + return retval; } @@ -208,6 +189,7 @@ free_mem (void) if (runp->data != NULL) _nl_unload_domain ((struct loaded_domain *) runp->data); runp = runp->next; + free ((char *) here->filename); free (here); } } diff --git a/gnu/usr.bin/texinfo/intl/gettext.c b/gnu/usr.bin/texinfo/intl/gettext.c index d929f98d68a..22a6c24536e 100644 --- a/gnu/usr.bin/texinfo/intl/gettext.c +++ b/gnu/usr.bin/texinfo/intl/gettext.c @@ -1,19 +1,20 @@ /* Implementation of gettext(3) function. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. + Copyright (C) 1995, 1997, 2000, 2001 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include <config.h> @@ -23,21 +24,14 @@ # define __need_NULL # include <stddef.h> #else -# ifdef STDC_HEADERS -# include <stdlib.h> /* Just for NULL. */ -# else -# ifdef HAVE_STRING_H -# include <string.h> -# else -# define NULL ((void *) 0) -# endif -# endif +# include <stdlib.h> /* Just for NULL. */ #endif +#include "gettextP.h" #ifdef _LIBC # include <libintl.h> #else -# include "libgettext.h" +# include "libgnuintl.h" #endif /* @@ end of prolog @@ */ @@ -48,10 +42,10 @@ prefix. So we have to make a difference here. */ #ifdef _LIBC # define GETTEXT __gettext -# define DGETTEXT __dgettext +# define DCGETTEXT __dcgettext #else # define GETTEXT gettext__ -# define DGETTEXT dgettext__ +# define DCGETTEXT dcgettext__ #endif /* Look up MSGID in the current default message catalog for the current @@ -61,7 +55,7 @@ char * GETTEXT (msgid) const char *msgid; { - return DGETTEXT (NULL, msgid); + return DCGETTEXT (NULL, msgid, LC_MESSAGES); } #ifdef _LIBC diff --git a/gnu/usr.bin/texinfo/intl/gettextP.h b/gnu/usr.bin/texinfo/intl/gettextP.h index 00c52031972..a642fdb6dea 100644 --- a/gnu/usr.bin/texinfo/intl/gettextP.h +++ b/gnu/usr.bin/texinfo/intl/gettextP.h @@ -1,30 +1,43 @@ -/* Header describing internals of gettext library - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. +/* Header describing internals of libintl library. + Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. + Written by Ulrich Drepper <drepper@cygnus.com>, 1995. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifndef _GETTEXTP_H #define _GETTEXTP_H +#include <stddef.h> /* Get size_t. */ + +#ifdef _LIBC +# include "../iconv/gconv_int.h" +#else +# if HAVE_ICONV +# include <iconv.h> +# endif +#endif + #include "loadinfo.h" +#include "gmo.h" /* Get nls_uint32. */ + /* @@ end of prolog @@ */ #ifndef PARAMS -# if __STDC__ +# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES # define PARAMS(args) args # else # define PARAMS(args) () @@ -35,6 +48,12 @@ # define internal_function #endif +/* Tell the compiler when a conditional or integer expression is + almost always true or almost always false. */ +#ifndef HAVE_BUILTIN_EXPECT +# define __builtin_expect(expr, val) (expr) +#endif + #ifndef W # define W(flag, data) ((flag) ? SWAP (data) : (data)) #endif @@ -44,8 +63,6 @@ # include <byteswap.h> # define SWAP(i) bswap_32 (i) #else -static nls_uint32 SWAP PARAMS ((nls_uint32 i)); - static inline nls_uint32 SWAP (i) nls_uint32 i; @@ -55,6 +72,7 @@ SWAP (i) #endif +/* The representation of an opened message catalog. */ struct loaded_domain { const char *data; @@ -66,23 +84,117 @@ struct loaded_domain struct string_desc *trans_tab; nls_uint32 hash_size; nls_uint32 *hash_tab; + int codeset_cntr; +#ifdef _LIBC + __gconv_t conv; +#else +# if HAVE_ICONV + iconv_t conv; +# endif +#endif + char **conv_tab; + + struct expression *plural; + unsigned long int nplurals; }; +/* We want to allocate a string at the end of the struct. But ISO C + doesn't allow zero sized arrays. */ +#ifdef __GNUC__ +# define ZERO 0 +#else +# define ZERO 1 +#endif + +/* A set of settings bound to a message domain. Used to store settings + from bindtextdomain() and bind_textdomain_codeset(). */ struct binding { struct binding *next; - char *domainname; char *dirname; + int codeset_cntr; /* Incremented each time codeset changes. */ + char *codeset; + char domainname[ZERO]; }; +/* A counter which is incremented each time some previous translations + become invalid. + This variable is part of the external ABI of the GNU libintl. */ +extern int _nl_msg_cat_cntr; + +#ifndef _LIBC +const char *_nl_locale_name PARAMS ((int category, const char *categoryname)); +#endif + struct loaded_l10nfile *_nl_find_domain PARAMS ((const char *__dirname, char *__locale, - const char *__domainname)) + const char *__domainname, + struct binding *__domainbinding)) internal_function; -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) +void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain, + struct binding *__domainbinding)) internal_function; void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) internal_function; +const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file, + struct loaded_domain *__domain, + struct binding *__domainbinding)) + internal_function; +void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain)) + internal_function; + +char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, + struct binding *domainbinding, + const char *msgid, size_t *lengthp)) + internal_function; + +#ifdef _LIBC +extern char *__gettext PARAMS ((const char *__msgid)); +extern char *__dgettext PARAMS ((const char *__domainname, + const char *__msgid)); +extern char *__dcgettext PARAMS ((const char *__domainname, + const char *__msgid, int __category)); +extern char *__ngettext PARAMS ((const char *__msgid1, const char *__msgid2, + unsigned long int __n)); +extern char *__dngettext PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int n)); +extern char *__dcngettext PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category)); +extern char *__dcigettext PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category)); +extern char *__textdomain PARAMS ((const char *__domainname)); +extern char *__bindtextdomain PARAMS ((const char *__domainname, + const char *__dirname)); +extern char *__bind_textdomain_codeset PARAMS ((const char *__domainname, + const char *__codeset)); +#else +extern char *gettext__ PARAMS ((const char *__msgid)); +extern char *dgettext__ PARAMS ((const char *__domainname, + const char *__msgid)); +extern char *dcgettext__ PARAMS ((const char *__domainname, + const char *__msgid, int __category)); +extern char *ngettext__ PARAMS ((const char *__msgid1, const char *__msgid2, + unsigned long int __n)); +extern char *dngettext__ PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n)); +extern char *dcngettext__ PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + unsigned long int __n, int __category)); +extern char *dcigettext__ PARAMS ((const char *__domainname, + const char *__msgid1, const char *__msgid2, + int __plural, unsigned long int __n, + int __category)); +extern char *textdomain__ PARAMS ((const char *__domainname)); +extern char *bindtextdomain__ PARAMS ((const char *__domainname, + const char *__dirname)); +extern char *bind_textdomain_codeset__ PARAMS ((const char *__domainname, + const char *__codeset)); +#endif /* @@ begin of epilog @@ */ diff --git a/gnu/usr.bin/texinfo/intl/hash-string.h b/gnu/usr.bin/texinfo/intl/hash-string.h index cacb38e479f..b267a87788f 100644 --- a/gnu/usr.bin/texinfo/intl/hash-string.h +++ b/gnu/usr.bin/texinfo/intl/hash-string.h @@ -1,25 +1,25 @@ -/* Implements a string hashing function. - Copyright (C) 1995, 1997 Free Software Foundation, Inc. +/* Description of GNU message catalog format: string hashing function. + Copyright (C) 1995, 1997, 1998, 2000, 2001 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. You should have received a copy of the GNU Library General Public - License along with the GNU C Library; see the file COPYING.LIB. If not, - write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. */ + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ /* @@ end of prolog @@ */ #ifndef PARAMS -# if __STDC__ +# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES # define PARAMS(Args) Args # else # define PARAMS(Args) () @@ -33,9 +33,9 @@ /* Defines the so called `hashpjw' function by P.J. Weinberger [see Aho/Sethi/Ullman, COMPILERS: Principles, Techniques and Tools, 1986, 1987 Bell Telephone Laboratories, Inc.] */ -static unsigned long hash_string PARAMS ((const char *__str_param)); +static unsigned long int hash_string PARAMS ((const char *__str_param)); -static inline unsigned long +static inline unsigned long int hash_string (str_param) const char *str_param; { @@ -47,8 +47,8 @@ hash_string (str_param) while (*str != '\0') { hval <<= 4; - hval += (unsigned long) *str++; - g = hval & ((unsigned long) 0xf << (HASHWORDBITS - 4)); + hval += (unsigned long int) *str++; + g = hval & ((unsigned long int) 0xf << (HASHWORDBITS - 4)); if (g != 0) { hval ^= g >> (HASHWORDBITS - 8); diff --git a/gnu/usr.bin/texinfo/intl/intl-compat.c b/gnu/usr.bin/texinfo/intl/intl-compat.c index 503efa0fa9c..0a06ce947bd 100644 --- a/gnu/usr.bin/texinfo/intl/intl-compat.c +++ b/gnu/usr.bin/texinfo/intl/intl-compat.c @@ -1,43 +1,99 @@ /* intl-compat.c - Stub functions to call gettext functions from GNU gettext Library. - Copyright (C) 1995 Software Foundation, Inc. + Copyright (C) 1995, 2000, 2001 Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) + any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#include "libgettext.h" +#include "libgnuintl.h" +#include "gettextP.h" /* @@ end of prolog @@ */ +/* This file redirects the gettext functions (without prefix or suffix) to + those defined in the included GNU gettext library (with "__" suffix). + It is compiled into libintl when the included GNU gettext library is + configured --with-included-gettext. + + This redirection works also in the case that the system C library or + the system libintl library contain gettext/textdomain/... functions. + If it didn't, we would need to add preprocessor level redirections to + libgnuintl.h of the following form: + +# define gettext gettext__ +# define dgettext dgettext__ +# define dcgettext dcgettext__ +# define ngettext ngettext__ +# define dngettext dngettext__ +# define dcngettext dcngettext__ +# define textdomain textdomain__ +# define bindtextdomain bindtextdomain__ +# define bind_textdomain_codeset bind_textdomain_codeset__ + + How does this redirection work? There are two cases. + A. When libintl.a is linked into an executable, it works because + functions defined in the executable always override functions in + the shared libraries. + B. When libintl.so is used, it works because + 1. those systems defining gettext/textdomain/... in the C library + (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer) are + ELF systems and define these symbols as weak, thus explicitly + letting other shared libraries override it. + 2. those systems defining gettext/textdomain/... in a standalone + libintl.so library (namely, Solaris 2.3 and newer) have this + shared library in /usr/lib, and the linker will search /usr/lib + *after* the directory where the GNU gettext library is installed. + + A third case, namely when libintl.a is linked into a shared library + whose name is not libintl.so, is not supported. In this case, on + Solaris, when -lintl precedes the linker option for the shared library + containing GNU gettext, the system's gettext would indeed override + the GNU gettext. Anyone doing this kind of stuff must be clever enough + to 1. compile libintl.a with -fPIC, 2. remove -lintl from his linker + command line. */ + #undef gettext #undef dgettext #undef dcgettext +#undef ngettext +#undef dngettext +#undef dcngettext #undef textdomain #undef bindtextdomain +#undef bind_textdomain_codeset char * -bindtextdomain (domainname, dirname) +gettext (msgid) + const char *msgid; +{ + return gettext__ (msgid); +} + + +char * +dgettext (domainname, msgid) const char *domainname; - const char *dirname; + const char *msgid; { - return bindtextdomain__ (domainname, dirname); + return dgettext__ (domainname, msgid); } @@ -52,19 +108,35 @@ dcgettext (domainname, msgid, category) char * -dgettext (domainname, msgid) +ngettext (msgid1, msgid2, n) + const char *msgid1; + const char *msgid2; + unsigned long int n; +{ + return ngettext__ (msgid1, msgid2, n); +} + + +char * +dngettext (domainname, msgid1, msgid2, n) const char *domainname; - const char *msgid; + const char *msgid1; + const char *msgid2; + unsigned long int n; { - return dgettext__ (domainname, msgid); + return dngettext__ (domainname, msgid1, msgid2, n); } char * -gettext (msgid) - const char *msgid; +dcngettext (domainname, msgid1, msgid2, n, category) + const char *domainname; + const char *msgid1; + const char *msgid2; + unsigned long int n; + int category; { - return gettext__ (msgid); + return dcngettext__ (domainname, msgid1, msgid2, n, category); } @@ -74,3 +146,21 @@ textdomain (domainname) { return textdomain__ (domainname); } + + +char * +bindtextdomain (domainname, dirname) + const char *domainname; + const char *dirname; +{ + return bindtextdomain__ (domainname, dirname); +} + + +char * +bind_textdomain_codeset (domainname, codeset) + const char *domainname; + const char *codeset; +{ + return bind_textdomain_codeset__ (domainname, codeset); +} diff --git a/gnu/usr.bin/texinfo/intl/l10nflist.c b/gnu/usr.bin/texinfo/intl/l10nflist.c index 9c7dc18360f..5f042325ccd 100644 --- a/gnu/usr.bin/texinfo/intl/l10nflist.c +++ b/gnu/usr.bin/texinfo/intl/l10nflist.c @@ -1,52 +1,40 @@ -/* Handle list of needed message catalogs - Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1995-1999, 2000, 2001 Free Software Foundation, Inc. Contributed by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's <string.h> to provide a prototype for stpcpy(). + This must come before <config.h> because <config.h> may include + <features.h>, and once <features.h> has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif #ifdef HAVE_CONFIG_H # include <config.h> #endif - -#if defined HAVE_STRING_H || defined _LIBC -# ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -# endif -# include <string.h> -#else -# include <strings.h> -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif -#endif -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif +#include <string.h> #if defined _LIBC || defined HAVE_ARGZ_H # include <argz.h> #endif #include <ctype.h> #include <sys/types.h> - -#if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> -#endif +#include <stdlib.h> #include "loadinfo.h" @@ -224,7 +212,7 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, /* Construct file name. */ memcpy (abs_filename, dirlist, dirlist_len); - __argz_stringify (abs_filename, dirlist_len, ':'); + __argz_stringify (abs_filename, dirlist_len, PATH_SEPARATOR); cp = abs_filename + (dirlist_len - 1); *cp++ = '/'; cp = stpcpy (cp, language); @@ -349,10 +337,11 @@ _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, /* Normalize codeset name. There is no standard for the codeset names. Normalization allows the user to use any of the common - names. */ + names. The return value is dynamically allocated and has to be + freed by the caller. */ const char * _nl_normalize_codeset (codeset, name_len) - const unsigned char *codeset; + const char *codeset; size_t name_len; { int len = 0; @@ -362,11 +351,11 @@ _nl_normalize_codeset (codeset, name_len) size_t cnt; for (cnt = 0; cnt < name_len; ++cnt) - if (isalnum (codeset[cnt])) + if (isalnum ((unsigned char) codeset[cnt])) { ++len; - if (isalpha (codeset[cnt])) + if (isalpha ((unsigned char) codeset[cnt])) only_digit = 0; } @@ -380,9 +369,9 @@ _nl_normalize_codeset (codeset, name_len) wp = retval; for (cnt = 0; cnt < name_len; ++cnt) - if (isalpha (codeset[cnt])) - *wp++ = tolower (codeset[cnt]); - else if (isdigit (codeset[cnt])) + if (isalpha ((unsigned char) codeset[cnt])) + *wp++ = tolower ((unsigned char) codeset[cnt]); + else if (isdigit ((unsigned char) codeset[cnt])) *wp++ = codeset[cnt]; *wp = '\0'; diff --git a/gnu/usr.bin/texinfo/intl/loadinfo.h b/gnu/usr.bin/texinfo/intl/loadinfo.h index f4ebf6d8112..d180962f525 100644 --- a/gnu/usr.bin/texinfo/intl/loadinfo.h +++ b/gnu/usr.bin/texinfo/intl/loadinfo.h @@ -1,29 +1,64 @@ -/* Copyright (C) 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1996-1999, 2000, 2001 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996. - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2, or (at your option) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +#ifndef _LOADINFO_H +#define _LOADINFO_H 1 + +/* Declarations of locale dependent catalog lookup functions. + Implemented in + + localealias.c Possibly replace a locale name by another. + explodename.c Split a locale name into its various fields. + l10nflist.c Generate a list of filenames of possible message catalogs. + finddomain.c Find and open the relevant message catalogs. + + The main function _nl_find_domain() in finddomain.c is declared + in gettextP.h. + */ #ifndef PARAMS -# if __STDC__ +# if __STDC__ || defined __GNUC__ || defined __SUNPRO_C || defined __cplusplus || __PROTOTYPES # define PARAMS(args) args # else # define PARAMS(args) () # endif #endif +#ifndef internal_function +# define internal_function +#endif + +/* Tell the compiler when a conditional or integer expression is + almost always true or almost always false. */ +#ifndef HAVE_BUILTIN_EXPECT +# define __builtin_expect(expr, val) (expr) +#endif + +/* Separator in PATH like lists of pathnames. */ +#if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ + /* Win32, OS/2, DOS */ +# define PATH_SEPARATOR ';' +#else + /* Unix */ +# define PATH_SEPARATOR ':' +#endif + /* Encoding of locale name parts. */ #define CEN_REVISION 1 #define CEN_SPONSOR 2 @@ -50,7 +85,11 @@ struct loaded_l10nfile }; -extern const char *_nl_normalize_codeset PARAMS ((const unsigned char *codeset, +/* Normalize codeset name. There is no standard for the codeset + names. Normalization allows the user to use any of the common + names. The return value is dynamically allocated and has to be + freed by the caller. */ +extern const char *_nl_normalize_codeset PARAMS ((const char *codeset, size_t name_len)); extern struct loaded_l10nfile * @@ -66,6 +105,8 @@ _nl_make_l10nflist PARAMS ((struct loaded_l10nfile **l10nfile_list, extern const char *_nl_expand_alias PARAMS ((const char *name)); +/* normalized_codeset is dynamically allocated and has to be freed by + the caller. */ extern int _nl_explode_name PARAMS ((char *name, const char **language, const char **modifier, const char **territory, @@ -74,3 +115,7 @@ extern int _nl_explode_name PARAMS ((char *name, const char **language, const char **special, const char **sponsor, const char **revision)); + +extern char *_nl_find_language PARAMS ((const char *name)); + +#endif /* loadinfo.h */ diff --git a/gnu/usr.bin/texinfo/intl/loadmsgcat.c b/gnu/usr.bin/texinfo/intl/loadmsgcat.c index 515892dfb86..76130ed2784 100644 --- a/gnu/usr.bin/texinfo/intl/loadmsgcat.c +++ b/gnu/usr.bin/texinfo/intl/loadmsgcat.c @@ -1,42 +1,83 @@ /* Load needed message catalogs. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. + Copyright (C) 1995-1999, 2000, 2001 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's <string.h> to provide a prototype for mempcpy(). + This must come before <config.h> because <config.h> may include + <features.h>, and once <features.h> has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif #ifdef HAVE_CONFIG_H # include <config.h> #endif +#include <ctype.h> +#include <errno.h> #include <fcntl.h> #include <sys/types.h> #include <sys/stat.h> -#if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> +#ifdef __GNUC__ +# define alloca __builtin_alloca +# define HAVE_ALLOCA 1 +#else +# if defined HAVE_ALLOCA_H || defined _LIBC +# include <alloca.h> +# else +# ifdef _AIX + #pragma alloca +# else +# ifndef alloca +char *alloca (); +# endif +# endif +# endif #endif +#include <stdlib.h> +#include <string.h> + #if defined HAVE_UNISTD_H || defined _LIBC # include <unistd.h> #endif -#if (defined HAVE_MMAP && defined HAVE_MUNMAP) || defined _LIBC +#ifdef _LIBC +# include <langinfo.h> +# include <locale.h> +#endif + +#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ + || (defined _LIBC && defined _POSIX_MAPPED_FILES) # include <sys/mman.h> +# undef HAVE_MMAP +# define HAVE_MMAP 1 +#else +# undef HAVE_MMAP #endif -#include "gettext.h" +#include "gmo.h" #include "gettextP.h" +#include "plural-exp.h" + +#ifdef _LIBC +# include "../locale/localeinfo.h" +#endif /* @@ end of prolog @@ */ @@ -51,32 +92,201 @@ # define munmap __munmap #endif +/* For those losing systems which don't have `alloca' we have to add + some additional code emulating it. */ +#ifdef HAVE_ALLOCA +# define freea(p) /* nothing */ +#else +# define alloca(n) malloc (n) +# define freea(p) free (p) +#endif + +/* For systems that distinguish between text and binary I/O. + O_BINARY is usually declared in <fcntl.h>. */ +#if !defined O_BINARY && defined _O_BINARY + /* For MSC-compatible compilers. */ +# define O_BINARY _O_BINARY +# define O_TEXT _O_TEXT +#endif +#ifdef __BEOS__ + /* BeOS 5 has O_BINARY and O_TEXT, but they have no effect. */ +# undef O_BINARY +# undef O_TEXT +#endif +/* On reasonable systems, binary I/O is the default. */ +#ifndef O_BINARY +# define O_BINARY 0 +#endif + /* We need a sign, whether a new catalog was loaded, which can be associated with all translations. This is important if the translations are cached by one of GCC's features. */ -int _nl_msg_cat_cntr = 0; +int _nl_msg_cat_cntr; +/* Initialize the codeset dependent parts of an opened message catalog. + Return the header entry. */ +const char * +internal_function +_nl_init_domain_conv (domain_file, domain, domainbinding) + struct loaded_l10nfile *domain_file; + struct loaded_domain *domain; + struct binding *domainbinding; +{ + /* Find out about the character set the file is encoded with. + This can be found (in textual form) in the entry "". If this + entry does not exist or if this does not contain the `charset=' + information, we will assume the charset matches the one the + current locale and we don't have to perform any conversion. */ + char *nullentry; + size_t nullentrylen; + + /* Preinitialize fields, to avoid recursion during _nl_find_msg. */ + domain->codeset_cntr = + (domainbinding != NULL ? domainbinding->codeset_cntr : 0); +#ifdef _LIBC + domain->conv = (__gconv_t) -1; +#else +# if HAVE_ICONV + domain->conv = (iconv_t) -1; +# endif +#endif + domain->conv_tab = NULL; + + /* Get the header entry. */ + nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen); + + if (nullentry != NULL) + { +#if defined _LIBC || HAVE_ICONV + const char *charsetstr; + + charsetstr = strstr (nullentry, "charset="); + if (charsetstr != NULL) + { + size_t len; + char *charset; + const char *outcharset; + + charsetstr += strlen ("charset="); + len = strcspn (charsetstr, " \t\n"); + + charset = (char *) alloca (len + 1); +# if defined _LIBC || HAVE_MEMPCPY + *((char *) mempcpy (charset, charsetstr, len)) = '\0'; +# else + memcpy (charset, charsetstr, len); + charset[len] = '\0'; +# endif + + /* The output charset should normally be determined by the + locale. But sometimes the locale is not used or not correctly + set up, so we provide a possibility for the user to override + this. Moreover, the value specified through + bind_textdomain_codeset overrides both. */ + if (domainbinding != NULL && domainbinding->codeset != NULL) + outcharset = domainbinding->codeset; + else + { + outcharset = getenv ("OUTPUT_CHARSET"); + if (outcharset == NULL || outcharset[0] == '\0') + { +# ifdef _LIBC + outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; +# else +# if HAVE_ICONV + extern const char *locale_charset PARAMS ((void)); + outcharset = locale_charset (); +# endif +# endif + } + } + +# ifdef _LIBC + /* We always want to use transliteration. */ + outcharset = norm_add_slashes (outcharset, "TRANSLIT"); + charset = norm_add_slashes (charset, NULL); + if (__gconv_open (outcharset, charset, &domain->conv, + GCONV_AVOID_NOCONV) + != __GCONV_OK) + domain->conv = (__gconv_t) -1; +# else +# if HAVE_ICONV + /* When using GNU libc >= 2.2 or GNU libiconv >= 1.5, + we want to use transliteration. */ +# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ + || _LIBICONV_VERSION >= 0x0105 + len = strlen (outcharset); + { + char *tmp = (char *) alloca (len + 10 + 1); + memcpy (tmp, outcharset, len); + memcpy (tmp + len, "//TRANSLIT", 10 + 1); + outcharset = tmp; + } +# endif + domain->conv = iconv_open (outcharset, charset); +# if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2) || __GLIBC__ > 2 \ + || _LIBICONV_VERSION >= 0x0105 + freea (outcharset); +# endif +# endif +# endif + + freea (charset); + } +#endif /* _LIBC || HAVE_ICONV */ + } + + return nullentry; +} + +/* Frees the codeset dependent parts of an opened message catalog. */ +void +internal_function +_nl_free_domain_conv (domain) + struct loaded_domain *domain; +{ + if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) + free (domain->conv_tab); + +#ifdef _LIBC + if (domain->conv != (__gconv_t) -1) + __gconv_close (domain->conv); +#else +# if HAVE_ICONV + if (domain->conv != (iconv_t) -1) + iconv_close (domain->conv); +# endif +#endif +} + /* Load the message catalogs specified by FILENAME. If it is no valid message catalog do nothing. */ void internal_function -_nl_load_domain (domain_file) +_nl_load_domain (domain_file, domainbinding) struct loaded_l10nfile *domain_file; + struct binding *domainbinding; { int fd; size_t size; +#ifdef _LIBC + struct stat64 st; +#else struct stat st; +#endif struct mo_file_header *data = (struct mo_file_header *) -1; -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ - || defined _LIBC int use_mmap = 0; -#endif struct loaded_domain *domain; + const char *nullentry; domain_file->decided = 1; domain_file->data = NULL; + /* Note that it would be useless to store domainbinding in domain_file + because domainbinding might be == NULL now but != NULL later (after + a call to bind_textdomain_codeset). */ + /* If the record does not represent a valid locale the FILENAME might be NULL. This can happen when according to the given specification the locale file name is different for XPG and CEN @@ -85,28 +295,32 @@ _nl_load_domain (domain_file) return; /* Try to open the addressed file. */ - fd = open (domain_file->filename, O_RDONLY); + fd = open (domain_file->filename, O_RDONLY | O_BINARY); if (fd == -1) return; /* We must know about the size of the file. */ - if (fstat (fd, &st) != 0 - || (size = (size_t) st.st_size) != st.st_size - || size < sizeof (struct mo_file_header)) + if ( +#ifdef _LIBC + __builtin_expect (fstat64 (fd, &st) != 0, 0) +#else + __builtin_expect (fstat (fd, &st) != 0, 0) +#endif + || __builtin_expect ((size = (size_t) st.st_size) != st.st_size, 0) + || __builtin_expect (size < sizeof (struct mo_file_header), 0)) { /* Something went wrong. */ close (fd); return; } -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ - || defined _LIBC +#ifdef HAVE_MMAP /* Now we are ready to load the file. If mmap() is available we try this first. If not available or it failed we try to load it. */ data = (struct mo_file_header *) mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0); - if (data != (struct mo_file_header *) -1) + if (__builtin_expect (data != (struct mo_file_header *) -1, 1)) { /* mmap() call was successful. */ close (fd); @@ -130,12 +344,15 @@ _nl_load_domain (domain_file) do { long int nb = (long int) read (fd, read_ptr, to_read); - if (nb == -1) + if (nb <= 0) { +#ifdef EINTR + if (nb == -1 && errno == EINTR) + continue; +#endif close (fd); return; } - read_ptr += nb; to_read -= nb; } @@ -146,11 +363,11 @@ _nl_load_domain (domain_file) /* Using the magic number we can test whether it really is a message catalog file. */ - if (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED) + if (__builtin_expect (data->magic != _MAGIC && data->magic != _MAGIC_SWAPPED, + 0)) { /* The magic number is wrong: not a message catalog file. */ -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ - || defined _LIBC +#ifdef HAVE_MMAP if (use_mmap) munmap ((caddr_t) data, size); else @@ -159,17 +376,13 @@ _nl_load_domain (domain_file) return; } - domain_file->data - = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); - if (domain_file->data == NULL) + domain = (struct loaded_domain *) malloc (sizeof (struct loaded_domain)); + if (domain == NULL) return; + domain_file->data = domain; - domain = (struct loaded_domain *) domain_file->data; domain->data = (char *) data; -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ - || defined _LIBC domain->use_mmap = use_mmap; -#endif domain->mmap_size = size; domain->must_swap = data->magic != _MAGIC; @@ -187,9 +400,8 @@ _nl_load_domain (domain_file) ((char *) data + W (domain->must_swap, data->hash_tab_offset)); break; default: - /* This is an illegal revision. */ -#if (defined HAVE_MMAP && defined HAVE_MUNMAP && !defined DISALLOW_MMAP) \ - || defined _LIBC + /* This is an invalid revision. */ +#ifdef HAVE_MMAP if (use_mmap) munmap ((caddr_t) data, size); else @@ -200,9 +412,13 @@ _nl_load_domain (domain_file) return; } - /* Show that one domain is changed. This might make some cached - translations invalid. */ - ++_nl_msg_cat_cntr; + /* Now initialize the character set converter from the character set + the file is encoded with (found in the header entry) to the domain's + specified character set or the locale's character set. */ + nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding); + + /* Also look for a plural specification. */ + EXTRACT_PLURAL_EXPRESSION (nullentry, &domain->plural, &domain->nplurals); } @@ -212,9 +428,16 @@ internal_function _nl_unload_domain (domain) struct loaded_domain *domain; { + if (domain->plural != &__gettext_germanic_plural) + __gettext_free_exp (domain->plural); + + _nl_free_domain_conv (domain); + +# ifdef _POSIX_MAPPED_FILES if (domain->use_mmap) munmap ((caddr_t) domain->data, domain->mmap_size); else +# endif /* _POSIX_MAPPED_FILES */ free ((void *) domain->data); free (domain); diff --git a/gnu/usr.bin/texinfo/intl/localealias.c b/gnu/usr.bin/texinfo/intl/localealias.c index bca555a610f..456e41e37d7 100644 --- a/gnu/usr.bin/texinfo/intl/localealias.c +++ b/gnu/usr.bin/texinfo/intl/localealias.c @@ -1,20 +1,27 @@ /* Handle aliases for locale names. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. + Copyright (C) 1995-1999, 2000, 2001 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ + +/* Tell glibc's <string.h> to provide a prototype for mempcpy(). + This must come before <config.h> because <config.h> may include + <features.h>, and once <features.h> has been included, it's too late. */ +#ifndef _GNU_SOURCE +# define _GNU_SOURCE 1 +#endif #ifdef HAVE_CONFIG_H # include <config.h> @@ -22,6 +29,9 @@ #include <ctype.h> #include <stdio.h> +#if defined _LIBC || defined HAVE___FSETLOCKING +# include <stdio_ext.h> +#endif #include <sys/types.h> #ifdef __GNUC__ @@ -41,35 +51,9 @@ char *alloca (); # endif #endif -#if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> -#else -char *getenv (); -# ifdef HAVE_MALLOC_H -# include <malloc.h> -# else -void free (); -# endif -#endif +#include <stdlib.h> +#include <string.h> -#if defined HAVE_STRING_H || defined _LIBC -# ifndef _GNU_SOURCE -# define _GNU_SOURCE 1 -# endif -# include <string.h> -#else -# include <strings.h> -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif -#endif -#if !HAVE_STRCHR && !defined _LIBC -# ifndef strchr -# define strchr index -# endif -#endif - -#include "gettext.h" #include "gettextP.h" /* @@ end of prolog @@ */ @@ -80,8 +64,11 @@ void free (); file and the name space must not be polluted. */ # define strcasecmp __strcasecmp -# define mempcpy __mempcpy +# ifndef mempcpy +# define mempcpy __mempcpy +# endif # define HAVE_MEMPCPY 1 +# define HAVE___FSETLOCKING 1 /* We need locking here since we can be called from different places. */ # include <bits/libc-lock.h> @@ -89,41 +76,36 @@ void free (); __libc_lock_define_initialized (static, lock); #endif +#ifndef internal_function +# define internal_function +#endif -/* For those loosing systems which don't have `alloca' we have to add +/* Some optimizations for glibc. */ +#ifdef _LIBC +# define FEOF(fp) feof_unlocked (fp) +# define FGETS(buf, n, fp) fgets_unlocked (buf, n, fp) +#else +# define FEOF(fp) feof (fp) +# define FGETS(buf, n, fp) fgets (buf, n, fp) +#endif + +/* For those losing systems which don't have `alloca' we have to add some additional code emulating it. */ #ifdef HAVE_ALLOCA -/* Nothing has to be done. */ -# define ADD_BLOCK(list, address) /* nothing */ -# define FREE_BLOCKS(list) /* nothing */ +# define freea(p) /* nothing */ #else -struct block_list -{ - void *address; - struct block_list *next; -}; -# define ADD_BLOCK(list, addr) \ - do { \ - struct block_list *newp = (struct block_list *) malloc (sizeof (*newp)); \ - /* If we cannot get a free block we cannot add the new element to \ - the list. */ \ - if (newp != NULL) { \ - newp->address = (addr); \ - newp->next = (list); \ - (list) = newp; \ - } \ - } while (0) -# define FREE_BLOCKS(list) \ - do { \ - while (list != NULL) { \ - struct block_list *old = list; \ - list = list->next; \ - free (old); \ - } \ - } while (0) -# undef alloca -# define alloca(size) (malloc (size)) -#endif /* have alloca */ +# define alloca(n) malloc (n) +# define freea(p) free (p) +#endif + +#if defined _LIBC_REENTRANT || defined HAVE_FGETS_UNLOCKED +# undef fgets +# define fgets(buf, len, s) fgets_unlocked (buf, len, s) +#endif +#if defined _LIBC_REENTRANT || defined HAVE_FEOF_UNLOCKED +# undef feof +# define feof(s) feof_unlocked (s) +#endif struct alias_map @@ -133,18 +115,18 @@ struct alias_map }; -static char *string_space = NULL; -static size_t string_space_act = 0; -static size_t string_space_max = 0; +static char *string_space; +static size_t string_space_act; +static size_t string_space_max; static struct alias_map *map; -static size_t nmap = 0; -static size_t maxmap = 0; +static size_t nmap; +static size_t maxmap; /* Prototypes for local functions. */ static size_t read_alias_file PARAMS ((const char *fname, int fname_len)) internal_function; -static void extend_alias_table PARAMS ((void)); +static int extend_alias_table PARAMS ((void)); static int alias_compare PARAMS ((const struct alias_map *map1, const struct alias_map *map2)); @@ -153,7 +135,7 @@ const char * _nl_expand_alias (name) const char *name; { - static const char *locale_alias_path = LOCALE_ALIAS_PATH; + static const char *locale_alias_path; struct alias_map *retval; const char *result = NULL; size_t added; @@ -162,6 +144,9 @@ _nl_expand_alias (name) __libc_lock_lock (lock); #endif + if (locale_alias_path == NULL) + locale_alias_path = LOCALE_ALIAS_PATH; + do { struct alias_map item; @@ -190,11 +175,12 @@ _nl_expand_alias (name) { const char *start; - while (locale_alias_path[0] == ':') + while (locale_alias_path[0] == PATH_SEPARATOR) ++locale_alias_path; start = locale_alias_path; - while (locale_alias_path[0] != '\0' && locale_alias_path[0] != ':') + while (locale_alias_path[0] != '\0' + && locale_alias_path[0] != PATH_SEPARATOR) ++locale_alias_path; if (start < locale_alias_path) @@ -217,16 +203,12 @@ read_alias_file (fname, fname_len) const char *fname; int fname_len; { -#ifndef HAVE_ALLOCA - struct block_list *block_list = NULL; -#endif FILE *fp; char *full_fname; size_t added; static const char aliasfile[] = "/locale.alias"; full_fname = (char *) alloca (fname_len + sizeof aliasfile); - ADD_BLOCK (block_list, full_fname); #ifdef HAVE_MEMPCPY mempcpy (mempcpy (full_fname, fname, fname_len), aliasfile, sizeof aliasfile); @@ -236,26 +218,29 @@ read_alias_file (fname, fname_len) #endif fp = fopen (full_fname, "r"); + freea (full_fname); if (fp == NULL) - { - FREE_BLOCKS (block_list); - return 0; - } + return 0; + +#ifdef HAVE___FSETLOCKING + /* No threads present. */ + __fsetlocking (fp, FSETLOCKING_BYCALLER); +#endif added = 0; - while (!feof (fp)) + while (!FEOF (fp)) { /* It is a reasonable approach to use a fix buffer here because a) we are only interested in the first two fields b) these fields must be usable as file names and so must not be that long */ - unsigned char buf[BUFSIZ]; - unsigned char *alias; - unsigned char *value; - unsigned char *cp; + char buf[BUFSIZ]; + char *alias; + char *value; + char *cp; - if (fgets (buf, sizeof buf, fp) == NULL) + if (FGETS (buf, sizeof buf, fp) == NULL) /* EOF reached. */ break; @@ -265,7 +250,7 @@ read_alias_file (fname, fname_len) { char altbuf[BUFSIZ]; do - if (fgets (altbuf, sizeof altbuf, fp) == NULL) + if (FGETS (altbuf, sizeof altbuf, fp) == NULL) /* Make sure the inner loop will be left. The outer loop will exit at the `feof' test. */ break; @@ -274,21 +259,21 @@ read_alias_file (fname, fname_len) cp = buf; /* Ignore leading white space. */ - while (isspace (cp[0])) + while (isspace ((unsigned char) cp[0])) ++cp; /* A leading '#' signals a comment line. */ if (cp[0] != '\0' && cp[0] != '#') { alias = cp++; - while (cp[0] != '\0' && !isspace (cp[0])) + while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) ++cp; /* Terminate alias name. */ if (cp[0] != '\0') *cp++ = '\0'; /* Now look for the beginning of the value. */ - while (isspace (cp[0])) + while (isspace ((unsigned char) cp[0])) ++cp; if (cp[0] != '\0') @@ -297,7 +282,7 @@ read_alias_file (fname, fname_len) size_t value_len; value = cp++; - while (cp[0] != '\0' && !isspace (cp[0])) + while (cp[0] != '\0' && !isspace ((unsigned char) cp[0])) ++cp; /* Terminate value. */ if (cp[0] == '\n') @@ -312,7 +297,8 @@ read_alias_file (fname, fname_len) *cp++ = '\0'; if (nmap >= maxmap) - extend_alias_table (); + if (__builtin_expect (extend_alias_table (), 0)) + return added; alias_len = strlen (alias) + 1; value_len = strlen (value) + 1; @@ -325,10 +311,19 @@ read_alias_file (fname, fname_len) ? alias_len + value_len : 1024)); char *new_pool = (char *) realloc (string_space, new_size); if (new_pool == NULL) + return added; + + if (__builtin_expect (string_space != new_pool, 0)) { - FREE_BLOCKS (block_list); - return added; + size_t i; + + for (i = 0; i < nmap; i++) + { + map[i].alias += new_pool - string_space; + map[i].value += new_pool - string_space; + } } + string_space = new_pool; string_space_max = new_size; } @@ -355,12 +350,11 @@ read_alias_file (fname, fname_len) qsort (map, nmap, sizeof (struct alias_map), (int (*) PARAMS ((const void *, const void *))) alias_compare); - FREE_BLOCKS (block_list); return added; } -static void +static int extend_alias_table () { size_t new_size; @@ -371,10 +365,11 @@ extend_alias_table () * sizeof (struct alias_map))); if (new_map == NULL) /* Simply don't extend: we don't have any more core. */ - return; + return -1; map = new_map; maxmap = new_size; + return 0; } diff --git a/gnu/usr.bin/texinfo/intl/textdomain.c b/gnu/usr.bin/texinfo/intl/textdomain.c index 88557460f3b..2e420ad7729 100644 --- a/gnu/usr.bin/texinfo/intl/textdomain.c +++ b/gnu/usr.bin/texinfo/intl/textdomain.c @@ -1,42 +1,51 @@ /* Implementation of the textdomain(3) function. - Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. - Written by Ulrich Drepper <drepper@gnu.ai.mit.edu>, 1995. + Copyright (C) 1995-1998, 2000, 2001 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) + This program is free software; you can redistribute it and/or modify it + under the terms of the GNU Library General Public License as published + by the Free Software Foundation; either version 2, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software Foundation, - Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU Library General Public + License along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, + USA. */ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#if defined STDC_HEADERS || defined _LIBC -# include <stdlib.h> -#endif +#include <stdlib.h> +#include <string.h> -#if defined STDC_HEADERS || defined HAVE_STRING_H || defined _LIBC -# include <string.h> +#ifdef _LIBC +# include <libintl.h> #else -# include <strings.h> -# ifndef memcpy -# define memcpy(Dst, Src, Num) bcopy (Src, Dst, Num) -# endif +# include "libgnuintl.h" #endif +#include "gettextP.h" #ifdef _LIBC -# include <libintl.h> +/* We have to handle multi-threaded applications. */ +# include <bits/libc-lock.h> #else -# include "libgettext.h" +/* Provide dummy implementation if this is outside glibc. */ +# define __libc_rwlock_define(CLASS, NAME) +# define __libc_rwlock_wrlock(NAME) +# define __libc_rwlock_unlock(NAME) +#endif + +/* The internal variables in the standalone libintl.a must have different + names than the internal variables in GNU libc, otherwise programs + using libintl.a cannot be linked statically. */ +#if !defined _LIBC +# define _nl_default_default_domain _nl_default_default_domain__ +# define _nl_current_default_domain _nl_current_default_domain__ #endif /* @@ end of prolog @@ */ @@ -61,6 +70,9 @@ extern const char *_nl_current_default_domain; # define TEXTDOMAIN textdomain__ #endif +/* Lock variable to protect the global data in the gettext implementation. */ +__libc_rwlock_define (extern, _nl_state_lock) + /* Set the current default message catalog to DOMAINNAME. If DOMAINNAME is null, return the current default. If DOMAINNAME is "", reset to the default of "messages". */ @@ -68,38 +80,60 @@ char * TEXTDOMAIN (domainname) const char *domainname; { - char *old; + char *new_domain; + char *old_domain; /* A NULL pointer requests the current setting. */ if (domainname == NULL) return (char *) _nl_current_default_domain; - old = (char *) _nl_current_default_domain; + __libc_rwlock_wrlock (_nl_state_lock); + + old_domain = (char *) _nl_current_default_domain; /* If domain name is the null string set to default domain "messages". */ if (domainname[0] == '\0' || strcmp (domainname, _nl_default_default_domain) == 0) - _nl_current_default_domain = _nl_default_default_domain; + { + _nl_current_default_domain = _nl_default_default_domain; + new_domain = (char *) _nl_current_default_domain; + } + else if (strcmp (domainname, old_domain) == 0) + /* This can happen and people will use it to signal that some + environment variable changed. */ + new_domain = old_domain; else { /* If the following malloc fails `_nl_current_default_domain' will be NULL. This value will be returned and so signals we are out of core. */ #if defined _LIBC || defined HAVE_STRDUP - _nl_current_default_domain = strdup (domainname); + new_domain = strdup (domainname); #else size_t len = strlen (domainname) + 1; - char *cp = (char *) malloc (len); - if (cp != NULL) - memcpy (cp, domainname, len); - _nl_current_default_domain = cp; + new_domain = (char *) malloc (len); + if (new_domain != NULL) + memcpy (new_domain, domainname, len); #endif + + if (new_domain != NULL) + _nl_current_default_domain = new_domain; + } + + /* We use this possibility to signal a change of the loaded catalogs + since this is most likely the case and there is no other easy we + to do it. Do it only when the call was successful. */ + if (new_domain != NULL) + { + ++_nl_msg_cat_cntr; + + if (old_domain != new_domain && old_domain != _nl_default_default_domain) + free (old_domain); } - if (old != _nl_default_default_domain) - free (old); + __libc_rwlock_unlock (_nl_state_lock); - return (char *) _nl_current_default_domain; + return new_domain; } #ifdef _LIBC diff --git a/gnu/usr.bin/texinfo/lib/alloca.c b/gnu/usr.bin/texinfo/lib/alloca.c index 8f98b73dbb9..b102eb11bfe 100644 --- a/gnu/usr.bin/texinfo/lib/alloca.c +++ b/gnu/usr.bin/texinfo/lib/alloca.c @@ -22,18 +22,11 @@ your main control loop, etc. to force garbage collection. */ #ifdef HAVE_CONFIG_H -#include <config.h> -#endif - -#ifdef HAVE_STRING_H -#include <string.h> -#endif -#ifdef HAVE_STDLIB_H -#include <stdlib.h> +# include <config.h> #endif #ifdef emacs -#include "blockinput.h" +# include "blockinput.h" #endif /* If compiling with GCC 2, this file's not needed. */ @@ -41,41 +34,41 @@ /* If someone has defined alloca as a macro, there must be some other way alloca is supposed to work. */ -#ifndef alloca +# ifndef alloca -#ifdef emacs -#ifdef static +# ifdef emacs +# ifdef static /* actually, only want this if static is defined as "" -- this is for usg, in which emacs must undefine static in order to make unexec workable */ -#ifndef STACK_DIRECTION +# ifndef STACK_DIRECTION you lose -- must know STACK_DIRECTION at compile-time -#endif /* STACK_DIRECTION undefined */ -#endif /* static */ -#endif /* emacs */ +# endif /* STACK_DIRECTION undefined */ +# endif /* static */ +# endif /* emacs */ /* If your stack is a linked list of frames, you have to provide an "address metric" ADDRESS_FUNCTION macro. */ -#if defined (CRAY) && defined (CRAY_STACKSEG_END) +# if defined (CRAY) && defined (CRAY_STACKSEG_END) long i00afunc (); -#define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg)) -#else -#define ADDRESS_FUNCTION(arg) &(arg) -#endif +# define ADDRESS_FUNCTION(arg) (char *) i00afunc (&(arg)) +# else +# define ADDRESS_FUNCTION(arg) &(arg) +# endif -#if __STDC__ +# if __STDC__ typedef void *pointer; -#else +# else typedef char *pointer; -#endif +# endif -#ifndef NULL -#define NULL 0 -#endif +# ifndef NULL +# define NULL 0 +# endif /* Different portions of Emacs need to call different versions of malloc. The Emacs executable needs alloca to call xmalloc, because @@ -83,13 +76,13 @@ typedef char *pointer; hand, the utilities in lib-src need alloca to call malloc; some of them are very simple, and don't have an xmalloc routine. - Non-Emacs programs expect this to call use xmalloc. + Non-Emacs programs expect this to call xmalloc. Callers below should use malloc. */ -#ifndef emacs -#define malloc xmalloc -#endif +# ifndef emacs +# define malloc xmalloc +# endif extern pointer malloc (); /* Define STACK_DIRECTION if you know the direction of stack @@ -100,18 +93,18 @@ extern pointer malloc (); STACK_DIRECTION < 0 => grows toward lower addresses STACK_DIRECTION = 0 => direction of growth unknown */ -#ifndef STACK_DIRECTION -#define STACK_DIRECTION 0 /* Direction unknown. */ -#endif +# ifndef STACK_DIRECTION +# define STACK_DIRECTION 0 /* Direction unknown. */ +# endif -#if STACK_DIRECTION != 0 +# if STACK_DIRECTION != 0 -#define STACK_DIR STACK_DIRECTION /* Known at compile-time. */ +# define STACK_DIR STACK_DIRECTION /* Known at compile-time. */ -#else /* STACK_DIRECTION == 0; need run-time code. */ +# else /* STACK_DIRECTION == 0; need run-time code. */ static int stack_dir; /* 1 or -1 once known. */ -#define STACK_DIR stack_dir +# define STACK_DIR stack_dir static void find_stack_direction () @@ -135,7 +128,7 @@ find_stack_direction () } } -#endif /* STACK_DIRECTION == 0 */ +# endif /* STACK_DIRECTION == 0 */ /* An "alloca header" is used to: (a) chain together all alloca'ed blocks; @@ -144,9 +137,9 @@ find_stack_direction () It is very important that sizeof(header) agree with malloc alignment chunk size. The following default should work okay. */ -#ifndef ALIGN_SIZE -#define ALIGN_SIZE sizeof(double) -#endif +# ifndef ALIGN_SIZE +# define ALIGN_SIZE sizeof(double) +# endif typedef union hdr { @@ -168,16 +161,15 @@ static header *last_alloca_header = NULL; /* -> last alloca header. */ implementations of C, for example under Gould's UTX/32. */ pointer -alloca (size) - unsigned size; +alloca (unsigned size) { auto char probe; /* Probes stack depth: */ register char *depth = ADDRESS_FUNCTION (probe); -#if STACK_DIRECTION == 0 +# if STACK_DIRECTION == 0 if (STACK_DIR == 0) /* Unknown growth direction. */ find_stack_direction (); -#endif +# endif /* Reclaim garbage, defined as all alloca'd storage that was allocated from deeper in the stack than currently. */ @@ -185,9 +177,9 @@ alloca (size) { register header *hp; /* Traverses linked list. */ -#ifdef emacs +# ifdef emacs BLOCK_INPUT; -#endif +# endif for (hp = last_alloca_header; hp != NULL;) if ((STACK_DIR > 0 && hp->h.deep > depth) @@ -204,9 +196,9 @@ alloca (size) last_alloca_header = hp; /* -> last valid storage. */ -#ifdef emacs +# ifdef emacs UNBLOCK_INPUT; -#endif +# endif } if (size == 0) @@ -218,9 +210,6 @@ alloca (size) register pointer new = malloc (sizeof (header) + size); /* Address of header. */ - if (new == 0) - abort(); - ((header *) new)->h.next = last_alloca_header; ((header *) new)->h.deep = depth; @@ -232,15 +221,15 @@ alloca (size) } } -#if defined (CRAY) && defined (CRAY_STACKSEG_END) +# if defined (CRAY) && defined (CRAY_STACKSEG_END) -#ifdef DEBUG_I00AFUNC -#include <stdio.h> -#endif +# ifdef DEBUG_I00AFUNC +# include <stdio.h> +# endif -#ifndef CRAY_STACK -#define CRAY_STACK -#ifndef CRAY2 +# ifndef CRAY_STACK +# define CRAY_STACK +# ifndef CRAY2 /* Stack structures for CRAY-1, CRAY X-MP, and CRAY Y-MP */ struct stack_control_header { @@ -292,7 +281,7 @@ struct stack_segment_linkage long sss7; }; -#else /* CRAY2 */ +# else /* CRAY2 */ /* The following structure defines the vector of words returned by the STKSTAT library routine. */ struct stk_stat @@ -345,10 +334,10 @@ struct stk_trailer long unknown14; }; -#endif /* CRAY2 */ -#endif /* not CRAY_STACK */ +# endif /* CRAY2 */ +# endif /* not CRAY_STACK */ -#ifdef CRAY2 +# ifdef CRAY2 /* Determine a "stack measure" for an arbitrary ADDRESS. I doubt that "lint" will like this much. */ @@ -419,7 +408,7 @@ i00afunc (long *address) return (result); } -#else /* not CRAY2 */ +# else /* not CRAY2 */ /* Stack address function for a CRAY-1, CRAY X-MP, or CRAY Y-MP. Determine the number of the cell within the stack, given the address of the cell. The purpose of this @@ -464,9 +453,9 @@ i00afunc (long address) while (!(this_segment <= address && address <= stkl)) { -#ifdef DEBUG_I00AFUNC +# ifdef DEBUG_I00AFUNC fprintf (stderr, "%011o %011o %011o\n", this_segment, address, stkl); -#endif +# endif if (pseg == 0) break; stkl = stkl - pseg; @@ -485,9 +474,9 @@ i00afunc (long address) while (pseg != 0) { -#ifdef DEBUG_I00AFUNC +# ifdef DEBUG_I00AFUNC fprintf (stderr, "%011o %011o\n", pseg, size); -#endif +# endif stkl = stkl - pseg; ssptr = (struct stack_segment_linkage *) stkl; size = ssptr->sssize; @@ -497,8 +486,8 @@ i00afunc (long address) return (result); } -#endif /* not CRAY2 */ -#endif /* CRAY */ +# endif /* not CRAY2 */ +# endif /* CRAY */ -#endif /* no alloca */ +# endif /* no alloca */ #endif /* not GCC version 2 */ diff --git a/gnu/usr.bin/texinfo/lib/getopt.c b/gnu/usr.bin/texinfo/lib/getopt.c index 03effcbdb3e..d176d3e7e72 100644 --- a/gnu/usr.bin/texinfo/lib/getopt.c +++ b/gnu/usr.bin/texinfo/lib/getopt.c @@ -1,14 +1,10 @@ /* Getopt for GNU. - NOTE: getopt is now part of the C library, so if you don't know what - "Keep this file name-space clean" means, talk to drepper@gnu.org - before changing it! + NOTE: The canonical source of this file is maintained with the GNU + C Library. Bugs can be reported to bug-glibc@gnu.org. - Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98 + Copyright (C) 1987, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99 Free Software Foundation, Inc. - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any @@ -20,9 +16,8 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ /* This tells Alpha OSF/1 not to define a getopt prototype in <stdio.h>. Ditto for AIX 3.2 and <stdlib.h>. */ @@ -32,13 +27,13 @@ #ifdef HAVE_CONFIG_H # include <config.h> -#endif - -#if !defined __STDC__ || !__STDC__ +#else +# if !defined __STDC__ || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ -# ifndef const -# define const +# ifndef const +# define const +# endif # endif #endif @@ -112,7 +107,7 @@ Also, when `ordering' is RETURN_IN_ORDER, each non-option ARGV-element is returned here. */ -char *optarg = NULL; +char *optarg; /* Index in ARGV of the next element to be scanned. This is used for communication to and from the caller @@ -133,7 +128,7 @@ int optind = 1; causes problems with re-calling getopt as programs generally don't know that. */ -int __getopt_initialized = 0; +int __getopt_initialized; /* The next char to be scanned in the option-element in which the last option character we returned was found. @@ -698,16 +693,18 @@ _getopt_internal (argc, argv, optstring, longopts, longind, long_only) else { if (opterr) - if (argv[optind - 1][1] == '-') - /* --option */ - fprintf (stderr, - _("%s: option `--%s' doesn't allow an argument\n"), - argv[0], pfound->name); - else - /* +option or -option */ - fprintf (stderr, - _("%s: option `%c%s' doesn't allow an argument\n"), - argv[0], argv[optind - 1][0], pfound->name); + { + if (argv[optind - 1][1] == '-') + /* --option */ + fprintf (stderr, + _("%s: option `--%s' doesn't allow an argument\n"), + argv[0], pfound->name); + else + /* +option or -option */ + fprintf (stderr, + _("%s: option `%c%s' doesn't allow an argument\n"), + argv[0], argv[optind - 1][0], pfound->name); + } nextchar += strlen (nextchar); diff --git a/gnu/usr.bin/texinfo/lib/getopt.h b/gnu/usr.bin/texinfo/lib/getopt.h index fb30719a860..ac6728f83d4 100644 --- a/gnu/usr.bin/texinfo/lib/getopt.h +++ b/gnu/usr.bin/texinfo/lib/getopt.h @@ -1,9 +1,7 @@ /* Declarations for getopt. - Copyright (C) 1989,90,91,92,93,94,96,97 Free Software Foundation, Inc. - + Copyright (C) 1989,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any @@ -20,7 +18,10 @@ USA. */ #ifndef _GETOPT_H -#define _GETOPT_H 1 + +#ifndef __need_getopt +# define _GETOPT_H 1 +#endif #ifdef __cplusplus extern "C" { @@ -57,6 +58,7 @@ extern int opterr; extern int optopt; +#ifndef __need_getopt /* Describe the long-named options requested by the application. The LONG_OPTIONS argument to getopt_long or getopt_long_only is a vector of `struct option' terminated by an element containing a name which is @@ -80,11 +82,11 @@ extern int optopt; struct option { -#if defined (__STDC__) && __STDC__ +# if defined __STDC__ && __STDC__ const char *name; -#else +# else char *name; -#endif +# endif /* has_arg can't be an enum because some compilers complain about type mismatches in all the code that assumes it is an int. */ int has_arg; @@ -94,40 +96,74 @@ struct option /* Names for the values of the `has_arg' field of `struct option'. */ -#define no_argument 0 -#define required_argument 1 -#define optional_argument 2 +# define no_argument 0 +# define required_argument 1 +# define optional_argument 2 +#endif /* need getopt */ + + +/* Get definitions and prototypes for functions to process the + arguments in ARGV (ARGC of them, minus the program name) for + options given in OPTS. -#if defined (__STDC__) && __STDC__ -#ifdef __GNU_LIBRARY__ + Return the option character from OPTS just read. Return -1 when + there are no more options. For unrecognized options, or options + missing arguments, `optopt' is set to the option letter, and '?' is + returned. + + The OPTS string is a list of characters which are recognized option + letters, optionally followed by colons, specifying that that letter + takes an argument, to be placed in `optarg'. + + If a letter in OPTS is followed by two colons, its argument is + optional. This behavior is specific to the GNU `getopt'. + + The argument `--' causes premature termination of argument + scanning, explicitly telling `getopt' that there are no more + options. + + If OPTS begins with `--', then non-option arguments are treated as + arguments to the option '\0'. This behavior is specific to the GNU + `getopt'. */ + +#if defined __STDC__ && __STDC__ +# ifdef __GNU_LIBRARY__ /* Many other libraries have conflicting prototypes for getopt, with differences in the consts, in stdlib.h. To avoid compilation errors, only prototype getopt for the GNU C library. */ -extern int getopt (int argc, char *const *argv, const char *shortopts); -#else /* not __GNU_LIBRARY__ */ +extern int getopt (int __argc, char *const *__argv, const char *__shortopts); +# else /* not __GNU_LIBRARY__ */ extern int getopt (); -#endif /* __GNU_LIBRARY__ */ -extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); -extern int getopt_long_only (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind); +# endif /* __GNU_LIBRARY__ */ + +# ifndef __need_getopt +extern int getopt_long (int __argc, char *const *__argv, const char *__shortopts, + const struct option *__longopts, int *__longind); +extern int getopt_long_only (int __argc, char *const *__argv, + const char *__shortopts, + const struct option *__longopts, int *__longind); /* Internal only. Users should not call this directly. */ -extern int _getopt_internal (int argc, char *const *argv, - const char *shortopts, - const struct option *longopts, int *longind, - int long_only); +extern int _getopt_internal (int __argc, char *const *__argv, + const char *__shortopts, + const struct option *__longopts, int *__longind, + int __long_only); +# endif #else /* not __STDC__ */ extern int getopt (); +# ifndef __need_getopt extern int getopt_long (); extern int getopt_long_only (); extern int _getopt_internal (); +# endif #endif /* __STDC__ */ #ifdef __cplusplus } #endif +/* Make sure we later can get all the definitions and declarations. */ +#undef __need_getopt + #endif /* getopt.h */ diff --git a/gnu/usr.bin/texinfo/lib/getopt1.c b/gnu/usr.bin/texinfo/lib/getopt1.c index ff257374c33..9c8256567c4 100644 --- a/gnu/usr.bin/texinfo/lib/getopt1.c +++ b/gnu/usr.bin/texinfo/lib/getopt1.c @@ -1,7 +1,6 @@ /* getopt_long and getopt_long_only entry points for GNU getopt. Copyright (C) 1987,88,89,90,91,92,93,94,96,97,98 Free Software Foundation, Inc. - NOTE: The canonical source of this file is maintained with the GNU C Library. Bugs can be reported to bug-glibc@gnu.org. @@ -16,16 +15,12 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, - USA. */ + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #ifdef HAVE_CONFIG_H #include <config.h> -#endif - -#include "getopt.h" - +#else #if !defined __STDC__ || !__STDC__ /* This is a separate conditional since some stdc systems reject `defined (const)'. */ @@ -33,6 +28,9 @@ #define const #endif #endif +#endif + +#include "getopt.h" #include <stdio.h> diff --git a/gnu/usr.bin/texinfo/lib/memcpy.c b/gnu/usr.bin/texinfo/lib/memcpy.c index 521625464cd..b26d6a4fa89 100644 --- a/gnu/usr.bin/texinfo/lib/memcpy.c +++ b/gnu/usr.bin/texinfo/lib/memcpy.c @@ -1,11 +1,29 @@ +/* Copyright (C) 1995, 1997 Free Software Foundation, Inc. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + +/* Written by Jim Meyering <meyering@na-net.ornl.gov>. */ + +#if HAVE_CONFIG_H +# include <config.h> +#endif + /* Copy LEN bytes starting at SRCADDR to DESTADDR. Result undefined if the source overlaps with the destination. Return DESTADDR. */ -#ifdef HAVE_CONFIG_H -#include <config.h> -#endif - char * memcpy (destaddr, srcaddr, len) char *destaddr; diff --git a/gnu/usr.bin/texinfo/lib/memmove.c b/gnu/usr.bin/texinfo/lib/memmove.c index d7bdd7cd995..ea38e8df549 100644 --- a/gnu/usr.bin/texinfo/lib/memmove.c +++ b/gnu/usr.bin/texinfo/lib/memmove.c @@ -3,22 +3,26 @@ In the public domain. By David MacKenzie <djm@gnu.ai.mit.edu>. */ -#ifdef HAVE_CONFIG_H -#include <config.h> +#if HAVE_CONFIG_H +# include <config.h> #endif -void +void * memmove (dest, source, length) char *dest; const char *source; unsigned length; { + char *d0 = dest; if (source < dest) /* Moving from low mem to hi mem; start at end. */ for (source += length, dest += length; length; --length) *--dest = *--source; else if (source != dest) - /* Moving from hi mem to low mem; start at beginning. */ - for (; length; --length) - *dest++ = *source++; + { + /* Moving from hi mem to low mem; start at beginning. */ + for (; length; --length) + *dest++ = *source++; + } + return (void *) d0; } diff --git a/gnu/usr.bin/texinfo/lib/strcasecmp.c b/gnu/usr.bin/texinfo/lib/strcasecmp.c index 366bcf2e9c2..ae7601de0fc 100644 --- a/gnu/usr.bin/texinfo/lib/strcasecmp.c +++ b/gnu/usr.bin/texinfo/lib/strcasecmp.c @@ -1,47 +1,64 @@ -/* Copyright (C) 1991, 1992 Free Software Foundation, Inc. +/* strcasecmp.c -- case insensitive string comparator + Copyright (C) 1998, 1999 Free Software Foundation, Inc. -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2, or (at your option) + any later version. -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H +#if HAVE_CONFIG_H # include <config.h> #endif -#include <string.h> +#ifdef LENGTH_LIMIT +# define STRXCASECMP_FUNCTION strncasecmp +# define STRXCASECMP_DECLARE_N , size_t n +# define LENGTH_LIMIT_EXPR(Expr) Expr +#else +# define STRXCASECMP_FUNCTION strcasecmp +# define STRXCASECMP_DECLARE_N /* empty */ +# define LENGTH_LIMIT_EXPR(Expr) 0 +#endif + +#include <sys/types.h> #include <ctype.h> -/* Compare S1 and S2, ignoring case, returning less than, equal to or - greater than zero if S1 is lexiographically less than, - equal to or greater than S2. */ +#define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) + +/* Compare {{no more than N characters of }}strings S1 and S2, + ignoring case, returning less than, equal to or + greater than zero if S1 is lexicographically less + than, equal to or greater than S2. */ + int -strcasecmp (s1, s2) - const char *s1; - const char *s2; +STRXCASECMP_FUNCTION (const char *s1, const char *s2 STRXCASECMP_DECLARE_N) { register const unsigned char *p1 = (const unsigned char *) s1; register const unsigned char *p2 = (const unsigned char *) s2; unsigned char c1, c2; - if (p1 == p2) + if (p1 == p2 || LENGTH_LIMIT_EXPR (n == 0)) return 0; do { - c1 = tolower (*p1++); - c2 = tolower (*p2++); - if (c1 == '\0') + c1 = TOLOWER (*p1); + c2 = TOLOWER (*p2); + + if (LENGTH_LIMIT_EXPR (--n == 0) || c1 == '\0') break; + + ++p1; + ++p2; } while (c1 == c2); diff --git a/gnu/usr.bin/texinfo/lib/strdup.c b/gnu/usr.bin/texinfo/lib/strdup.c index 1d60f13948a..c0b05e2d150 100644 --- a/gnu/usr.bin/texinfo/lib/strdup.c +++ b/gnu/usr.bin/texinfo/lib/strdup.c @@ -1,5 +1,5 @@ /* strdup.c -- return a newly allocated copy of a string - Copyright (C) 1990 Free Software Foundation, Inc. + Copyright (C) 1990, 1998 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 @@ -12,16 +12,16 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ + along with this program; if not, write to the Free Software Foundation, + Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -#ifdef HAVE_CONFIG_H -#include <config.h> +#if HAVE_CONFIG_H +# include <config.h> #endif #ifdef STDC_HEADERS -#include <string.h> -#include <stdlib.h> +# include <string.h> +# include <stdlib.h> #else char *malloc (); char *strcpy (); @@ -31,8 +31,7 @@ char *strcpy (); or 0 if out of memory. */ char * -strdup (str) - const char *str; +strdup (const char *str) { char *newstr; diff --git a/gnu/usr.bin/texinfo/lib/strncasecmp.c b/gnu/usr.bin/texinfo/lib/strncasecmp.c index 2476fad55ee..68d95aacc0f 100644 --- a/gnu/usr.bin/texinfo/lib/strncasecmp.c +++ b/gnu/usr.bin/texinfo/lib/strncasecmp.c @@ -1,48 +1,2 @@ -/* strncase.c -- compare at most N characters of two strings without - taking care for the case -Copyright (C) 1992 Free Software Foundation. - -This program is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ - -#include <string.h> -#include <ctype.h> - -/* Compare no more than N characters of S1 and S2, - ignoring case, returning less than, equal to or - greater than zero if S1 is lexicographically less - than, equal to or greater than S2. */ -int -strncasecmp (s1, s2, n) - const char *s1; - const char *s2; - size_t n; -{ - register const unsigned char *p1 = (const unsigned char *) s1; - register const unsigned char *p2 = (const unsigned char *) s2; - unsigned char c1, c2; - - if (p1 == p2 || n == 0) - return 0; - - do - { - c1 = tolower (*p1++); - c2 = tolower (*p2++); - if (c1 == '\0' || c1 != c2) - return c1 - c2; - } while (--n > 0); - - return c1 - c2; -} +#define LENGTH_LIMIT +#include "strcasecmp.c" diff --git a/gnu/usr.bin/texinfo/lib/xstrdup.c b/gnu/usr.bin/texinfo/lib/xstrdup.c index d5bcaf38091..38674cab18b 100644 --- a/gnu/usr.bin/texinfo/lib/xstrdup.c +++ b/gnu/usr.bin/texinfo/lib/xstrdup.c @@ -1,5 +1,5 @@ /* xstrdup.c -- copy a string with out of memory checking - Copyright (C) 1990, 1996 Free Software Foundation, Inc. + Copyright (C) 1990, 1996, 1998 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 @@ -19,24 +19,28 @@ # include <config.h> #endif -#if defined(STDC_HEADERS) || defined(HAVE_STRING_H) +#ifndef PARAMS +# if defined PROTOTYPES || (defined __STDC__ && __STDC__) +# define PARAMS(Args) Args +# else +# define PARAMS(Args) () +# endif +#endif + +#if STDC_HEADERS || HAVE_STRING_H # include <string.h> #else # include <strings.h> #endif -#if defined (__STDC__) && __STDC__ -char *xmalloc (size_t); -char *xstrdup (char *string); -#else -char *xmalloc (); -#endif +#include <sys/types.h> + +char *xmalloc PARAMS ((size_t n)); /* Return a newly allocated copy of STRING. */ char * -xstrdup (string) - char *string; +xstrdup (const char *string) { return strcpy (xmalloc (strlen (string) + 1), string); } diff --git a/gnu/usr.bin/texinfo/makeinfo/README b/gnu/usr.bin/texinfo/makeinfo/README index a6f97ebed4c..1b45f02c4b2 100644 --- a/gnu/usr.bin/texinfo/makeinfo/README +++ b/gnu/usr.bin/texinfo/makeinfo/README @@ -2,7 +2,7 @@ makeinfo is a standalone program to convert Texinfo source into Info files readable with standalone info or M-x info in Emacs. makeinfo can also output plain ASCII (with --no-headers) -or HTML (with --html). +or HTML (with --html) or XML (with --xml). The Emacs function M-x texinfo-format-buffer does more or less the same job, but makeinfo is faster and gives better error messages. diff --git a/gnu/usr.bin/texinfo/makeinfo/defun.c b/gnu/usr.bin/texinfo/makeinfo/defun.c index e9078c655f7..cf0e82384f4 100644 --- a/gnu/usr.bin/texinfo/makeinfo/defun.c +++ b/gnu/usr.bin/texinfo/makeinfo/defun.c @@ -1,7 +1,7 @@ /* defun.c -- @defun and friends. - $Id: defun.c,v 1.1.1.1 2000/02/09 01:25:10 espie Exp $ + $Id: defun.c,v 1.1.1.2 2002/06/10 13:21:15 espie Exp $ - Copyright (C) 1998, 99 Free Software Foundation, Inc. + Copyright (C) 1998, 99, 2000, 01, 02 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 @@ -19,6 +19,7 @@ #include "system.h" #include "defun.h" +#include "docbook.h" #include "insertion.h" #include "makeinfo.h" @@ -65,6 +66,7 @@ scan_group_in_string (string_pointer) { char *scan_string = (*string_pointer) + 1; unsigned int level = 1; + int started_command = 0; for (;;) { @@ -79,17 +81,20 @@ scan_group_in_string (string_pointer) { /* Tweak line_number to compensate for fact that we gobbled the whole line before coming here. */ - line_number -= 1; + line_number--; line_error (_("Missing `}' in @def arg")); - line_number += 1; + line_number++; *string_pointer = scan_string - 1; return 0; } - if (c == '{') - level += 1; - if (c == '}') - level -= 1; + if (c == '{' && !started_command) + level++; + if (c == '}' && !started_command) + level--; + + /* remember if at @. */ + started_command = (c == '@' && !started_command); } } @@ -395,9 +400,9 @@ defun_internal (type, x_p) type_name = next_nonwhite_defun_arg (&scan_args); /* The type name for typed languages. */ - if (base_type == deftypemethod - || base_type == deftypeivar - || base_type == deftypeop + if ((base_type == deftypemethod) + || (base_type == deftypeivar) + || (base_type == deftypeop) ) type_name2 = next_nonwhite_defun_arg (&scan_args); @@ -422,6 +427,13 @@ defun_internal (type, x_p) defined_name = tem; } + /* It's easy to write @defun foo(arg1 arg2), but a following ( is + misparsed by texinfo.tex and this is next to impossible to fix. + Warn about it. */ + if (*scan_args && **scan_args && **scan_args == '(') + warning ("`%c' follows defined name `%s' instead of whitespace", + **scan_args, defined_name); + if (!x_p) begin_insertion (type); @@ -430,11 +442,15 @@ defun_internal (type, x_p) current_indent -= default_indentation_increment; start_paragraph (); - if (html && !x_p) + if (!x_p) { /* Start the definition on new paragraph. */ - add_word ("<p>\n"); + if (html) + add_word ("<p>\n"); + if (docbook) + docbook_begin_paragraph (); + } - if (!html) + if (!html && !docbook) switch (base_type) { case deffn: @@ -473,13 +489,16 @@ defun_internal (type, x_p) /* If this is not a @def...x version, it could only be a normal version @def.... So start the table here. */ if (!x_p) - add_word ("<table width=\"100%\">\n"); + { + add_html_elt ("<table width="); + add_word ("\"100%\">\n"); + } /* If this is an @def...x there has to be an other @def... before it, so this is only a new row within an existing table. With two complete standalone tables the gap between them is too big. */ add_word ("<tr>\n"); - add_word ("<td align=\"left\">"); + add_html_elt ("<td align=\"left\">"); switch (base_type) { @@ -487,24 +506,61 @@ defun_internal (type, x_p) case defvr: case deftp: /* <i> is for the following function arguments. */ - add_word_args ("<b>%s</b><i>", defined_name); + add_word ("<b>"); + execute_string ("%s", defined_name); + add_word ("</b><i>"); break; case deftypefn: case deftypevr: - add_word_args ("%s <b>%s</b><i>", type_name, defined_name); + execute_string ("%s ", type_name); + add_word ("<b>"); + execute_string ("%s", defined_name); + add_word ("</b><i>"); break; case defcv: case defop: - add_word_args ("<b>%s</b><i>", defined_name); + add_word ("<b>"); + execute_string ("%s", defined_name); + add_word ("</b><i>"); break; case deftypemethod: case deftypeop: case deftypeivar: - add_word_args ("%s <b>%s</b><i>", type_name2, defined_name); + execute_string ("%s ", type_name2); + add_word ("<b>"); + execute_string ("%s", defined_name); + add_word ("</b><i>"); break; } } /* if (html)... */ + if (docbook) + { + switch (base_type) + { + case deffn: + case defvr: + case deftp: + case defcv: + case defop: + add_word_args ("<%s>%s</%s>", DB_FUNCTION, defined_name, + DB_FUNCTION); + break; + case deftypefn: + case deftypevr: + add_word_args ("%s <%s>%s</%s>", type_name, DB_FUNCTION, + defined_name, DB_FUNCTION); + break; + case deftypemethod: + case deftypeop: + case deftypeivar: + add_word_args ("%s <%s>%s</%s>", type_name2, DB_FUNCTION, + defined_name, DB_FUNCTION); + break; + } + + } /* if (docbook)... */ + current_indent += default_indentation_increment; /* Now process the function arguments, if any. If these carry onto @@ -548,32 +604,37 @@ defun_internal (type, x_p) case deftypevr: add_word ("</i>"); /* close italic area for arguments */ /* put the rest into the second column */ - add_word_args ("</td>\n<td align=\"right\">%s", category); + add_word ("</td>\n"); + add_html_elt ("<td align=\"right\">"); + execute_string ("%s", category); break; - - case defcv: - add_word ("</td>\n<td align=\"right\">"); - add_word_args ("%s %s %s", category, _("of"), type_name); - break; - - case defop: - case deftypemethod: - case deftypeop: - add_word ("</i>"); - add_word ("</td>\n<td align=\"right\">"); - add_word_args ("%s %s %s", category, _("on"), type_name); - break; - - case deftypeivar: - add_word ("</i>"); - add_word ("</td>\n<td align=\"right\">"); - add_word_args ("%s %s %s", category, _("of"), type_name); - break; - } /* switch (base_type)... */ - + + case defcv: + add_word ("</td>\n"); + add_html_elt ("<td align=\"right\">"); + execute_string ("%s %s %s", category, _("of"), type_name); + break; + + case defop: + case deftypemethod: + case deftypeop: + add_word ("</i>"); + add_word ("</td>\n"); + add_html_elt ("<td align=\"right\">"); + execute_string ("%s %s %s", category, _("on"), type_name); + break; + + case deftypeivar: + add_word ("</i>"); + add_word ("</td>\n"); + add_html_elt ("<td align=\"right\">"); + execute_string ("%s %s %s", category, _("of"), type_name); + break; + } /* switch (base_type)... */ + add_word ("</td>\n"); /* close second column */ add_word ("</tr>\n"); /* close row */ - + /* This is needed because I have to know if the next line is normal text or another @def..x. If text follows, create a new table to get the indentation for the following text. @@ -588,10 +649,10 @@ defun_internal (type, x_p) if (!looking_at ("@def")) { add_word ("</table>\n"); - add_word ("<table width=\"95%\" align=\"center\">\n"); - add_word ("<tr><td>\n"); + add_html_elt ("<table width=\"95%\" align=\"center\">"); + add_word ("\n<tr><td>\n"); } - + } /* if (html)... */ /* Make an entry in the appropriate index. */ diff --git a/gnu/usr.bin/texinfo/makeinfo/files.c b/gnu/usr.bin/texinfo/makeinfo/files.c index 6f2dcb2b8d6..ccd0f0b0ec0 100644 --- a/gnu/usr.bin/texinfo/makeinfo/files.c +++ b/gnu/usr.bin/texinfo/makeinfo/files.c @@ -1,7 +1,7 @@ -/* files.c -- file-related functions for Texinfo. - $Id: files.c,v 1.1.1.1 2000/02/09 01:25:11 espie Exp $ +/* files.c -- file-related functions for makeinfo. + $Id: files.c,v 1.1.1.2 2002/06/10 13:21:15 espie Exp $ - Copyright (C) 1998, 99 Free Software Foundation, Inc. + Copyright (C) 1998, 99, 2000, 01, 02 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 @@ -139,9 +139,7 @@ find_and_load (filename) long file_size; int file = -1, count = 0; char *fullpath, *result; -#if O_BINARY || defined (VMS) - int n; -#endif + int n, bytes_to_read; result = fullpath = NULL; @@ -163,28 +161,18 @@ find_and_load (filename) /* VMS stat lies about the st_size value. The actual number of readable bytes is always less than this value. The arcane mysteries of VMS/RMS are too much to probe, so this hack - suffices to make things work. */ -#if O_BINARY || defined (VMS) -#ifdef VMS - while ((n = read (file, result + count, file_size)) > 0) -#else /* !VMS */ -#ifndef WIN32 - while ((n = read (file, result + count, file_size)) > 0) -#else /* WIN32 */ - /* Does WIN32 really need reading 1 character at a time?? */ - while ((n = read (file, result + count, 1)) > 0) -#endif /* WIN32 */ -#endif /* !VMS */ - count += n; + suffices to make things work. It's also needed on Cygwin. And so + we might as well use it everywhere. */ + bytes_to_read = file_size; + while ((n = read (file, result + count, bytes_to_read)) > 0) + { + count += n; + bytes_to_read -= n; + } if (0 < count && count < file_size) result = xrealloc (result, count + 2); /* why waste the slack? */ else if (n == -1) -#else /* !VMS && !O_BINARY */ - count = file_size; - if (read (file, result, file_size) != file_size) -#endif /* !VMS && !WIN32 */ - - error_exit: +error_exit: { if (result) free (result); @@ -527,3 +515,62 @@ output_name_from_input_name (name) { return expand_filename (NULL, name); } + + +/* Modify the file name FNAME so that it fits the limitations of the + underlying filesystem. In particular, truncate the file name as it + would be truncated by the filesystem. We assume the result can + never be longer than the original, otherwise we couldn't be sure we + have enough space in the original string to modify it in place. */ +char * +normalize_filename (fname) + char *fname; +{ + int maxlen; + char orig[PATH_MAX + 1]; + int i; + char *lastdot, *p; + +#ifdef _PC_NAME_MAX + maxlen = pathconf (fname, _PC_NAME_MAX); + if (maxlen < 1) +#endif + maxlen = PATH_MAX; + + i = skip_directory_part (fname); + if (fname[i] == '\0') + return fname; /* only a directory name -- don't modify */ + strcpy (orig, fname + i); + + switch (maxlen) + { + case 12: /* MS-DOS 8+3 filesystem */ + if (orig[0] == '.') /* leading dots are not allowed */ + orig[0] = '_'; + lastdot = strrchr (orig, '.'); + if (!lastdot) + lastdot = orig + strlen (orig); + strncpy (fname + i, orig, lastdot - orig); + for (p = fname + i; + p < fname + i + (lastdot - orig) && p < fname + i + 8; + p++) + if (*p == '.') + *p = '_'; + *p = '\0'; + if (*lastdot == '.') + strncat (fname + i, lastdot, 4); + break; + case 14: /* old Unix systems with 14-char limitation */ + strcpy (fname + i, orig); + if (strlen (fname + i) > 14) + fname[i + 14] = '\0'; + break; + default: + strcpy (fname + i, orig); + if (strlen (fname) > maxlen - 1) + fname[maxlen - 1] = '\0'; + break; + } + + return fname; +} diff --git a/gnu/usr.bin/texinfo/makeinfo/files.h b/gnu/usr.bin/texinfo/makeinfo/files.h index 6cae9e543e4..46ea8da4989 100644 --- a/gnu/usr.bin/texinfo/makeinfo/files.h +++ b/gnu/usr.bin/texinfo/makeinfo/files.h @@ -1,7 +1,7 @@ /* files.h -- declarations for files.c. - $Id: files.h,v 1.1.1.1 2000/02/09 01:25:11 espie Exp $ + $Id: files.h,v 1.1.1.2 2002/06/10 13:21:15 espie Exp $ - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -41,5 +41,6 @@ extern char *output_name_from_input_name (); extern char *expand_filename (); extern char *filename_part (); extern char *pathname_part (); +extern char *normalize_filename (); #endif /* !FILES_H */ diff --git a/gnu/usr.bin/texinfo/makeinfo/footnote.c b/gnu/usr.bin/texinfo/makeinfo/footnote.c index 79a52e6996b..d88c3d95800 100644 --- a/gnu/usr.bin/texinfo/makeinfo/footnote.c +++ b/gnu/usr.bin/texinfo/makeinfo/footnote.c @@ -1,7 +1,7 @@ /* footnote.c -- footnotes for Texinfo. - $Id: footnote.c,v 1.1.1.1 2000/02/09 01:25:11 espie Exp $ + $Id: footnote.c,v 1.1.1.2 2002/06/10 13:21:16 espie Exp $ - Copyright (C) 1998, 99 Free Software Foundation, Inc. + Copyright (C) 1998, 99, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,6 +21,7 @@ #include "footnote.h" #include "macro.h" #include "makeinfo.h" +#include "xml.h" /* Nonzero means that the footnote style for this document was set on the command line, which overrides any other settings. */ @@ -200,6 +201,18 @@ cm_footnote () return; } + /* output_pending_notes is non-reentrant (it uses a global data + structure pending_notes, which it frees before it returns), and + TeX doesn't grok footnotes inside footnotes anyway. Disallow + that. */ + if (already_outputting_pending_notes) + { + line_error (_("Footnotes inside footnotes are not allowed")); + free (marker); + free (note); + return; + } + if (!*marker) { free (marker); @@ -213,14 +226,21 @@ cm_footnote () marker = xstrdup ("*"); } + if (xml) + xml_insert_footnote (note); + else + { remember_note (marker, note); /* fixme: html: footnote processing needs work; we currently ignore the style requested; we could clash with a node name of the form `fn-<n>', though that's unlikely. */ if (html) - add_word_args ("<a rel=footnote href=\"#fn-%d\"><sup>%s</sup></a>", - current_footnote_number, marker); + { + add_html_elt ("<a rel=footnote href="); + add_word_args ("\"#fn-%d\"><sup>%s</sup></a>", + current_footnote_number, marker); + } else /* Your method should at least insert MARKER. */ switch (footnote_style) @@ -255,7 +275,7 @@ cm_footnote () break; } current_footnote_number++; - + } free (marker); free (note); } @@ -328,7 +348,9 @@ output_pending_notes () /* Make the text of every footnote begin a separate paragraph. */ add_word_args ("<li><a name=\"fn-%d\"></a>\n<p>", footnote->number); + already_outputting_pending_notes++; execute_string ("%s", footnote->note); + already_outputting_pending_notes--; add_word ("</p>\n"); } else diff --git a/gnu/usr.bin/texinfo/makeinfo/html.h b/gnu/usr.bin/texinfo/makeinfo/html.h index 54305b82082..49aec6f9b83 100644 --- a/gnu/usr.bin/texinfo/makeinfo/html.h +++ b/gnu/usr.bin/texinfo/makeinfo/html.h @@ -1,7 +1,7 @@ /* html.h -- declarations for html-related utilities. - $Id: html.h,v 1.1.1.1 2000/02/09 01:25:11 espie Exp $ + $Id: html.h,v 1.1.1.2 2002/06/10 13:21:16 espie Exp $ - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 02 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 @@ -40,5 +40,8 @@ extern void add_escaped_anchor_name (/* char *name */); /* See html.c. */ extern void add_anchor_name (/* nodename, href */); +extern void add_url_name ( /* nodename, href */ ); +extern char* nodename_to_filename ( /* nodename */ ); +extern void add_nodename_to_filename ( /*nodename, href */ ); #endif /* !HTML_H */ diff --git a/gnu/usr.bin/texinfo/makeinfo/index.c b/gnu/usr.bin/texinfo/makeinfo/index.c index 72442efa1ef..cb3ac3b6177 100644 --- a/gnu/usr.bin/texinfo/makeinfo/index.c +++ b/gnu/usr.bin/texinfo/makeinfo/index.c @@ -1,7 +1,7 @@ /* index.c -- indexing for Texinfo. - $Id: index.c,v 1.1.1.1 2000/02/09 01:25:16 espie Exp $ + $Id: index.c,v 1.1.1.2 2002/06/10 13:21:16 espie Exp $ - Copyright (C) 1998, 99 Free Software Foundation, Inc. + Copyright (C) 1998, 99, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,6 +22,7 @@ #include "lang.h" #include "macro.h" #include "toc.h" +#include "xml.h" /* An index element... */ typedef struct index_elt @@ -226,7 +227,20 @@ index_add_arg (name) (see the findexerr test). */ new->defining_file = xstrdup (input_filename); the_indices[which] = new; +#if 0 + /* The index breaks if there are colons in the entry. + -- This is true, but it's too painful to force changing index + entries to use `colon', and too confusing for users. The real + fix is to change Info support to support arbitrary characters + in node names, and we're not ready to do that. --karl, + 19mar02. */ + if (strchr (new->entry_text, ':')) + warning (_("Info cannot handle `:' in index entry `%s'"), + new->entry_text); +#endif } + if (xml) + xml_insert_indexterm (index_entry, name); } /* The function which user defined index commands call. */ @@ -583,7 +597,7 @@ sort_index (index) /* If this particular entry should be printed as a "code" index, then expand it as @code{entry}, i.e. as in fixed-width font. */ array[count-1]->entry = expansion (temp->entry_text, - array[count-1]->code); + array[count-1]->code); temp = temp->next; } @@ -621,203 +635,225 @@ int printing_index = 0; void cm_printindex () { - int item; - INDEX_ELT *index; - INDEX_ELT *last_index = 0; - INDEX_ELT **array; - char *index_name; - unsigned line_length; - char *line; - int saved_inhibit_paragraph_indentation = inhibit_paragraph_indentation; - int saved_filling_enabled = filling_enabled; - int saved_line_number = line_number; - char *saved_input_filename = input_filename; - - close_paragraph (); - get_rest_of_line (0, &index_name); - - index = index_list (index_name); - if (index == (INDEX_ELT *)-1) + if (xml && !docbook) { - line_error (_("Unknown index `%s' in @printindex"), index_name); - free (index_name); - return; + char *index_name; + get_rest_of_line (0, &index_name); + xml_insert_element (PRINTINDEX, START); + insert_string (index_name); + xml_insert_element (PRINTINDEX, END); } - - /* Do this before sorting, so execute_string in index_element_compare - will give the same results as when we actually print. */ - printing_index = 1; - filling_enabled = 0; - inhibit_paragraph_indentation = 1; - array = sort_index (index); - - close_paragraph (); - if (html) - add_word ("<ul compact>"); - else if (!no_headers) - add_word ("* Menu:\n\n"); - - me_inhibit_expansion++; - - /* This will probably be enough. */ - line_length = 100; - line = xmalloc (line_length); - - for (item = 0; (index = array[item]); item++) + else { - /* A pathological document might have an index entry outside of any - node. Don't crash; try using the section name instead. */ - char *index_node = index->node; - - line_number = index->defining_line; - input_filename = index->defining_file; - - if ((!index_node || !*index_node) && html) - index_node = toc_find_section_of_node (index_node); - - if (!index_node || !*index_node) + int item; + INDEX_ELT *index; + INDEX_ELT *last_index = 0; + INDEX_ELT **array; + char *index_name; + unsigned line_length; + char *line; + int saved_inhibit_paragraph_indentation = inhibit_paragraph_indentation; + int saved_filling_enabled = filling_enabled; + int saved_line_number = line_number; + char *saved_input_filename = input_filename; + + close_paragraph (); + get_rest_of_line (0, &index_name); + + index = index_list (index_name); + if (index == (INDEX_ELT *)-1) { - line_error (_("Entry for index `%s' outside of any node"), - index_name); - if (html || !no_headers) - index_node = _("(outside of any node)"); + line_error (_("Unknown index `%s' in @printindex"), index_name); + free (index_name); + return; } - + + /* Do this before sorting, so execute_string is in the good environment */ + if (xml && docbook) + xml_begin_index (); + + /* Do this before sorting, so execute_string in index_element_compare + will give the same results as when we actually print. */ + printing_index = 1; + filling_enabled = 0; + inhibit_paragraph_indentation = 1; + xml_sort_index = 1; + array = sort_index (index); + xml_sort_index = 0; + close_paragraph (); if (html) - /* fixme: html: we should use specific index anchors pointing + add_word ("<ul compact>"); + else if (!no_headers && !docbook) + add_word ("* Menu:\n\n"); + + me_inhibit_expansion++; + + /* This will probably be enough. */ + line_length = 100; + line = xmalloc (line_length); + + for (item = 0; (index = array[item]); item++) + { + /* A pathological document might have an index entry outside of any + node. Don't crash; try using the section name instead. */ + char *index_node = index->node; + + line_number = index->defining_line; + input_filename = index->defining_file; + + if ((!index_node || !*index_node) && html) + index_node = toc_find_section_of_node (index_node); + + if (!index_node || !*index_node) + { + line_error (_("Entry for index `%s' outside of any node"), + index_name); + if (html || !no_headers) + index_node = _("(outside of any node)"); + } + + if (html) + /* fixme: html: we should use specific index anchors pointing to the actual location of the indexed position (but then we have to find something to wrap the anchor around). */ - { - if (last_index - && STREQ (last_index->entry_text, index->entry_text)) - add_word (", "); /* Don't repeat the previous entry. */ - else - { - /* In the HTML case, the expanded index entry is not - good for us, since it was expanded for non-HTML mode - inside sort_index. So we need to HTML-escape and - expand the original entry text here. */ - char *escaped_entry = xstrdup (index->entry_text); - char *expanded_entry; - - /* expansion() doesn't HTML-escape the argument, so need - to do it separately. */ - escaped_entry = escape_string (escaped_entry); - expanded_entry = expansion (escaped_entry, index->code); - add_word_args ("\n<li>%s: ", expanded_entry); - free (escaped_entry); - free (expanded_entry); - } - add_word ("<a href=\""); - if (index->node && *index->node) { - /* Make sure any non-macros in the node name are expanded. */ - in_fixed_width_font++; - index_node = expansion (index_node, 0); - in_fixed_width_font--; - add_anchor_name (index_node, 1); - add_word_args ("\">%s</a>", index_node); - free (index_node); + if (last_index + && STREQ (last_index->entry_text, index->entry_text)) + add_word (", "); /* Don't repeat the previous entry. */ + else + { + /* In the HTML case, the expanded index entry is not + good for us, since it was expanded for non-HTML mode + inside sort_index. So we need to HTML-escape and + expand the original entry text here. */ + char *escaped_entry = xstrdup (index->entry_text); + char *expanded_entry; + + /* expansion() doesn't HTML-escape the argument, so need + to do it separately. */ + escaped_entry = escape_string (escaped_entry); + expanded_entry = expansion (escaped_entry, index->code); + add_word_args ("\n<li>%s: ", expanded_entry); + free (escaped_entry); + free (expanded_entry); + } + add_word ("<a href=\""); + if (index->node && *index->node) + { + /* Make sure any non-macros in the node name are expanded. */ + in_fixed_width_font++; + index_node = expansion (index_node, 0); + in_fixed_width_font--; + add_anchor_name (index_node, 1); + add_word_args ("\">%s</a>", index_node); + free (index_node); + } + else if (STREQ (index_node, _("(outside of any node)"))) + { + add_anchor_name (index_node, 1); + add_word_args ("\">%s</a>", index_node); + } + else + /* If we use the section instead of the (missing) node, then + index_node already includes all we need except the #. */ + add_word_args ("#%s</a>", index_node); } - else if (STREQ (index_node, _("(outside of any node)"))) + else if (xml && docbook) { - add_anchor_name (index_node, 1); - add_word_args ("\">%s</a>", index_node); + xml_insert_indexentry (index->entry, index_node); } else - /* If we use the section instead of the (missing) node, then - index_node already includes all we need except the #. */ - add_word_args ("#%s</a>", index_node); - } - else - { - unsigned new_length = strlen (index->entry); - - if (new_length < 50) /* minimum length used below */ - new_length = 50; - new_length += strlen (index_node) + 7; /* * : .\n\0 */ - - if (new_length > line_length) - { - line_length = new_length; - line = xrealloc (line, line_length); - } - /* Print the entry, nicely formatted. We've already - expanded any commands in index->entry, including any - implicit @code. Thus, can't call execute_string, since - @@ has turned into @. */ - if (!no_headers) - { - sprintf (line, "* %-37s ", index->entry); - line[2 + strlen (index->entry)] = ':'; - insert_string (line); - /* Make sure any non-macros in the node name are expanded. */ - in_fixed_width_font++; - execute_string ("%s.\n", index_node); - in_fixed_width_font--; - } - else - { - /* With --no-headers, the @node lines are gone, so - there's little sense in referring to them in the - index. Instead, output the number or name of the - section that corresponds to that node. */ - char *section_name = toc_find_section_of_node (index_node); - - sprintf (line, "%-*s ", number_sections ? 50 : 1, index->entry); - line[strlen (index->entry)] = ':'; - insert_string (line); - if (section_name) - { - int idx = 0; - unsigned ref_len = strlen (section_name) + 30; - - if (ref_len > line_length) - { - line_length = ref_len; - line = xrealloc (line, line_length); - } - - if (number_sections) - { - while (section_name[idx] - && (isdigit (section_name[idx]) - || (idx && section_name[idx] == '.'))) - idx++; - } - if (idx) - sprintf (line, " See %.*s.\n", idx, section_name); - else - sprintf (line, "\n See ``%s''.\n", section_name); + { + unsigned new_length = strlen (index->entry); + + if (new_length < 50) /* minimum length used below */ + new_length = 50; + new_length += strlen (index_node) + 7; /* * : .\n\0 */ + + if (new_length > line_length) + { + line_length = new_length; + line = xrealloc (line, line_length); + } + /* Print the entry, nicely formatted. We've already + expanded any commands in index->entry, including any + implicit @code. Thus, can't call execute_string, since + @@ has turned into @. */ + if (!no_headers) + { + sprintf (line, "* %-37s ", index->entry); + line[2 + strlen (index->entry)] = ':'; insert_string (line); - } - else + /* Make sure any non-macros in the node name are expanded. */ + in_fixed_width_font++; + execute_string ("%s.\n", index_node); + in_fixed_width_font--; + } + else { - insert_string (" "); /* force a blank */ - execute_string ("See node %s.\n", index_node); + /* With --no-headers, the @node lines are gone, so + there's little sense in referring to them in the + index. Instead, output the number or name of the + section that corresponds to that node. */ + char *section_name = toc_find_section_of_node (index_node); + + sprintf (line, "%-*s ", number_sections ? 50 : 1, index->entry); + line[strlen (index->entry)] = ':'; + insert_string (line); + if (section_name) + { + int idx = 0; + unsigned ref_len = strlen (section_name) + 30; + + if (ref_len > line_length) + { + line_length = ref_len; + line = xrealloc (line, line_length); + } + + if (number_sections) + { + while (section_name[idx] + && (isdigit (section_name[idx]) + || (idx && section_name[idx] == '.'))) + idx++; + } + if (idx) + sprintf (line, " See %.*s.\n", idx, section_name); + else + sprintf (line, "\n See ``%s''.\n", section_name); + insert_string (line); + } + else + { + insert_string (" "); /* force a blank */ + execute_string ("See node %s.\n", index_node); + } } - } - } + } + + /* Prevent `output_paragraph' from growing to the size of the + whole index. */ + flush_output (); + last_index = index; + } - /* Prevent `output_paragraph' from growing to the size of the - whole index. */ - flush_output (); - last_index = index; + free (line); + free (index_name); + + me_inhibit_expansion--; + + printing_index = 0; + free (array); + close_single_paragraph (); + filling_enabled = saved_filling_enabled; + inhibit_paragraph_indentation = saved_inhibit_paragraph_indentation; + input_filename = saved_input_filename; + line_number = saved_line_number; + + if (html) + add_word ("</ul>"); + else if (xml && docbook) + xml_end_index (); } - - free (line); - free (index_name); - - me_inhibit_expansion--; - - printing_index = 0; - free (array); - close_single_paragraph (); - filling_enabled = saved_filling_enabled; - inhibit_paragraph_indentation = saved_inhibit_paragraph_indentation; - input_filename = saved_input_filename; - line_number = saved_line_number; - - if (html) - add_word ("</ul>"); } diff --git a/gnu/usr.bin/texinfo/makeinfo/insertion.h b/gnu/usr.bin/texinfo/makeinfo/insertion.h index a926e71c839..3c83ed6f2b3 100644 --- a/gnu/usr.bin/texinfo/makeinfo/insertion.h +++ b/gnu/usr.bin/texinfo/makeinfo/insertion.h @@ -1,7 +1,7 @@ /* insertion.h -- declarations for insertion.c. - $Id: insertion.h,v 1.1.1.1 2000/02/09 01:25:20 espie Exp $ + $Id: insertion.h,v 1.1.1.2 2002/06/10 13:21:17 espie Exp $ - Copyright (C) 1998, 99 Free Software Foundation, Inc. + Copyright (C) 1998, 99, 2001, 02 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 @@ -22,15 +22,16 @@ /* Must match list in insertion.c. */ enum insertion_type -{ - cartouche, defcv, deffn, defivar, defmac, defmethod, defop, defopt, - defspec, deftp, deftypefn, deftypefun, deftypeivar, deftypemethod, - deftypeop, deftypevar, deftypevr, defun, defvar, defvr, detailmenu, - direntry, display, enumerate, example, flushleft, flushright, format, - ftable, group, ifclear, ifhtml, ifinfo, ifnothtml, ifnotinfo, - ifnottex, ifset, iftex, itemize, lisp, menu, multitable, quotation, +{ + cartouche, copying, defcv, deffn, defivar, defmac, defmethod, defop, + defopt, defspec, deftp, deftypefn, deftypefun, deftypeivar, + deftypemethod, deftypeop, deftypevar, deftypevr, defun, defvar, defvr, + detailmenu, direntry, display, documentdescription, enumerate, + example, flushleft, flushright, format, ftable, group, ifclear, + ifhtml, ifinfo, ifnothtml, ifnotinfo, ifnotplaintext, ifnottex, + ifplaintext, ifset, iftex, itemize, lisp, menu, multitable, quotation, rawhtml, rawtex, smalldisplay, smallexample, smallformat, smalllisp, - table, tex, vtable, bad_type + verbatim, table, tex, vtable, bad_type }; typedef struct istack_elt @@ -55,7 +56,8 @@ extern int had_menu_commentary; extern int in_paragraph; extern void command_name_condition (); -extern void cm_ifnothtml (), cm_ifhtml(), cm_html (); +extern void cm_ifhtml (), cm_ifnothtml(), cm_html (); extern void cm_ifinfo (), cm_ifnotinfo (); -extern void cm_ifnottex (), cm_iftex (), cm_tex (); +extern void cm_ifplaintext (), cm_ifnotplaintext(); +extern void cm_iftex (), cm_ifnottex (), cm_tex (); #endif /* !INSERTION_H */ diff --git a/gnu/usr.bin/texinfo/makeinfo/lang.c b/gnu/usr.bin/texinfo/makeinfo/lang.c index 44c84262669..53e570157e7 100644 --- a/gnu/usr.bin/texinfo/makeinfo/lang.c +++ b/gnu/usr.bin/texinfo/makeinfo/lang.c @@ -1,7 +1,7 @@ -/* lang.c -- language depend behaviour (startpoint) - $Id: lang.c,v 1.1.1.1 2000/02/09 01:25:20 espie Exp $ +/* lang.c -- language-dependent support. + $Id: lang.c,v 1.1.1.2 2002/06/10 13:21:17 espie Exp $ - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 01 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 @@ -17,20 +17,150 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - Written by Karl Heinz Marbaise <kama@hippo.fido.de>. */ + Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>. */ #include "system.h" #include "cmds.h" #include "lang.h" #include "makeinfo.h" +#include "xml.h" /* Current document encoding. */ -char *document_encoding = NULL; +encoding_code_type document_encoding_code = no_encoding; /* Current language code; default is English. */ language_code_type language_code = en; -language_struct language_table[] = { +/* Translation table between HTML and ISO Codes. The last item is + hopefully the Unicode. It might be possible that those Unicodes are + not correct, cause I didn't check them. kama */ +iso_map_type iso8859_1_map [] = { + { "nbsp", 0xA0, 0x00A0 }, + { "iexcl", 0xA1, 0x00A1 }, + { "cent", 0xA2, 0x00A2 }, + { "pound", 0xA3, 0x00A3 }, + { "curren", 0xA4, 0x00A4 }, + { "yen", 0xA5, 0x00A5 }, + { "brkbar", 0xA6, 0x00A6 }, + { "sect", 0xA7, 0x00A7 }, + { "uml", 0xA8, 0x00A8 }, + { "copy", 0xA9, 0x00A9 }, + { "ordf", 0xAA, 0x00AA }, + { "laquo", 0xAB, 0x00AB }, + { "not", 0xAC, 0x00AC }, + { "shy", 0xAD, 0x00AD }, + { "reg", 0xAE, 0x00AE }, + { "hibar", 0xAF, 0x00AF }, + { "deg", 0xB0, 0x00B0 }, + { "plusmn", 0xB1, 0x00B1 }, + { "sup2", 0xB2, 0x00B2 }, + { "sup3", 0xB3, 0x00B3 }, + { "acute", 0xB4, 0x00B4 }, + { "micro", 0xB5, 0x00B5 }, + { "para", 0xB6, 0x00B6 }, + { "middot", 0xB7, 0x00B7 }, + { "cedil", 0xB8, 0x00B8 }, + { "sup1", 0xB9, 0x00B9 }, + { "ordm", 0xBA, 0x00BA }, + { "raquo", 0xBB, 0x00BB }, + { "frac14", 0xBC, 0x00BC }, + { "frac12", 0xBD, 0x00BD }, + { "frac34", 0xBE, 0x00BE }, + { "iquest", 0xBF, 0x00BF }, + { "Agrave", 0xC0, 0x00C0 }, + { "Aacute", 0xC1, 0x00C1 }, + { "Acirc", 0xC2, 0x00C2 }, + { "Atilde", 0xC3, 0x00C3 }, + { "Auml", 0xC4, 0x00C4 }, + { "Aring", 0xC5, 0x00C5 }, + { "AElig", 0xC6, 0x00C6 }, + { "Ccedil", 0xC7, 0x00C7 }, + { "Ccedil", 0xC7, 0x00C7 }, + { "Egrave", 0xC8, 0x00C8 }, + { "Eacute", 0xC9, 0x00C9 }, + { "Ecirc", 0xCA, 0x00CA }, + { "Euml", 0xCB, 0x00CB }, + { "Igrave", 0xCC, 0x00CC }, + { "Iacute", 0xCD, 0x00CD }, + { "Icirc", 0xCE, 0x00CE }, + { "Iuml", 0xCF, 0x00CF }, + { "ETH", 0xD0, 0x00D0 }, /* I don't know ;-( */ + { "Ntilde", 0xD1, 0x00D1 }, + { "Ograve", 0xD2, 0x00D2 }, + { "Oacute", 0xD3, 0x00D3 }, + { "Ocirc", 0xD4, 0x00D4 }, + { "Otilde", 0xD5, 0x00D5 }, + { "Ouml", 0xD6, 0x00D6 }, + { "times", 0xD7, 0x00D7 }, + { "Oslash", 0xD8, 0x00D8 }, + { "Ugrave", 0xD9, 0x00D9 }, + { "Uacute", 0xDA, 0x00DA }, + { "Ucirc", 0xDB, 0x00DB }, + { "Uuml", 0xDC, 0x00DC }, + { "Yacute", 0xDD, 0x00DD }, + { "THORN", 0xDE, 0x00DE }, + { "szlig", 0xDF, 0x00DF }, + { "agrave", 0xE0, 0x00E0 }, + { "aacute", 0xE1, 0x00E1 }, + { "acirc", 0xE2, 0x00E2 }, + { "atilde", 0xE3, 0x00E3 }, + { "auml", 0xE4, 0x00E4 }, + { "aring", 0xE5, 0x00E5 }, + { "aelig", 0xE6, 0x00E6 }, + { "ccedil", 0xE7, 0x00E7 }, + { "egrave", 0xE8, 0x00E8 }, + { "eacute", 0xE9, 0x00E9 }, + { "ecirc", 0xEA, 0x00EA }, + { "euml", 0xEB, 0x00EB }, + { "igrave", 0xEC, 0x00EC }, + { "iacute", 0xED, 0x00ED }, + { "icirc", 0xEE, 0x00EE }, + { "iuml", 0xEF, 0x00EF }, + { "eth", 0xF0, 0x00F0 }, + { "ntilde", 0xF1, 0x00F1 }, + { "ograve", 0xF2, 0x00F2 }, + { "oacute", 0xF3, 0x00F3 }, + { "ocirc", 0xF4, 0x00F4 }, + { "otilde", 0xF5, 0x00F5 }, + { "ouml", 0xF6, 0x00F6 }, + { "divide", 0xF7, 0x00F7 }, + { "oslash", 0xF8, 0x00F8 }, + { "ugrave", 0xF9, 0x00F9 }, + { "uacute", 0xFA, 0x00FA }, + { "ucirc", 0xFB, 0x00FB }, + { "uuml", 0xFC, 0x00FC }, + { "yacute", 0xFD, 0x00FD }, + { "thorn", 0xFE, 0x00FE }, + { "yuml", 0xFF, 0x00FF } +}; + +/* This might be put into structure below and NOT coded via define, + because some translation tables could contain different numbers of + characters, but for now it suffices. */ +#define ISO_MAP_SIZE (sizeof (iso8859_1_map) / sizeof (iso8859_1_map[0])) + +encoding_type encoding_table[] = { + { no_encoding, "(no encoding)", NULL }, + { ISO_8859_1, "ISO-8859-1", (iso_map_type *) iso8859_1_map }, + { ISO_8859_2, "ISO-8859-2", NULL }, + { ISO_8859_3, "ISO-8859-3", NULL }, + { ISO_8859_4, "ISO-8859-4", NULL }, + { ISO_8859_5, "ISO-8859-5", NULL }, + { ISO_8859_6, "ISO-8859-6", NULL }, + { ISO_8859_7, "ISO-8859-7", NULL }, + { ISO_8859_8, "ISO-8859-8", NULL }, + { ISO_8859_9, "ISO-8859-9", NULL }, + { ISO_8859_10, "ISO-8859-10", NULL }, + { ISO_8859_11, "ISO-8859-11", NULL }, + { ISO_8859_12, "ISO-8859-12", NULL }, + { ISO_8859_13, "ISO-8859-13", NULL }, + { ISO_8859_14, "ISO-8859-14", NULL }, + { ISO_8859_15, "ISO-8859-15", NULL }, + { last_encoding_code, NULL, NULL } +}; + + +language_type language_table[] = { { aa, "aa", "Afar" }, { ab, "ab", "Abkhazian" }, { af, "af", "Afrikaans" }, @@ -173,16 +303,18 @@ language_struct language_table[] = { { last_language_code, NULL, NULL } }; + + /* @documentlanguage. Maybe we'll do something useful with this in the future. For now, we just recognize it. */ void cm_documentlanguage () { language_code_type c; - char *lang_arg; + char *lang_arg; /* Read the line with the language code on it. */ - get_rest_of_line (1, &lang_arg); + get_rest_of_line (0, &lang_arg); /* Linear search is fine these days. */ for (c = aa; c != last_language_code; c++) @@ -203,11 +335,178 @@ cm_documentlanguage () -/* @documentencoding. Set global. */ +/* Search through the encoding table for the given character, returning + its equivalent. */ + +static int +cm_search_iso_map (html) + char *html; +{ + int i; + iso_map_type *iso = encoding_table[document_encoding_code].isotab; + + /* If no conversion table for this encoding, quit. */ + if (!iso) + return -1; + + for (i = 0; i < ISO_MAP_SIZE; i++) + { + if (strcmp (html, iso[i].html) == 0) + return i; + } + + return -1; +} + + +/* @documentencoding. Set the translation table. */ + void cm_documentencoding () { - get_rest_of_line (1, &document_encoding); + encoding_code_type enc; + char *enc_arg; + + get_rest_of_line (1, &enc_arg); + + /* See if we have this encoding. */ + for (enc = ISO_8859_1; enc != last_encoding_code; enc++) + { + if (strcasecmp (enc_arg, encoding_table[enc].ecname) == 0) + { + document_encoding_code = enc; + break; + } + } + + /* If we didn't find this code, complain. */ + if (enc == last_encoding_code) + warning (_("unrecogized encoding name `%s'"), enc_arg); + + else if (encoding_table[document_encoding_code].isotab == NULL) + warning (_("sorry, encoding `%s' not supported"), enc_arg); + + free (enc_arg); +} + + +/* If html or xml output, add HTML_STR to the output. If not html and + the user requested encoded output, add the real 8-bit character + corresponding to HTML_STR from the translation tables. Otherwise, + add INFO_STR. */ + +void +add_encoded_char (html_str, info_str) + char *html_str; + char *info_str; +{ + if (html || xml) + add_word_args ("&%s;", html_str); + else if (enable_encoding) + { + /* Look for HTML_STR in the current translation table. */ + int rc = cm_search_iso_map (html_str); + if (rc >= 0) + /* We found it, add the real character. */ + add_char (encoding_table[document_encoding_code].isotab[rc].bytecode); + else + { /* We didn't find it, that seems bad. */ + warning (_("invalid encoded character `%s'"), html_str); + add_word (info_str); + } + } + else + add_word (info_str); +} + + + +/* Output an accent for HTML or XML. */ + +static void +cm_accent_generic_html (arg, start, end, html_supported, single, + html_solo_standalone, html_solo) + int arg, start, end; + char *html_supported; + int single; + int html_solo_standalone; + char *html_solo; +{ + static int valid_html_accent; /* yikes */ + + if (arg == START) + { /* If HTML has good support for this character, use it. */ + if (strchr (html_supported, curchar ())) + { /* Yes; start with an ampersand. The character itself + will be added later in read_command (makeinfo.c). */ + valid_html_accent = 1; + add_char ('&'); + } + else + { + valid_html_accent = 0; + if (html_solo_standalone) + { /* No special HTML support, so produce standalone char. */ + add_word_args ("&%s;", html_solo); + } + else + /* If the html_solo does not exist as standalone character + (namely ˆ ` ˜), then we use + the single character version instead. */ + add_char (single); + } + } + else if (arg == END) + { /* Only if we saw a valid_html_accent can we use the full + HTML accent (umlaut, grave ...). */ + if (valid_html_accent) + { + add_word (html_solo); + add_char (';'); + } + } +} + + +static void +cm_accent_generic_no_headers (arg, start, end, single, html_solo) + int arg, start, end; + int single; + char *html_solo; +{ + if (arg == END) + { + if (no_encoding) + add_char (single); + else + { + int rc; + char *buffer = xmalloc (1 + strlen (html_solo) + 1); + buffer[0] = output_paragraph[end - 1]; + buffer[1] = 0; + strcat (buffer, html_solo); + + rc = cm_search_iso_map (buffer); + if (rc >= 0) + /* A little bit tricky ;-) + Here we replace the character which has + been inserted in read_command with + the value we have found in converting table + Does there exist a better way to do this? kama. */ + output_paragraph[end - 1] + = encoding_table[document_encoding_code].isotab[rc].bytecode; + else + { /* If we didn't find a translation for this character, + put the single instead. E.g., &Xuml; does not exist so X¨ + should be produced. */ + warning (_("%s is an invalid ISO code, using %c"), + buffer, single); + add_char (single); + } + + free (buffer); + } + } } @@ -219,6 +518,8 @@ void cm_accent (arg) int arg; { + int old_escape_html = escape_html; + escape_html = 0; if (arg == START) { /* Must come first to avoid ambiguity with overdot. */ @@ -228,7 +529,7 @@ cm_accent (arg) else if (arg == END) { if (strcmp (command, "=") == 0) /* macron */ - add_word (html ? "¯" : "="); + add_word ((html || xml) ? "¯" : "="); else if (strcmp (command, "H") == 0) /* Hungarian umlaut */ add_word ("''"); else if (strcmp (command, "dotaccent") == 0) /* overdot */ @@ -242,18 +543,19 @@ cm_accent (arg) else if (strcmp (command, "ubaraccent") == 0) /* underbar */ add_char ('_'); else if (strcmp (command, "v") == 0) /* hacek/check */ - add_word (html ? "<" : "<"); + add_word ((html || xml) ? "<" : "<"); } + escape_html = old_escape_html; } /* Common routine for the accent characters that have support in HTML. If the character being accented is in the HTML_SUPPORTED set, then produce &CHTML_SOLO;, for example, Ä for an A-umlaut. If not in HTML_SUPPORTED, just produce &HTML_SOLO;X for the best we can do with - at an X-umlaut. Finally, if not producing HTML, just use SINGLE, a + at an X-umlaut. If not producing HTML, just use SINGLE, a character such as " which is the best plain text representation we - can manage. If HTML_SOLO_STANDALONE is zero the given HTML_SOLO - does not exist as valid standalone character in HTML. */ + can manage. If HTML_SOLO_STANDALONE is nonzero the given HTML_SOLO + exists as valid standalone character in HTML, e.g., ¨. */ static void cm_accent_generic (arg, start, end, html_supported, single, @@ -264,47 +566,19 @@ cm_accent_generic (arg, start, end, html_supported, single, int html_solo_standalone; char *html_solo; { - if (html) - { - static int valid_html_accent; - - if (arg == START) - { /* If HTML has good support for this character, use it. */ - if (strchr (html_supported, curchar ())) - { /* Yes; start with an ampersand. The character itself - will be added later in read_command (makeinfo.c). */ - add_char ('&'); - valid_html_accent = 1; - } - else - { /* No special HTML support, so produce standalone char. */ - valid_html_accent = 0; - if (html_solo_standalone) - { - add_char ('&'); - add_word (html_solo); - add_char (';'); - } - else - /* If the html_solo does not exist as standalone character - (namely ˆ ` ˜), then we use - the single character version instead. */ - add_char (single); - } - } - else if (arg == END) - { /* Only if we saw a valid_html_accent can we use the full - HTML accent (umlaut, grave ...). */ - if (valid_html_accent) - { - add_word (html_solo); - add_char (';'); - } - } - } + if (html || xml) + cm_accent_generic_html (arg, start, end, html_supported, + single, html_solo_standalone, html_solo); + else if (no_headers) + cm_accent_generic_no_headers (arg, start, end, single, html_solo); else if (arg == END) - { /* Not producing HTML, so just use the normal character. */ - add_char (single); + { + if (enable_encoding) + /* use 8-bit if available */ + cm_accent_generic_no_headers (arg, start, end, single, html_solo); + else + /* use regular character */ + add_char (single); } } @@ -347,7 +621,7 @@ void cm_accent_tilde (arg, start, end) int arg, start, end; { - cm_accent_generic (arg, start, end, "AOano", '~', 0, "tilde"); + cm_accent_generic (arg, start, end, "ANOano", '~', 0, "tilde"); } @@ -356,6 +630,9 @@ cm_accent_tilde (arg, start, end) void cm_special_char (arg) { + int old_escape_html = escape_html; + escape_html = 0; + if (arg == START) { if ((*command == 'L' || *command == 'l' @@ -363,34 +640,37 @@ cm_special_char (arg) && command[1] == 0) { /* Lslash lslash Oslash oslash. Lslash and lslash aren't supported in HTML. */ - if (html && (command[0] == 'O' || command[0] == 'o')) - add_word_args ("&%cslash;", command[0]); + if ((html || xml) && command[0] == 'O') + add_encoded_char ("Oslash", "/O"); + else if ((html || xml) && command[0] == 'o') + add_encoded_char ("oslash", "/o"); else add_word_args ("/%c", command[0]); } else if (strcmp (command, "exclamdown") == 0) - add_word (html ? "¡" : "!"); + add_encoded_char ("iexcl", "!"); else if (strcmp (command, "pounds") == 0) - add_word (html ? "£" : "#"); + add_encoded_char ("pound" , "#"); else if (strcmp (command, "questiondown") == 0) - add_word (html ? "¿" : "?"); + add_encoded_char ("iquest", "?"); else if (strcmp (command, "AE") == 0) - add_word (html ? "Æ" : command); + add_encoded_char ("AElig", command); else if (strcmp (command, "ae") == 0) - add_word (html ? "æ" : command); + add_encoded_char ("aelig", command); else if (strcmp (command, "OE") == 0) - add_word (html ? "Œ" : command); + add_word ("Œ", command); else if (strcmp (command, "oe") == 0) - add_word (html ? "œ" : command); + add_word ("œ", command); else if (strcmp (command, "AA") == 0) - add_word (html ? "Å" : command); + add_encoded_char ("Aring", command); else if (strcmp (command, "aa") == 0) - add_word (html ? "å" : command); + add_encoded_char ("aring", command); else if (strcmp (command, "ss") == 0) - add_word (html ? "ß" : command); + add_encoded_char ("szlig", command); else line_error ("cm_special_char internal error: command=@%s", command); } + escape_html = old_escape_html; } /* Dotless i or j. */ @@ -400,6 +680,7 @@ cm_dotless (arg, start, end) { if (arg == END) { + xml_no_para --; if (output_paragraph[start] != 'i' && output_paragraph[start] != 'j') /* This error message isn't perfect if the argument is multiple characters, but it doesn't seem worth getting right. */ @@ -412,4 +693,6 @@ cm_dotless (arg, start, end) /* We've already inserted the `i' or `j', so nothing to do. */ } + else + xml_no_para ++; } diff --git a/gnu/usr.bin/texinfo/makeinfo/lang.h b/gnu/usr.bin/texinfo/makeinfo/lang.h index 40c48aca98d..1aad64cf374 100644 --- a/gnu/usr.bin/texinfo/makeinfo/lang.h +++ b/gnu/usr.bin/texinfo/makeinfo/lang.h @@ -1,7 +1,7 @@ /* lang.h -- declarations for language codes etc. - $Id: lang.h,v 1.1.1.1 2000/02/09 01:25:20 espie Exp $ + $Id: lang.h,v 1.1.1.2 2002/06/10 13:21:18 espie Exp $ - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2001 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 @@ -17,15 +17,14 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - Written by Karl Heinz Marbaise <kama@hippo.fido.de>. */ + Originally written by Karl Heinz Marbaise <kama@hippo.fido.de>. */ #ifndef LANG_H #define LANG_H -/* The langauge code which can be changed through @documentlanguage - * Actualy Info does not support this (may be in the future) ;-) - * Default for language code is en (english!) kama - * These code should ISO 639 two letter codes. +/* The language code which can be changed through @documentlanguage + * Actually we don't currently support this (may be in the future) ;-) + * These code are the ISO-639 two letter codes. */ typedef enum { @@ -61,19 +60,71 @@ typedef enum /* The current language code. */ extern language_code_type language_code; -/* Information about all valid languages. */ + +/* Information for each language. */ typedef struct { language_code_type lc; /* language code as enum type */ char *abbrev; /* two letter language code */ char *desc; /* full name for language code */ -} language_struct; -extern language_struct language_table[]; +} language_type; + +extern language_type language_table[]; + + + +/* The document encoding. This is usefull if we working e.g. + * with german Texinfo so we can produce correct german umlaut + * while creating output (--no-headers ASCII like). + */ +typedef enum { + no_encoding, + ISO_8859_1, /* default for en, de, */ + ISO_8859_2, /* actualy not supported like the rest below */ + ISO_8859_3, + ISO_8859_4, + ISO_8859_5, + ISO_8859_6, + ISO_8859_7, + ISO_8859_8, + ISO_8859_9, + ISO_8859_10, + ISO_8859_11, + ISO_8859_12, + ISO_8859_13, + ISO_8859_14, + ISO_8859_15, + last_encoding_code +} encoding_code_type; + +/* The current document encoding, or null if not set. */ +extern encoding_code_type document_encoding_code; + -/* The encoding, or null if not set. */ -extern char *document_encoding; +/* Maps an HTML abbreviation to ISO and Unicode codes for a given code. */ + +typedef unsigned short int unicode_t; /* should be 16 bits */ +typedef unsigned char byte_t; + +typedef struct +{ + char *html; /* HTML equivalent like umlaut auml => ä */ + byte_t bytecode; /* 8-Bit Code (ISO 8859-1,...) */ + unicode_t unicode; /* Unicode in U+ convention */ +} iso_map_type; + +/* Information about the document encoding. */ +typedef struct +{ + encoding_code_type ec; /* document encoding type (see above enum) */ + char *ecname; /* encoding name like ISO-8859-1 */ + iso_map_type *isotab; /* address of ISO translation table */ +} encoding_type; +/* Table with all the encoding codes that we recognize. */ +extern encoding_type encoding_table[]; + /* The commands. */ extern void cm_documentlanguage (), cm_documentencoding (); diff --git a/gnu/usr.bin/texinfo/makeinfo/macro.c b/gnu/usr.bin/texinfo/makeinfo/macro.c index 82821b9fe86..50467f4cd61 100644 --- a/gnu/usr.bin/texinfo/makeinfo/macro.c +++ b/gnu/usr.bin/texinfo/makeinfo/macro.c @@ -1,7 +1,7 @@ /* macro.c -- user-defined macros for Texinfo. - $Id: macro.c,v 1.1.1.1 2000/02/09 01:25:23 espie Exp $ + $Id: macro.c,v 1.1.1.2 2002/06/10 13:21:18 espie Exp $ - Copyright (C) 1998, 99 Free Software Foundation, Inc. + Copyright (C) 1998, 99, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -590,10 +590,8 @@ define_macro (mactype, recursive) { if ((input_text_offset + 9) > input_text_length) { - int temp_line = line_number; - line_number = defining_line; - line_error (_("%cend macro not found"), COMMAND_PREFIX); - line_number = temp_line; + file_line_error (input_filename, defining_line, + _("%cend macro not found"), COMMAND_PREFIX); return; } @@ -1002,6 +1000,8 @@ cm_alias () skip_whitespace (); get_until_in_line (1, "=", &(a->alias)); + canon_white (a->alias); + discard_until ("="); skip_whitespace (); get_until_in_line (0, " ", &(a->mapto)); diff --git a/gnu/usr.bin/texinfo/makeinfo/node.h b/gnu/usr.bin/texinfo/makeinfo/node.h index 3539f88f480..5c5517c8b57 100644 --- a/gnu/usr.bin/texinfo/makeinfo/node.h +++ b/gnu/usr.bin/texinfo/makeinfo/node.h @@ -1,7 +1,7 @@ /* node.h -- declarations for Node. - $Id: node.h,v 1.1.1.1 2000/02/09 01:25:30 espie Exp $ + $Id: node.h,v 1.1.1.2 2002/06/10 13:21:22 espie Exp $ - Copyright (C) 1996, 97, 98, 99 Free Software Foundation, Inc. + Copyright (C) 1996, 97, 98, 99, 2002 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -39,6 +39,8 @@ typedef struct tentry int number; /* Number for this node, relevant for HTML splitting -- from use+define order, not just define. */ + char *html_fname; /* The HTML file to which this node is written + (non-NULL only for HTML splitting). */ } TAG_ENTRY; /* If node-a has a "Next" for node-b, but node-b has no "Prev" for node-a, diff --git a/gnu/usr.bin/texinfo/makeinfo/sectioning.c b/gnu/usr.bin/texinfo/makeinfo/sectioning.c index 5ec18dfd5b0..cfaaf5f2af4 100644 --- a/gnu/usr.bin/texinfo/makeinfo/sectioning.c +++ b/gnu/usr.bin/texinfo/makeinfo/sectioning.c @@ -1,7 +1,7 @@ /* sectioning.c -- all related stuff @chapter, @section... @contents - $Id: sectioning.c,v 1.1.1.1 2000/02/09 01:25:31 espie Exp $ + $Id: sectioning.c,v 1.1.1.2 2002/06/10 13:21:22 espie Exp $ - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2001, 02 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 @@ -26,6 +26,7 @@ #include "node.h" #include "toc.h" #include "sectioning.h" +#include "xml.h" /* See comment in sectioning.h. */ section_alist_type section_alist[] = { @@ -210,11 +211,37 @@ what_section (text) return -1; } - void sectioning_underscore (cmd) char *cmd; { + if (xml) + { + char *temp; + int level; + temp = xmalloc (2 + strlen (cmd)); + temp[0] = COMMAND_PREFIX; + strcpy (&temp[1], cmd); + level = what_section (temp); + level -= 2; + free (temp); + xml_close_sections (level); + /* Mark the beginning of the section + If the next command is printindex, we will remove + the section and put an Index instead */ + flush_output (); + xml_last_section_output_position = output_paragraph_offset; + + xml_insert_element (xml_element (cmd), START); + xml_insert_element (TITLE, START); + xml_open_section (level, cmd); + get_rest_of_line (0, &temp); + execute_string ("%s\n", temp); + free (temp); + xml_insert_element (TITLE, END); + } + else + { char character; char *temp; int level; @@ -235,6 +262,7 @@ sectioning_underscore (cmd) { character = scoring_characters[level]; insert_and_underscore (level, character, cmd); + } } } @@ -385,16 +413,22 @@ sectioning_html (level, cmd) old_no_indent = no_indent; no_indent = 1; - add_word_args ("<h%d>", level + 1); /* level 0 is <h1> */ + add_word_args ("<h%d>", level + 2); /* level 0 (chapter) is <h2> */ /* If we are outside of any node, produce an anchor that the TOC could refer to. */ if (!current_node || !*current_node) { + static const char a_name[] = "<a name=\""; + starting_pos = output_paragraph + output_paragraph_offset; - add_word_args ("<a name=\"TOC%d\">", toc_ref_count++); - toc_anchor = substring (starting_pos + 9, + add_word_args ("%sTOC%d\">", a_name, toc_ref_count++); + toc_anchor = substring (starting_pos + sizeof (a_name) - 1, output_paragraph + output_paragraph_offset); + /* This must be added after toc_anchor is extracted, since + toc_anchor cannot include the closing </a>. For details, + see toc.c:toc_add_entry and toc.c:contents_update_html. */ + add_word ("</a>"); } starting_pos = output_paragraph + output_paragraph_offset; @@ -431,13 +465,13 @@ sectioning_html (level, cmd) if (section_alist[index].toc == TOC_YES) toc_add_entry (substring (starting_pos, ending_pos), level, current_node, toc_anchor); - + free (temp); if (outstanding_node) outstanding_node = 0; - add_word_args ("</h%d>", level+1); + add_word_args ("</h%d>", level + 2); close_paragraph(); filling_enabled = 1; no_indent = old_no_indent; @@ -488,14 +522,8 @@ cm_top () { if (tag->flags & TAG_FLAG_IS_TOP) { - int old_line_number = line_number; - char *old_input_filename = input_filename; - - line_number = tag->line_no; - input_filename = tag->filename; - line_error (_("Here is the %ctop node"), COMMAND_PREFIX); - input_filename = old_input_filename; - line_number = old_line_number; + file_line_error (tag->filename, tag->line_no, + _("Here is the %ctop node"), COMMAND_PREFIX); return; } tag = tag->next_ent; @@ -506,7 +534,7 @@ cm_top () TAG_ENTRY *top_node = find_node ("Top"); top_node_seen = 1; - /* It is an error to use @top before you have used @node. */ + /* It is an error to use @top before using @node. */ if (!tag_table) { char *top_name; @@ -518,21 +546,6 @@ cm_top () free (top_name); return; } - else if (html && splitting) - { - char *next = top_node ? top_node->next : NULL; - - add_word ("<p>"); - if (next) - { - add_word (_("Next:")); - add_word ("<a rel=next href=\""); - add_anchor_name (next, 1); - add_word ("\">"); - execute_string (next); - add_word ("</a>\n"); - } - } cm_unnumbered (); diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.am b/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.am index 3e502ed4f32..2465c041524 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.am +++ b/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.am @@ -1,9 +1,9 @@ -## Makefile.am for texinfo/tests/makeinfo. -## Run automake in ../.. to produce Makefile.in from this. +# Makefile.am for texinfo/tests/makeinfo. +# Run automake in ../.. to produce Makefile.in from this. -TESTS = cond \ - html-extrali html-min html-manuals html-para html-title \ - menu-whitespace \ +TESTS = accent accentenc cond \ + html-docdesc html-extrali html-min html-manuals html-para html-title \ + macro-at menu-whitespace \ no-headers \ node-expand node-value node-whitespace \ top top2 @@ -11,8 +11,8 @@ TESTS = cond \ noinst_SCRIPTS = $(TESTS) EXTRA_DIST = $(noinst_SCRIPTS) \ - cond.txi \ - html-extrali.txi html-min.txi html-para.txi html-title.txi \ - menu-whitespace.txi \ + accent.txi accentenc.txi accent-text.txi cond.txi \ + html-docdesc.txi html-extrali.txi html-min.txi html-para.txi html-title.txi \ + macro-at.txi menu-whitespace.txi \ node-expand.txi node-value.txi node-whitespace.txi \ top.txi top2.txi diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.in b/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.in index 50dedc8403c..648211d6a99 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.in +++ b/gnu/usr.bin/texinfo/makeinfo/tests/Makefile.in @@ -1,6 +1,8 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated by automake 1.6 from Makefile.am. +# @configure_input@ -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002 +# Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -10,7 +12,10 @@ # even the implied warranty of MERCHANTABILITY or FITNESS FOR A # PARTICULAR PURPOSE. +@SET_MAKE@ +# Makefile.am for texinfo/tests/makeinfo. +# Run automake in ../.. to produce Makefile.in from this. SHELL = @SHELL@ srcdir = @srcdir@ @@ -31,13 +36,9 @@ infodir = @infodir@ mandir = @mandir@ includedir = @includedir@ oldincludedir = /usr/include - -DESTDIR = - pkgdatadir = $(datadir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@ - top_builddir = ../.. ACLOCAL = @ACLOCAL@ @@ -45,178 +46,252 @@ AUTOCONF = @AUTOCONF@ AUTOMAKE = @AUTOMAKE@ AUTOHEADER = @AUTOHEADER@ +am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd INSTALL = @INSTALL@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS) +INSTALL_PROGRAM = @INSTALL_PROGRAM@ INSTALL_DATA = @INSTALL_DATA@ +install_sh_DATA = $(install_sh) -c -m 644 +install_sh_PROGRAM = $(install_sh) -c INSTALL_SCRIPT = @INSTALL_SCRIPT@ +INSTALL_HEADER = $(INSTALL_DATA) transform = @program_transform_name@ - NORMAL_INSTALL = : PRE_INSTALL = : POST_INSTALL = : NORMAL_UNINSTALL = : PRE_UNINSTALL = : POST_UNINSTALL = : -CATALOGS = @CATALOGS@ +host_alias = @host_alias@ +host_triplet = @host@ + +EXEEXT = @EXEEXT@ +OBJEXT = @OBJEXT@ +PATH_SEPARATOR = @PATH_SEPARATOR@ +AMTAR = @AMTAR@ +AWK = @AWK@ +BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ +DEPDIR = @DEPDIR@ GENCAT = @GENCAT@ -GMOFILES = @GMOFILES@ +GLIBC21 = @GLIBC21@ GMSGFMT = @GMSGFMT@ -GT_NO = @GT_NO@ -GT_YES = @GT_YES@ -INCLUDE_LOCALE_H = @INCLUDE_LOCALE_H@ +HAVE_LIB = @HAVE_LIB@ +INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ INSTOBJEXT = @INSTOBJEXT@ -INTLDEPS = @INTLDEPS@ +INTLBISON = @INTLBISON@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ -MAKEINFO = @MAKEINFO@ +INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ +LIB = @LIB@ +LIBICONV = @LIBICONV@ +LIBINTL = @LIBINTL@ +LTLIB = @LTLIB@ +LTLIBICONV = @LTLIBICONV@ +LTLIBINTL = @LTLIBINTL@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ PACKAGE = @PACKAGE@ -POFILES = @POFILES@ POSUB = @POSUB@ RANLIB = @RANLIB@ +STRIP = @STRIP@ TERMLIBS = @TERMLIBS@ USE_INCLUDED_LIBINTL = @USE_INCLUDED_LIBINTL@ USE_NLS = @USE_NLS@ VERSION = @VERSION@ -l = @l@ +am__include = @am__include@ +am__quote = @am__quote@ +install_sh = @install_sh@ -TESTS = cond html-extrali html-min html-manuals html-para html-title menu-whitespace no-headers node-expand node-value node-whitespace top top2 +TESTS = accent accentenc cond \ + html-docdesc html-extrali html-min html-manuals html-para html-title \ + macro-at menu-whitespace \ + no-headers \ + node-expand node-value node-whitespace \ + top top2 noinst_SCRIPTS = $(TESTS) -EXTRA_DIST = $(noinst_SCRIPTS) cond.txi html-extrali.txi html-min.txi html-para.txi html-title.txi menu-whitespace.txi node-expand.txi node-value.txi node-whitespace.txi top.txi top2.txi +EXTRA_DIST = $(noinst_SCRIPTS) \ + accent.txi accentenc.txi accent-text.txi cond.txi \ + html-docdesc.txi html-extrali.txi html-min.txi html-para.txi html-title.txi \ + macro-at.txi menu-whitespace.txi \ + node-expand.txi node-value.txi node-whitespace.txi \ + top.txi top2.txi +subdir = makeinfo/tests mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs -CONFIG_HEADER = ../../config.h -CONFIG_CLEAN_FILES = -SCRIPTS = $(noinst_SCRIPTS) +CONFIG_HEADER = $(top_builddir)/config.h +CONFIG_CLEAN_FILES = +SCRIPTS = $(noinst_SCRIPTS) -DIST_COMMON = Makefile.am Makefile.in +DIST_SOURCES = +DIST_COMMON = Makefile.am Makefile.in +all: all-am - -DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - -TAR = gtar -GZIP_ENV = --best -all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps makeinfo/tests/Makefile - -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - cd $(top_builddir) \ - && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status - +$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4) + cd $(top_srcdir) && \ + $(AUTOMAKE) --gnu makeinfo/tests/Makefile +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status + cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe) +install-info-am: +uninstall-info-am: tags: TAGS TAGS: -distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; \ + srcdir=$(srcdir); export srcdir; \ + list='$(TESTS)'; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *" $$tst "*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes=`echo "$$banner" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi +DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -subdir = makeinfo/tests +top_distdir = ../.. +distdir = $(top_distdir)/$(PACKAGE)-$(VERSION) distdir: $(DISTFILES) @for file in $(DISTFILES); do \ - d=$(srcdir); \ + if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ + dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \ + if test "$$dir" != "$$file" && test "$$dir" != "."; then \ + dir="/$$dir"; \ + $(mkinstalldirs) "$(distdir)$$dir"; \ + else \ + dir=''; \ + fi; \ if test -d $$d/$$file; then \ - cp -pr $$d/$$file $(distdir)/$$file; \ + cp -pR $$d/$$file $(distdir)$$dir \ + || exit 1; \ else \ test -f $(distdir)/$$file \ - || ln $$d/$$file $(distdir)/$$file 2> /dev/null \ - || cp -p $$d/$$file $(distdir)/$$file || :; \ + || cp -p $$d/$$file $(distdir)/$$file \ + || exit 1; \ fi; \ done -check-TESTS: $(TESTS) - @failed=0; all=0; \ - srcdir=$(srcdir); export srcdir; \ - for tst in $(TESTS); do \ - if test -f $$tst; then dir=.; \ - else dir="$(srcdir)"; fi; \ - if $(TESTS_ENVIRONMENT) $$dir/$$tst; then \ - all=`expr $$all + 1`; \ - echo "PASS: $$tst"; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - failed=`expr $$failed + 1`; \ - echo "FAIL: $$tst"; \ - fi; \ - done; \ - if test "$$failed" -eq 0; then \ - banner="All $$all tests passed"; \ - else \ - banner="$$failed of $$all tests failed"; \ - fi; \ - dashes=`echo "$$banner" | sed s/./=/g`; \ - echo "$$dashes"; \ - echo "$$banner"; \ - echo "$$dashes"; \ - test "$$failed" -eq 0 -info-am: -info: info-am -dvi-am: -dvi: dvi-am check-am: all-am $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am -installcheck-am: -installcheck: installcheck-am -install-exec-am: -install-exec: install-exec-am +all-am: Makefile $(SCRIPTS) -install-data-am: -install-data: install-data-am +installdirs: -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-am -uninstall-am: +install-exec: install-exec-am +install-data: install-data-am uninstall: uninstall-am -all-am: Makefile $(SCRIPTS) -all-redirect: all-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install -installdirs: +install-am: all-am + @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am +installcheck: installcheck-am +install-strip: + $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ + INSTALL_STRIP_FLAG=-s \ + `test -z '$(STRIP)' || \ + echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install mostlyclean-generic: clean-generic: distclean-generic: - -rm -f Makefile $(CONFIG_CLEAN_FILES) - -rm -f config.cache config.log stamp-h stamp-h[0-9]* + -rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]* maintainer-clean-generic: -mostlyclean-am: mostlyclean-generic + @echo "This command is intended for maintainers to use" + @echo "it deletes files that may require special tools to rebuild." +clean: clean-am -mostlyclean: mostlyclean-am +clean-am: clean-generic mostlyclean-am -clean-am: clean-generic mostlyclean-am +distclean: distclean-am -clean: clean-am +distclean-am: clean-am distclean-generic -distclean-am: distclean-generic clean-am +dvi: dvi-am -distclean: distclean-am +dvi-am: -maintainer-clean-am: maintainer-clean-generic distclean-am - @echo "This command is intended for maintainers to use;" - @echo "it deletes files that may require special tools to rebuild." +info: info-am + +info-am: + +install-data-am: + +install-exec-am: + +install-man: + +installcheck-am: maintainer-clean: maintainer-clean-am -.PHONY: tags distdir check-TESTS info-am info dvi-am dvi check check-am \ -installcheck-am installcheck install-exec-am install-exec \ -install-data-am install-data install-am install uninstall-am uninstall \ -all-redirect all-am all installdirs mostlyclean-generic \ -distclean-generic clean-generic maintainer-clean-generic clean \ -mostlyclean distclean maintainer-clean +maintainer-clean-am: distclean-am maintainer-clean-generic + +mostlyclean: mostlyclean-am + +mostlyclean-am: mostlyclean-generic + +uninstall-am: uninstall-info-am +.PHONY: all all-am check check-TESTS check-am clean clean-generic \ + distclean distclean-generic distdir dvi dvi-am info info-am \ + install install-am install-data install-data-am install-exec \ + install-exec-am install-info-am install-man install-strip \ + installcheck installcheck-am installdirs maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + uninstall uninstall-am uninstall-info-am # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/cond b/gnu/usr.bin/texinfo/makeinfo/tests/cond index 30c28bdd25a..5f66e14afed 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/cond +++ b/gnu/usr.bin/texinfo/makeinfo/tests/cond @@ -10,7 +10,7 @@ egrep 'This is (ifnothtml|ifinfo|ifnottex) text' cond.out >/dev/null \ test `fgrep ' text.' cond.out | wc -l` -eq 3 || exit 3 # Default HTML output. -../makeinfo --html -o cond.out $srcdir/cond.txi || exit 1 +../makeinfo --no-split --html -o cond.out $srcdir/cond.txi || exit 1 egrep 'This is (html|ifhtml|ifnotinfo|ifnottex) text' cond.out >/dev/null \ || exit 2 test `fgrep ' text.' cond.out | wc -l` -eq 4 || exit 3 diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/html-extrali b/gnu/usr.bin/texinfo/makeinfo/tests/html-extrali index 22ecd896ad7..c3ec9ca08d5 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/html-extrali +++ b/gnu/usr.bin/texinfo/makeinfo/tests/html-extrali @@ -1,7 +1,9 @@ #!/bin/sh # Test no extra <li> from @menu. -li_count=`../makeinfo --html -o - ${srcdir-.}/html-extrali.txi 2>/dev/null \ +: ${srcdir=.} + +li_count=`../makeinfo --no-split --html -o - $srcdir/html-extrali.txi 2>/dev/null \ | grep '<li>' \ | wc -l` diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/html-min b/gnu/usr.bin/texinfo/makeinfo/tests/html-min index e5971530afc..948071a9917 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/html-min +++ b/gnu/usr.bin/texinfo/makeinfo/tests/html-min @@ -1,7 +1,7 @@ #!/bin/sh # Test that a minimal Texinfo file can be converted to HTML. -../makeinfo --html ${srcdir-.}/html-min.txi +../makeinfo --html --no-split ${srcdir-.}/html-min.txi exit_status=$? rm -f html-min.html diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/html-para b/gnu/usr.bin/texinfo/makeinfo/tests/html-para index ba3191bf18f..a9ea2b5a9bd 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/html-para +++ b/gnu/usr.bin/texinfo/makeinfo/tests/html-para @@ -1,7 +1,7 @@ #!/bin/sh # Test that paragraph beginnings in HTML work ok. -../makeinfo --html ${srcdir-.}/html-para.txi +../makeinfo --no-split --html ${srcdir-.}/html-para.txi exit_status=$? rm -f html-para.html diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/html-title b/gnu/usr.bin/texinfo/makeinfo/tests/html-title index 425226155dd..54badd51fad 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/html-title +++ b/gnu/usr.bin/texinfo/makeinfo/tests/html-title @@ -2,12 +2,12 @@ # Test that titles with @ commands don't produce markup in the <title>. # (And that the @ commands get expanded.) -if ../makeinfo --html ${srcdir-.}/html-title.txi; then +if ../makeinfo --no-split --html ${srcdir-.}/html-title.txi; then grep '^<title>@[^<>]*</title>$' html-title.html >/dev/null exit_status=$? else exit_status=1 fi -#rm -f html-title.html +rm -f html-title.html exit $exit_status diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/menu-whitespace b/gnu/usr.bin/texinfo/makeinfo/tests/menu-whitespace index d512fc1bcb9..bdc84a13854 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/menu-whitespace +++ b/gnu/usr.bin/texinfo/makeinfo/tests/menu-whitespace @@ -1,5 +1,5 @@ #!/bin/sh -# Test that a minimal Texinfo file can be converted to HTML. +# Bug where whitespace after @menu caused confusion. : ${srcdir=.} input=`basename $0`.txi diff --git a/gnu/usr.bin/texinfo/makeinfo/tests/top2 b/gnu/usr.bin/texinfo/makeinfo/tests/top2 index d38984654d5..7bc27c14c4a 100644 --- a/gnu/usr.bin/texinfo/makeinfo/tests/top2 +++ b/gnu/usr.bin/texinfo/makeinfo/tests/top2 @@ -4,8 +4,9 @@ : ${srcdir=.} # But this input file is erroneous, so throw away errors. -../makeinfo --force -o top2.html --html $srcdir/top2.txi 2>/dev/null +../makeinfo --no-split --force -o top2.html --html $srcdir/top2.txi 2>/dev/null test -s top2.html exit_status=$? + rm -f top2.html exit $exit_status diff --git a/gnu/usr.bin/texinfo/makeinfo/toc.c b/gnu/usr.bin/texinfo/makeinfo/toc.c index 447ad5d0388..b0a655cd35b 100644 --- a/gnu/usr.bin/texinfo/makeinfo/toc.c +++ b/gnu/usr.bin/texinfo/makeinfo/toc.c @@ -1,7 +1,7 @@ /* toc.c -- table of contents handling. - $Id: toc.c,v 1.1.1.1 2000/02/09 01:25:31 espie Exp $ + $Id: toc.c,v 1.1.1.2 2002/06/10 13:21:22 espie Exp $ - Copyright (C) 1999 Free Software Foundation, Inc. + Copyright (C) 1999, 2000, 01, 02 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 @@ -25,6 +25,7 @@ #include "files.h" #include "macro.h" #include "node.h" +#include "html.h" #include "lang.h" #include "makeinfo.h" #include "sectioning.h" @@ -32,7 +33,6 @@ - /* array of toc entries */ static TOC_ENTRY_ELT **toc_entry_alist = NULL; @@ -60,6 +60,7 @@ toc_add_entry (tocname, level, node_name, anchor) char *anchor; { char *tocname_and_node, *expanded_node, *s, *d; + char *filename = NULL; if (!node_name) node_name = ""; @@ -73,53 +74,60 @@ toc_add_entry (tocname, level, node_name, anchor) if (html) { - /* We need to insert the expanded node name into the TOC, so - that when we eventually output the TOC, its <A REF= link will - point to the <A NAME= tag created by cm_node in the navigation - bar. We cannot expand the containing_node member, for the - reasons explained in the WARNING below. We also cannot wait - with the node name expansion until the TOC is actually output, - since by that time the macro definitions may have been changed. - So instead we store in the tocname member the expanded node - name and the TOC name concatenated together (with the necessary - HTML markup), since that's how they are output. */ + /* We need to insert the expanded node name into the toc, so + that when we eventually output the toc, its <a ref= link will + point to the <a name= tag created by cm_node in the navigation + bar. We cannot expand the containing_node member, for the + reasons explained in the WARNING below. We also cannot wait + with the node name expansion until the toc is actually output, + since by that time the macro definitions may have been changed. + So instead we store in the tocname member the expanded node + name and the toc name concatenated together (with the necessary + html markup), since that's how they are output. */ if (!anchor) - s = expanded_node = expand_node_name (node_name); + s = expanded_node = expand_node_name (node_name); else - expanded_node = anchor; + expanded_node = anchor; + if (splitting) + { + if (!anchor) + filename = nodename_to_filename (expanded_node); + else + filename = filename_part (current_output_filename); + } /* Sigh... Need to HTML-escape the expanded node name like - add_anchor_name does, except that we are not writing this to - the output, so can't use add_anchor_name... */ + add_anchor_name does, except that we are not writing this to + the output, so can't use add_anchor_name... */ /* The factor 5 in the next allocation is because the maximum - expansion of HTML-escaping is for the & character, which is - output as "&". 2 is for "> that separates node from tocname. */ + expansion of HTML-escaping is for the & character, which is + output as "&". 2 is for "> that separates node from tocname. */ d = tocname_and_node = (char *)xmalloc (2 + 5 * strlen (expanded_node) - + strlen (tocname) + 1); + + strlen (tocname) + 1); if (!anchor) - { - for (; *s; s++) - { - if (*s == '&') - { - strcpy (d, "&"); - d += 5; - } - else if (! URL_SAFE_CHAR (*s)) - { - sprintf (d, "%%%x", (unsigned char) *s); - /* do this manually since sprintf returns char * on - SunOS 4 and other old systems. */ - while (*d) - d++; - } - else - *d++ = *s; - } - strcpy (d, "\">"); - } + { + for (; *s; s++) + { + if (*s == '&') + { + strcpy (d, "&"); + d += 5; + } + else if (! URL_SAFE_CHAR (*s)) + { + sprintf (d, "%%%x", (unsigned char) *s); + /* do this manually since sprintf returns char * on + SunOS 4 and other old systems. */ + while (*d) + d++; + } + else + *d++ = *s; + } + strcpy (d, "\">"); + } else - /* Section outside any node, they provided explicit anchor. */ - strcpy (d, anchor); + /* Section outside any node, they provided explicit anchor. */ + strcpy (d, anchor); strcat (d, tocname); free (tocname); /* it was malloc'ed by substring() */ free (expanded_node); @@ -137,6 +145,7 @@ toc_add_entry (tocname, level, node_name, anchor) toc_entry_alist[toc_counter]->containing_node = xstrdup (node_name); toc_entry_alist[toc_counter]->level = level; toc_entry_alist[toc_counter]->number = toc_counter; + toc_entry_alist[toc_counter]->html_file = filename; /* have to be done at least */ return toc_counter++; @@ -192,8 +201,8 @@ toc_free () } -/* print table of contents in HTML, may be we can produce a standalone - HTML file? */ +/* Print table of contents in HTML. */ + static void contents_update_html (fp) FILE *fp; @@ -209,10 +218,10 @@ contents_update_html (fp) flush_output (); /* in case we are writing stdout */ - fprintf (fp, "\n<h1>%s</h1>\n<ul>\n", _("Table of Contents")); + fprintf (fp, "\n<h2>%s</h2>\n<ul>\n", _("Table of Contents")); last_level = toc_entry_alist[0]->level; - + for (i = 0; i < toc_counter; i++) { if (toc_entry_alist[i]->level > last_level) @@ -231,7 +240,35 @@ contents_update_html (fp) fputs ("</ul>\n", fp); } - fprintf (fp, "<li><a href=\"#%s</a>\n", toc_entry_alist[i]->name); + /* No double entries in TOC. */ + if (!(i && strcmp (toc_entry_alist[i]->name, + toc_entry_alist[i-1]->name) == 0)) + { + /* each toc entry is a list item. */ + fputs ("<li>", fp); + + /* For chapters (only), insert an anchor that the short contents + will link to. */ + if (toc_entry_alist[i]->level == 0) + { + char *p = toc_entry_alist[i]->name; + + /* toc_entry_alist[i]->name has the form `foo">bar', + that is, it includes both the node name and anchor + text. We need to find where `foo', the node name, + ends, and use that in toc_FOO. */ + while (*p && *p != '"') + p++; + fprintf (fp, "<a name=\"toc_%.*s\"></a>\n ", + p - toc_entry_alist[i]->name, toc_entry_alist[i]->name); + } + + /* Insert link -- to an external file if splitting, or + within the current document if not splitting. */ + fprintf (fp, "<a href=\"%s#%s</a>\n", + splitting ? toc_entry_alist[i]->html_file : "", + toc_entry_alist[i]->name); + } last_level = toc_entry_alist[i]->level; } @@ -282,29 +319,39 @@ shortcontents_update_html (fp) FILE *fp; { int i; + char *toc_file; /* does exist any toc? */ if (!toc_counter) return; - + flush_output (); /* in case we are writing stdout */ - fprintf (fp, "\n<h1>%s</h1>\n<ul>\n", _("Short Contents")); + fprintf (fp, "\n<h2>%s</h2>\n<ul>\n", _("Short Contents")); + + if (contents_filename) + toc_file = filename_part (contents_filename); for (i = 0; i < toc_counter; i++) { - if ((toc_entry_alist[i])->level == 0) - { - fputs ("<li>", fp); - fprintf (fp, "<a href=\"#%s\n", toc_entry_alist[i]->name); - } - } + char *name = toc_entry_alist[i]->name; + if (toc_entry_alist[i]->level == 0) + { + if (contents_filename) + fprintf (fp, "<li><a href=\"%s#toc_%s</a>\n", + splitting ? toc_file : "", name); + else + fprintf (fp, "<a href=\"%s#%s</a>\n", + splitting ? toc_entry_alist[i]->html_file : "", name); + } + } fputs ("</ul>\n\n", fp); + if (contents_filename) + free (toc_file); } -/* short contents in ASCII (--no-headers). - May be we should create a new command line switch --ascii ? */ +/* short contents in ASCII (--no-headers). */ static void shortcontents_update_info (fp) FILE *fp; @@ -321,7 +368,7 @@ shortcontents_update_info (fp) for (i = 0; i < toc_counter; i++) { - if ((toc_entry_alist[i])->level == 0) + if (toc_entry_alist[i]->level == 0) fprintf (fp, "%s\n", toc_entry_alist[i]->name); } fputs ("\n\n", fp); @@ -337,13 +384,18 @@ rewrite_top (fname, placebo) { int idx; + /* Can't rewrite standard output or the null device. No point in + complaining. */ + if (STREQ (fname, "-") + || FILENAME_CMP (fname, NULL_DEVICE) == 0 + || FILENAME_CMP (fname, ALSO_NULL_DEVICE) == 0) + return -1; + toc_buf = find_and_load (fname); if (!toc_buf) { - /* Can't rewrite standard output. No point in complaining. */ - if (!STREQ (fname, "-")) - fs_error (fname); + fs_error (fname); return -1; } @@ -442,6 +494,8 @@ cm_contents (arg) } else { + if (!executing_string && html) + html_output_head (); contents_filename = xstrdup (current_output_filename); insert_string (contents_placebo); /* just mark it, for now */ } @@ -469,6 +523,8 @@ cm_shortcontents (arg) } else { + if (!executing_string && html) + html_output_head (); shortcontents_filename = xstrdup (current_output_filename); insert_string (shortcontents_placebo); /* just mark it, for now */ } diff --git a/gnu/usr.bin/texinfo/makeinfo/toc.h b/gnu/usr.bin/texinfo/makeinfo/toc.h index ec99eea335c..92128c01277 100644 --- a/gnu/usr.bin/texinfo/makeinfo/toc.h +++ b/gnu/usr.bin/texinfo/makeinfo/toc.h @@ -1,5 +1,5 @@ /* toc.h -- table of contents handling. - $Id: toc.h,v 1.1.1.1 2000/02/09 01:25:31 espie Exp $ + $Id: toc.h,v 1.1.1.2 2002/06/10 13:21:22 espie Exp $ Copyright (C) 1999 Free Software Foundation, Inc. @@ -32,6 +32,7 @@ extern char *shortcontents_filename; typedef struct toc_entry_elt { char *name; char *containing_node; /* Name of node containing this section. */ + char *html_file; /* Name of HTML node-file in split-HTML mode */ int number; /* counting number from 0...n independent from chapter/section can be used for anchors or references to it. */ diff --git a/gnu/usr.bin/texinfo/missing b/gnu/usr.bin/texinfo/missing index 7789652e877..0a7fb5a2ace 100644 --- a/gnu/usr.bin/texinfo/missing +++ b/gnu/usr.bin/texinfo/missing @@ -1,7 +1,7 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -# Copyright (C) 1996, 1997 Free Software Foundation, Inc. -# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996. +# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc. +# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,11 +18,37 @@ # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA # 02111-1307, USA. +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + if test $# -eq 0; then echo 1>&2 "Try \`$0 --help' for more information" exit 1 fi +run=: + +# In the cases where this matters, `missing' is being run in the +# srcdir already. +if test -f configure.ac; then + configure_ac=configure.ac +else + configure_ac=configure.in +fi + +case "$1" in +--run) + # Try to run requested program, and just exit if it succeeds. + run= + shift + "$@" && exit 0 + ;; +esac + +# If it does not exist, or fails to run (possibly an outdated version), +# try to emulate it. case "$1" in -h|--h|--he|--hel|--help) @@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM. Options: -h, --help display this help and exit -v, --version output version information and exit + --run try to run the given command, and emulate it if it fails Supported PROGRAM values: aclocal touch file \`aclocal.m4' @@ -43,13 +70,15 @@ Supported PROGRAM values: automake touch all \`Makefile.in' files bison create \`y.tab.[ch]', if possible, from existing .[ch] flex create \`lex.yy.c', if possible, from existing .c + help2man touch the output file lex create \`lex.yy.c', if possible, from existing .c makeinfo touch the output file + tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch]" ;; -v|--v|--ve|--ver|--vers|--versi|--versio|--version) - echo "missing - GNU libit 0.0" + echo "missing 0.3 - GNU automake" ;; -*) @@ -61,7 +90,7 @@ Supported PROGRAM values: aclocal) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acinclude.m4' or \`configure.in'. You might want + you modified \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." touch aclocal.m4 @@ -70,7 +99,7 @@ WARNING: \`$1' is missing on your system. You should only need it if autoconf) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`configure.in'. You might want to install the + you modified \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." touch configure @@ -79,10 +108,10 @@ WARNING: \`$1' is missing on your system. You should only need it if autoheader) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`acconfig.h' or \`configure.in'. You might want + you modified \`acconfig.h' or \`${configure_ac}'. You might want to install the \`Autoconf' and \`GNU m4' packages. Grab them from any GNU archive site." - files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' configure.in` + files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}` test -z "$files" && files="config.h" touch_files= for f in $files; do @@ -98,7 +127,7 @@ WARNING: \`$1' is missing on your system. You should only need it if automake) echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if - you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'. + you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'. You might want to install the \`Automake' and \`Perl' packages. Grab them from any GNU archive site." find . -type f -name Makefile.am -print | @@ -159,7 +188,32 @@ WARNING: \`$1' is missing on your system. You should only need it if fi ;; + help2man) + echo 1>&2 "\ +WARNING: \`$1' is missing on your system. You should only need it if + you modified a dependency of a manual page. You may need the + \`Help2man' package in order for those modifications to take + effect. You can get \`Help2man' from any GNU archive site." + + file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'` + if test -z "$file"; then + file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'` + fi + if [ -f "$file" ]; then + touch $file + else + test -z "$file" || exec >$file + echo ".ab help2man is required to generate this page" + exit 1 + fi + ;; + makeinfo) + if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then + # We have makeinfo, but it failed. + exit 1 + fi + echo 1>&2 "\ WARNING: \`$1' is missing on your system. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -175,6 +229,45 @@ WARNING: \`$1' is missing on your system. You should only need it if touch $file ;; + tar) + shift + if test -n "$run"; then + echo 1>&2 "ERROR: \`tar' requires --run" + exit 1 + fi + + # We have already tried tar in the generic part. + # Look for gnutar/gtar before invocation to avoid ugly error + # messages. + if (gnutar --version > /dev/null 2>&1); then + gnutar ${1+"$@"} && exit 0 + fi + if (gtar --version > /dev/null 2>&1); then + gtar ${1+"$@"} && exit 0 + fi + firstarg="$1" + if shift; then + case "$firstarg" in + *o*) + firstarg=`echo "$firstarg" | sed s/o//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + case "$firstarg" in + *h*) + firstarg=`echo "$firstarg" | sed s/h//` + tar "$firstarg" ${1+"$@"} && exit 0 + ;; + esac + fi + + echo 1>&2 "\ +WARNING: I can't seem to be able to run \`tar' with the given arguments. + You may want to install GNU tar or Free paxutils, or check the + command line arguments." + exit 1 + ;; + *) echo 1>&2 "\ WARNING: \`$1' is needed, and you do not seem to have it handy on your diff --git a/gnu/usr.bin/texinfo/po/POTFILES.in b/gnu/usr.bin/texinfo/po/POTFILES.in index 7f08ea7833e..e19e34e7f71 100644 --- a/gnu/usr.bin/texinfo/po/POTFILES.in +++ b/gnu/usr.bin/texinfo/po/POTFILES.in @@ -1,3 +1,11 @@ +# This file is free software; as a special exception the author gives +# unlimited permission to copy and/or distribute it, with or without +# modifications, as long as this notice is preserved. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY, to the extent permitted by law; without even the +# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# # List of source files containing translatable strings. # The last line must not be a comment. @@ -8,6 +16,8 @@ info/indices.c info/info.c info/info.h info/infodoc.c +info/infokey.c +info/infomap.c info/m-x.c info/makedoc.c info/nodemenu.c @@ -32,5 +42,6 @@ makeinfo/multi.c makeinfo/node.c makeinfo/sectioning.c makeinfo/toc.c +makeinfo/xml.c util/install-info.c util/texindex.c diff --git a/gnu/usr.bin/texinfo/po/cs.gmo b/gnu/usr.bin/texinfo/po/cs.gmo Binary files differindex 64580ada015..6579c80144b 100644 --- a/gnu/usr.bin/texinfo/po/cs.gmo +++ b/gnu/usr.bin/texinfo/po/cs.gmo diff --git a/gnu/usr.bin/texinfo/po/cs.po b/gnu/usr.bin/texinfo/po/cs.po index 4c6d5ee777c..4b6f284faf1 100644 --- a/gnu/usr.bin/texinfo/po/cs.po +++ b/gnu/usr.bin/texinfo/po/cs.po @@ -1,31 +1,25 @@ # Czech translations for GNU texinfo # Copyright (C) 1997 Free Software Foundation, Inc. -# Vladimir Michl <Vladimir.Michl@upol.cz>, 1997. +# Vladimir Michl <Vladimir.Michl@seznam.cz>, 1997. # -# Notes: 2 untranslated messages, It's ok. +# Note: 2 messages untranslated, it's ok. # msgid "" msgstr "" -"Project-Id-Version: texinfo 3.12c\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" -"PO-Revision-Date: 1999-02-17 02:05+01:00\n" -"Last-Translator: Vladimir Michl <Vladimir.Michl@upol.cz>\n" +"Project-Id-Version: texinfo 4.0\n" +"POT-Creation-Date: 2002-04-01 06:10-0800\n" +"PO-Revision-Date: 2000-10-31 15:17+01:00\n" +"Last-Translator: Vladimir Michl <Vladimir.Michl@seznam.cz>\n" "Language-Team: Czech <cs@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#. **************************************************************** -#. -#. Echo Area Movement Commands -#. -#. **************************************************************** -#: info/echo-area.c:283 info/session.c:711 +#: info/echo-area.c:283 info/session.c:712 msgid "Move forward a character" msgstr "Posun na následující znak" -#. Move point backward in the node. -#: info/echo-area.c:295 info/session.c:727 +#: info/echo-area.c:295 info/session.c:728 msgid "Move backward a character" msgstr "Posun na pøedcházející znak" @@ -37,12 +31,11 @@ msgstr "Pøesun na zaèátek tohoto øádku" msgid "Move to the end of this line" msgstr "Pøesun na konec tohoto øádku" -#. Move forward a word in the input line. -#: info/echo-area.c:320 info/session.c:745 +#: info/echo-area.c:320 info/session.c:746 msgid "Move forward a word" msgstr "Posun na následující slovo" -#: info/echo-area.c:360 info/session.c:794 +#: info/echo-area.c:360 info/session.c:795 msgid "Move backward a word" msgstr "Posun na pøedcházející slovo" @@ -74,8 +67,6 @@ msgstr "Vlo¾ení tohoto znaku" msgid "Insert a TAB character" msgstr "Vlo¾ení tabelátoru" -#. Transpose the characters at point. If point is at the end of the line, -#. then transpose the characters before point. #: info/echo-area.c:504 msgid "Transpose characters at point" msgstr "Pøemístìní znaku na pozici" @@ -88,14 +79,10 @@ msgstr "Vlo¾ení toho co bylo naposled smazáno" msgid "Kill ring is empty" msgstr "Kruhový buffer smazaných oblastí je prázdný" -#. If the last command was yank, or yank_pop, and the text just before -#. point is identical to the current kill item, then delete that text -#. from the line, rotate the index down, and yank back some other text. #: info/echo-area.c:575 msgid "Yank back a previous kill" msgstr "Vlo¾ení naposledy smazaného úseku" -#. Delete the text from point to end of line. #: info/echo-area.c:608 msgid "Kill to the end of the line" msgstr "Smazání v¹eho od kurzoru a¾ do konce øádku" @@ -104,7 +91,6 @@ msgstr "Smazání v¹eho od kurzoru a¾ do konce øádku" msgid "Kill to the beginning of the line" msgstr "Smazání v¹eho od zaèátku øádku do kurzoru" -#. Delete from point to the end of the current word. #: info/echo-area.c:633 msgid "Kill the word following the cursor" msgstr "Smazání slova, od kurzoru do konce slova" @@ -113,43 +99,40 @@ msgstr "Smazání slova, od kurzoru do konce slova" msgid "Kill the word preceding the cursor" msgstr "Smazání slova, od zaèátku slova do kurzoru" -#: info/echo-area.c:871 +#: info/echo-area.c:872 info/echo-area.c:932 +msgid "No completions" +msgstr "Doplnìní neexistují" + +#: info/echo-area.c:874 msgid "Not complete" msgstr "Nekompletní" -#: info/echo-area.c:916 +#: info/echo-area.c:919 msgid "List possible completions" msgstr "Seznam mo¾ných doplnìní" -#: info/echo-area.c:929 -msgid "No completions" -msgstr "Doplnìní neexistují" - -#: info/echo-area.c:933 +#: info/echo-area.c:936 msgid "Sole completion" msgstr "Jedinné doplnìní" -#: info/echo-area.c:942 +#: info/echo-area.c:945 msgid "One completion:\n" msgstr "Jedno doplnìní:\n" -#: info/echo-area.c:943 +#: info/echo-area.c:946 #, c-format msgid "%d completions:\n" msgstr "%d doplnìní:\n" -#: info/echo-area.c:1089 +#: info/echo-area.c:1092 msgid "Insert completion" msgstr "Vlo¾ení doplnìní" -#: info/echo-area.c:1222 +#: info/echo-area.c:1225 msgid "Building completions..." msgstr "Hledám doplnìní..." -#. Scroll the "other" window. If there is a window showing completions, scroll -#. that one, otherwise scroll the window which was active on entering the read -#. function. -#: info/echo-area.c:1320 +#: info/echo-area.c:1342 msgid "Scroll the completions window" msgstr "Odrolování obsahu okna s doplnìními" @@ -162,6 +145,11 @@ msgid "Show the footnotes associated with this node in another window" msgstr "" "Zobrazení poznámek pod èarou, vztahujících se k tomuto uzlu, v jiném oknì" +#: info/footnotes.h:26 +#, fuzzy +msgid "---------- Footnotes ----------" +msgstr "---------------------\n" + #: info/indices.c:175 msgid "Look up a string in the index for this file" msgstr "Vyhledání øetìzce v rejstøíku tohoto souboru" @@ -182,8 +170,8 @@ msgstr "Polo¾ka rejstøíku: " msgid "" "Go to the next matching index item from the last `\\[index-search]' command" msgstr "" -"Posun na dal¹í polo¾ku rejstøíku, odpovídající øetìzci z minulého pøíkazu " -"`\\[index-search]'" +"Posun na dal¹í polo¾ku rejstøíku, odpovídající øetìzci z minulého pøíkazu `" +"\\[index-search]'" #: info/indices.c:342 msgid "No previous index search string." @@ -216,6 +204,11 @@ msgstr "Nalezeno \"%s\" v %s. (`\\[next-index-match]' - hledání dal¹í.)" msgid "Scanning indices of \"%s\"..." msgstr "Prohledávám tyto rejstøíky \"%s\"..." +#: info/indices.c:603 +#, c-format +msgid "No available info files have \"%s\" in their indices." +msgstr "" + #: info/indices.c:632 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "" @@ -234,12 +227,12 @@ msgstr "" "\n" "* Menu: Uzly jejich¾ rejstøíky obsahují \"%s\":\n" -#: info/info.c:248 +#: info/info.c:260 info/infokey.c:884 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:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 -#: util/texindex.c:336 +#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689 +#: util/install-info.c:1224 util/texindex.c:338 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -255,12 +248,16 @@ msgstr "" "Public Licence). Více informací získáte ve zdrojových textech v souboru\n" "COPYING.\n" -#: info/info.c:461 -#, fuzzy, c-format +#: info/info.c:462 +#, c-format msgid "no index entries found for `%s'\n" -msgstr "¾ádné polo¾ky nebyly nalezeny\n" +msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n" + +#: info/info.c:555 +msgid " -b, --speech-friendly be friendly to speech synthesizers.\n" +msgstr "" -#: info/info.c:530 +#: info/info.c:562 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" @@ -268,19 +265,21 @@ msgid "" "Read documentation in Info format.\n" "\n" "Options:\n" -" --apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n" -" --directory=DIR add DIR to INFOPATH.\n" -" --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" --file=FILENAME specify Info file to visit.\n" -" --help display this help and exit.\n" -" --index-search=STRING go to node pointed by index entry STRING.\n" -" --node=NODENAME specify nodes in first visited Info file.\n" -" --output=FILENAME output selected nodes to FILENAME.\n" -" --restore=FILENAME read initial keystrokes from FILENAME.\n" -" --show-options, --usage go to command-line options node.\n" -" --subnodes recursively output menu items.\n" -"%s --vi-keys use vi-like and less-like key bindings.\n" -" --version display version information and exit.\n" +" --apropos=STRING look up STRING in all indices of all " +"manuals.\n" +" -d, --directory=DIR add DIR to INFOPATH.\n" +" --dribble=FILENAME remember user keystrokes in FILENAME.\n" +" -f, --file=FILENAME specify Info file to visit.\n" +" -h, --help display this help and exit.\n" +" --index-search=STRING go to node pointed by index entry STRING.\n" +" -n, --node=NODENAME specify nodes in first visited Info file.\n" +" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -R, --raw-escapes don't remove ANSI escapes from man pages.\n" +" --restore=FILENAME read initial keystrokes from FILENAME.\n" +" -O, --show-options, --usage go to command-line options node.\n" +"%s --subnodes recursively output menu items.\n" +" --vi-keys use vi-like and less-like key bindings.\n" +" --version display version information and exit.\n" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" @@ -294,426 +293,735 @@ msgid "" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" " info -f ./foo.info show file ./foo.info, not searching dir\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" -"Pou¾ití: %s [PØEPÍNAÈ]... [INFO-SOUBOR [POLO®KA-MENU...]]\n" +"Pou¾ití: %s [PØEPÍNAÈ]... [POLO®KA-MENU...]\n" "\n" -" Umo¾òuje èíst dokumentaci v Info formátu. Komplexnìj¹í popis, jak " -"pou¾ívat\n" -"program Info, získáte zadáním `info info options' do pøíkazového øádku.\n" +" Umo¾òuje èíst dokumentaci v Info formátu.\n" "\n" "Pøepínaèe:\n" -"--directory=ADRESÁØ kromì promìnné INFOPATH prohledává i tento\n" -" ADRESÁØ\n" -"--dribble=SOUBOR ulo¾í klávesy, které stiskl u¾ivatel do " -"SOUBORu\n" -"--file=SOUBOR zadání info souboru, který se má prohlí¾et\n" -"--index-search=ØETÌZEC skok na uzel urèený v rejstøíku ØETÌZCEM\n" -"--node=JMÉNO_UZLU zadání uzlù, v prvním nav¹tíveném info " -"souboru\n" -"--output=SOUBOR vypisuje nav¹tívené uzly do SOUBORu\n" -"--restore=SOUBOR klávesy, které mají být automaticky po\n" -" spu¹tení infa stisknuty, ète ze SOUBORu\n" -"--subnodes rekurzivnì vypí¹e polo¾ky menu\n" -"%s--help vypí¹e tuto nápovìdu a skonèí\n" -"--version vypí¹e oznaèení verze a skonèí\n" +"--apropos=SUBJEKT hledá SUBJEKT ve v¹ech odkazech v¹ech manuálù\n" +"--directory=ADRESÁØ kromì promìnné INFOPATH prohledává i tento\n" +" ADRESÁØ\n" +"--dribble=SOUBOR ulo¾í klávesy, které stiskl u¾ivatel do SOUBORu\n" +"--file=SOUBOR zadání info souboru, který se má prohlí¾et\n" +"--help vypí¹e tuto nápovìdu a skonèí\n" +"--index-search=ØETÌZEC skok na uzel urèený v rejstøíku ØETÌZCEM\n" +"--node=JMÉNO_UZLU zadání uzlù, v prvním nav¹tíveném info souboru\n" +"--output=SOUBOR vypí¹e nav¹tívené uzly do SOUBORu\n" +"--restore=SOUBOR klávesy, které mají být automaticky po\n" +" spu¹tení infa stisknuty, ète ze SOUBORu\n" +"--show-options, --usage zobrazuje pøepínaèe pøíkazové øádky\n" +"--subnodes rekurzivnì vypí¹e polo¾ky menu\n" +"%s --vi=keys pou¾ije ovládání klávesami jako ve vi a less\n" +"--version vypí¹e oznaèení verze a skonèí\n" +"\n" +" První nepøepínaèový argument, jestli¾e je zadán, je polo¾ka menu, která\n" +"má být po spu¹tìní nav¹tívena; tato polo¾ka je vyhledávána ve v¹ech `dir'\n" +"souborech podle INFOPATH.\n" +" Jestli¾e tato polo¾ka není zadána, info spojí v¹echny `dir' soubory a " +"uká¾e\n" +"výsledek. V¹echny zbývající argumenty jsou brány jako názvy polo¾ek menu,\n" +"relativnì k prvnímu nav¹tívenému uzlu.\n" "\n" -" První argument, jestli¾e je zadán, je chápán jako jméno info souboru, " -"který\n" -"má být èten. Zbývající argumenty jsou chápány jako jména polo¾ek menu,\n" -"které mají být po spu¹tìní nav¹tíveny. Takto se lze jednodu¹e pøesunout do\n" -"uzlu, který máte zájem si pøeèíst. Napøíklad `info emacs buffers'.\n" +"Pøíklady:\n" +" info zobrazí seznam dokumentace\n" +" info emacs zobrazí uzel emacs ze seznamu dokumentace\n" +" info emacs buffers zobrazí uzel buffers z emacsového manuálu\n" +" info --show-options emacs zobrazí uzel s pøepínaèi pøíkazového øádku\n" +" pro emacs\n" +" info -f ./foo.info zobrazí soubor ./foo.info, nehledá v `dir' " +"soub.\n" "\n" " Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze " "anglicky),\n" "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n" "zasílejte na adresu <cs@li.org> (èesky).\n" -#: info/info.c:604 -#, fuzzy, c-format +#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474 +#: util/install-info.c:421 util/texindex.c:286 +#, fuzzy +msgid "" +"\n" +"Email bug reports to bug-texinfo@gnu.org,\n" +"general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" +msgstr "" +"\n" +" Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze " +"anglicky),\n" +"obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n" +"zasílejte na <cs@li.org> (èesky).\n" + +#: info/info.c:632 +#, c-format msgid "Cannot find node `%s'." -msgstr "Uzel `%s' nelze zru¹it" +msgstr "Uzel `%s' nelze nalézt." -#: info/info.c:605 -#, fuzzy, c-format +#: info/info.c:633 +#, c-format msgid "Cannot find node `(%s)%s'." -msgstr "Uzel `%s' nelze zru¹it" +msgstr "Uzel `(%s)%s' nelze nalézt." -#: info/info.c:606 -#, fuzzy +#: info/info.c:634 msgid "Cannot find a window!" -msgstr "Permanentní okno nelze smazat" +msgstr "Nelze nalézt okno!" -#: info/info.c:607 +#: info/info.c:635 msgid "Point doesn't appear within this window's node!" -msgstr "" +msgstr "Bod se nevyskutuje v oknì tohoto uzlu!" -#: info/info.c:608 -#, fuzzy +#: info/info.c:636 msgid "Cannot delete the last window." -msgstr "Permanentní okno nelze smazat" +msgstr "Poslední okno nelze smazat." -#: info/info.c:609 -#, fuzzy +#: info/info.c:637 msgid "No menu in this node." -msgstr "V uzlu \"%s\" není menu." +msgstr "V tomto uzlu není menu." -#: info/info.c:610 -#, fuzzy +#: info/info.c:638 msgid "No footnotes in this node." -msgstr "V tomto uzlu není køí¾ový odkaz." +msgstr "V tomto nejsou poznámky pod èarou." -#: info/info.c:611 +#: info/info.c:639 msgid "No cross references in this node." msgstr "V tomto uzlu není køí¾ový odkaz." -#: info/info.c:612 -#, fuzzy, c-format +#: info/info.c:640 +#, c-format msgid "No `%s' pointer for this node." -msgstr "Není ukazatel na dal¹í uzel." +msgstr "Pro tento uzel není `%s' ukazatel." -#: info/info.c:613 +#: info/info.c:641 #, c-format msgid "Unknown Info command `%c'; try `?' for help." -msgstr "" +msgstr "Neznámý Info pøíkaz `%c'; zkuste `?' pro nápovìdu." -#: info/info.c:614 +#: info/info.c:642 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." -msgstr "" +msgstr "Typ terminálu `%s' není dostateènì inteligentní pro provoz Infa." -#: info/info.c:615 -#, fuzzy +#: info/info.c:643 msgid "You are already at the last page of this node." -msgstr "Posun na zaèátek tohoto uzlu" +msgstr "Ji¾ jste na poslední stránce tohoto uzlu." -#: info/info.c:616 -#, fuzzy +#: info/info.c:644 msgid "You are already at the first page of this node." -msgstr "Posun na zaèátek tohoto uzlu" +msgstr "Ji¾ jste na první stránce tohoto uzlu." -#: info/info.c:617 +#: info/info.c:645 msgid "Only one window." -msgstr "" +msgstr "Pouze jedno okno." -#: info/info.c:618 +#: info/info.c:646 msgid "Resulting window would be too small." -msgstr "" +msgstr "Výsledné okno by bylo pøíli¹ malé." -#: info/info.c:619 +#: info/info.c:647 msgid "Not enough room for a help window, please delete a window." -msgstr "" +msgstr "Není volné místo pro okno nápovìdy, prosím sma¾te nìkteré okno." -#: info/infodoc.c:45 +#: info/infodoc.c:45 info/infodoc.c:94 #, fuzzy -msgid "Basic Commands in Info Windows\n" -msgstr "Základní pøíkazy v Info oknech" - -#: info/infodoc.c:46 -msgid "******************************\n" -msgstr "" +msgid "" +"Basic Commands in Info Windows\n" +"******************************\n" +msgstr "Základní pøíkazy v Info oknech\n" #: info/infodoc.c:48 -#, fuzzy, c-format -msgid " %-10s Quit this help.\n" -msgstr " q Celkové ukonèení Infa." +#, fuzzy +msgid "\\%-10[quit-help] Quit this help.\n" +msgstr " %-10s Ukonèení prohlí¾ení nápovìdy.\n" #: info/infodoc.c:49 -#, fuzzy, c-format -msgid " %-10s Quit Info altogether.\n" -msgstr " q Celkové ukonèení Infa." +#, fuzzy +msgid "\\%-10[quit] Quit Info altogether.\n" +msgstr " %-10s Celkové ukonèení Infa.\n" #: info/infodoc.c:50 -#, fuzzy, c-format -msgid " %-10s Invoke the Info tutorial.\n" -msgstr " h Vyvolání prùvodce Infem." - -#: info/infodoc.c:52 #, fuzzy -msgid "Moving within a node:\n" -msgstr "Pøesun uvnitø uzlu:" +msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" +msgstr " %-10s Vyvolání prùvodce Infem.\n" -#: info/infodoc.c:53 -msgid "---------------------\n" -msgstr "" +# Udìlat patch na podtr¾ení +#: info/infodoc.c:52 info/infodoc.c:101 +#, fuzzy +msgid "" +"Selecting other nodes:\n" +"----------------------\n" +msgstr "Výbìr dal¹ích uzlù:\n" #: info/infodoc.c:54 -#, fuzzy, c-format -msgid " %-10s Scroll forward a page.\n" -msgstr " SPC Následující stránka." +#, fuzzy +msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" +msgstr " %-10s Pøesun na \"dal¹í\" uzel tohoto uzlu.\n" #: info/infodoc.c:55 -#, fuzzy, c-format -msgid " %-10s Scroll backward a page.\n" -msgstr " DEL Pøedchozí stránka." +#, fuzzy +msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" +msgstr " %-10s Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n" #: info/infodoc.c:56 -#, fuzzy, c-format -msgid " %-10s Go to the beginning of this node.\n" -msgstr " b Pøesun na zaèátek aktuálního uzlu." +#, fuzzy +msgid "\\%-10[up-node] Move \"up\" from this node.\n" +msgstr " %-10s Pøesun \"nahoru\" z aktuálního uzlu.\n" #: info/infodoc.c:57 -#, fuzzy, c-format -msgid " %-10s Go to the end of this node.\n" -msgstr " e Pøesun na konec tohoto uzlu." - -#: info/infodoc.c:58 -#, fuzzy, c-format -msgid " %-10s Scroll forward 1 line.\n" -msgstr " SPC Následující stránka." +#, fuzzy +msgid "" +"\\%-10[menu-item] Pick menu item specified by name.\n" +" Picking a menu item causes another node to be selected.\n" +msgstr " Vybírání polo¾ky menu zpùsobí zobrazení tohoto uzlu.\n" #: info/infodoc.c:59 -#, fuzzy, c-format -msgid " %-10s Scroll backward 1 line.\n" -msgstr " DEL Pøedchozí stránka." +#, fuzzy +msgid "" +"\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n" +msgstr " %-10s Následování køí¾ového odkazu. Ète název odkazu.\n" + +#: info/infodoc.c:60 +#, fuzzy +msgid "\\%-10[history-node] Move to the last node seen in this window.\n" +msgstr " %-10s Pøesun na poslední uzel zobrazený v tomto oknì.\n" -# Udìlat patch na podtr¾ení #: info/infodoc.c:61 #, fuzzy -msgid "Selecting other nodes:\n" -msgstr "Výbìr dal¹ích uzlù:" +msgid "" +"\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n" +msgstr " %-10s Skok na následující hypertextový odkaz v tomto uzlu.\n" #: info/infodoc.c:62 -msgid "----------------------\n" -msgstr "" +#, fuzzy +msgid "" +"\\%-10[move-to-prev-xref] Skip to previous hypertext link within this " +"node.\n" +msgstr " %-10s Skok na následující hypertextový odkaz v tomto uzlu.\n" #: info/infodoc.c:63 -#, fuzzy, c-format -msgid " %-10s Move to the `next' node of this node.\n" -msgstr " n Pøesun na \"dal¹í\" uzel tohoto uzlu." +#, fuzzy +msgid "" +"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" +msgstr " %-10s Následování hypertextového odkazu pod kurzorem.\n" #: info/infodoc.c:64 -#, fuzzy, c-format -msgid " %-10s Move to the `previous' node of this node.\n" -msgstr " p Pøesun na \"pøedchozí\" uzel tohoto uzlu." +#, fuzzy +msgid "" +"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" +"node] (DIR)'.\n" +msgstr " %-10s Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'.\n" #: info/infodoc.c:65 -#, fuzzy, c-format +#, fuzzy +msgid "" +"\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node] Top'.\n" +msgstr " %-10s Pøesun do nejvy¹¹ího (Top) uzlu. Rovnocenné s `g Top'.\n" + +#: info/infodoc.c:67 info/infodoc.c:115 +#, fuzzy +msgid "" +"Moving within a node:\n" +"---------------------\n" +msgstr "Pøesun uvnitø uzlu:\n" + +#: info/infodoc.c:69 +#, fuzzy +msgid "\\%-10[scroll-forward] Scroll forward a page.\n" +msgstr " %-10s Následující stránka.\n" + +#: info/infodoc.c:70 +#, fuzzy +msgid "\\%-10[scroll-backward] Scroll backward a page.\n" +msgstr " %-10s Pøedchozí stránka.\n" + +#: info/infodoc.c:71 +#, fuzzy +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" +msgstr " %-10s Pøesun na zaèátek aktuálního uzlu.\n" + +#: info/infodoc.c:72 +#, fuzzy +msgid "\\%-10[end-of-node] Go to the end of this node.\n" +msgstr " %-10s Pøesun na konec tohoto uzlu.\n" + +#: info/infodoc.c:73 +#, fuzzy +msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" +msgstr " %-10s Posun o jeden øádek dopøedu.\n" + +#: info/infodoc.c:74 +#, fuzzy +msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" +msgstr " %-10s Posun o jeden øádek dozadu.\n" + +#: info/infodoc.c:76 info/infodoc.c:124 +#, fuzzy +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "Dal¹í pøíkazy:\n" + +#: info/infodoc.c:78 +#, fuzzy +msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" +msgstr " %-10s Výbìr první ... deváté polo¾ky menu uzlu.\n" + +#: info/infodoc.c:79 +#, fuzzy +msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" +msgstr " %-10s Zobrazení poslední polo¾ky menu uzlu.\n" + +#: info/infodoc.c:80 +#, fuzzy +msgid "" +"\\%-10[index-search] Search for a specified string in the index entries of " +"this Info\n" +" file, and select the node referenced by the first entry " +"found.\n" +msgstr " uzlu, na který ukazuje první nalezená polo¾ka.\n" + +#: info/infodoc.c:82 +#, fuzzy +msgid "" +"\\%-10[goto-node] Move to node specified by name.\n" +" You may include a filename as well, as in (FILENAME)NODENAME.\n" +msgstr " Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL.\n" + +#: info/infodoc.c:84 +#, fuzzy +msgid "" +"\\%-10[search] Search forward for a specified string\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" +" a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n" + +#: info/infodoc.c:86 +#, fuzzy +msgid "" +"\\%-10[search-backward] Search backward for a specified string\n" +" and select the node in which the previous occurrence is " +"found.\n" +msgstr "" +" a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n" + +#: info/infodoc.c:97 +#, c-format +msgid " %-10s Quit this help.\n" +msgstr " %-10s Ukonèení prohlí¾ení nápovìdy.\n" + +#: info/infodoc.c:98 +#, c-format +msgid " %-10s Quit Info altogether.\n" +msgstr " %-10s Celkové ukonèení Infa.\n" + +#: info/infodoc.c:99 +#, c-format +msgid " %-10s Invoke the Info tutorial.\n" +msgstr " %-10s Vyvolání prùvodce Infem.\n" + +#: info/infodoc.c:103 +#, c-format +msgid " %-10s Move to the `next' node of this node.\n" +msgstr " %-10s Pøesun na \"dal¹í\" uzel tohoto uzlu.\n" + +#: info/infodoc.c:104 +#, c-format +msgid " %-10s Move to the `previous' node of this node.\n" +msgstr " %-10s Pøesun na \"pøedchozí\" uzel tohoto uzlu.\n" + +#: info/infodoc.c:105 +#, c-format msgid " %-10s Move `up' from this node.\n" -msgstr " u Pøesun \"nahoru\" z aktuálního uzelu." +msgstr " %-10s Pøesun \"nahoru\" z aktuálního uzlu.\n" -#: info/infodoc.c:66 -#, fuzzy, c-format +#: info/infodoc.c:106 +#, c-format msgid " %-10s Pick menu item specified by name.\n" -msgstr " m Vybrání polo¾ky menu zadané pomocí jména." +msgstr " %-10s Vybrání polo¾ky menu zadané pomocí názvu.\n" -#: info/infodoc.c:67 -#, fuzzy +#: info/infodoc.c:107 msgid " Picking a menu item causes another node to be selected.\n" -msgstr " Vybírání polo¾ky menu zpùsobí zobrazení tohoto uzlu." +msgstr " Vybírání polo¾ky menu zpùsobí zobrazení tohoto uzlu.\n" -#: info/infodoc.c:68 -#, fuzzy, c-format +#: info/infodoc.c:108 +#, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" -msgstr " f Následování køí¾ového odkazu. Ètení jména odkazu." +msgstr " %-10s Následování køí¾ového odkazu. Ète název odkazu.\n" -#: info/infodoc.c:69 -#, fuzzy, c-format +#: info/infodoc.c:109 +#, c-format msgid " %-10s Move to the last node seen in this window.\n" -msgstr " l Pøesun na poslední zobrazený uzel v tomto oknì." +msgstr " %-10s Pøesun na poslední uzel zobrazený v tomto oknì.\n" -#: info/infodoc.c:70 -#, fuzzy, c-format +#: info/infodoc.c:110 +#, c-format msgid " %-10s Skip to next hypertext link within this node.\n" -msgstr " TAB Skok na dal¹í hypertextový odkaz v tomto uzlu." +msgstr " %-10s Skok na následující hypertextový odkaz v tomto uzlu.\n" -#: info/infodoc.c:71 -#, fuzzy, c-format +#: info/infodoc.c:111 +#, c-format msgid " %-10s Follow the hypertext link under cursor.\n" -msgstr " RET Následování hypertextového odkazu pod kurzorem." +msgstr " %-10s Následování hypertextového odkazu pod kurzorem.\n" -#: info/infodoc.c:72 -#, fuzzy, c-format +#: info/infodoc.c:112 +#, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" -msgstr " d Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'." +msgstr " %-10s Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'.\n" -#: info/infodoc.c:73 -#, fuzzy, c-format +#: info/infodoc.c:113 +#, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" -msgstr " d Pøesun do `adresáøového' uzlu. Rovnocenné s `g (DIR)'." +msgstr " %-10s Pøesun do nejvy¹¹ího (Top) uzlu. Rovnocenné s `g Top'.\n" -#: info/infodoc.c:75 -#, fuzzy -msgid "Other commands:\n" -msgstr "Dal¹í pøíkazy: " +#: info/infodoc.c:117 +#, c-format +msgid " %-10s Scroll forward a page.\n" +msgstr " %-10s Následující stránka.\n" -#: info/infodoc.c:76 -msgid "---------------\n" -msgstr "" +#: info/infodoc.c:118 +#, c-format +msgid " %-10s Scroll backward a page.\n" +msgstr " %-10s Pøedchozí stránka.\n" -#: info/infodoc.c:77 -#, fuzzy, c-format +#: info/infodoc.c:119 +#, c-format +msgid " %-10s Go to the beginning of this node.\n" +msgstr " %-10s Pøesun na zaèátek aktuálního uzlu.\n" + +#: info/infodoc.c:120 +#, c-format +msgid " %-10s Go to the end of this node.\n" +msgstr " %-10s Pøesun na konec tohoto uzlu.\n" + +#: info/infodoc.c:121 +#, c-format +msgid " %-10s Scroll forward 1 line.\n" +msgstr " %-10s Posun o jeden øádek dopøedu.\n" + +#: info/infodoc.c:122 +#, c-format +msgid " %-10s Scroll backward 1 line.\n" +msgstr " %-10s Posun o jeden øádek dozadu.\n" + +#: info/infodoc.c:126 +#, c-format msgid " %-10s Pick first ... ninth item in node's menu.\n" -msgstr " 1-9 Výbìr první ... deváté polo¾ky menu uzlu." +msgstr " %-10s Výbìr první ... deváté polo¾ky menu uzlu.\n" -#: info/infodoc.c:78 -#, fuzzy, c-format +#: info/infodoc.c:127 +#, c-format msgid " %-10s Pick last item in node's menu.\n" -msgstr " 0 Zobrazení poslední polo¾ky menu uzlu." +msgstr " %-10s Zobrazení poslední polo¾ky menu uzlu.\n" -#: info/infodoc.c:79 -#, fuzzy, c-format +#: info/infodoc.c:128 +#, c-format msgid "" " %-10s Search for a specified string in the index entries of this Info\n" -msgstr " i Hledání zadaného øetìzce v rejstøíku tohoto Info souboru a výbìr" +msgstr "" +" %-10s Hledání zadaného øetìzce v rejstøíku tohoto Info souboru a výbìr\n" -#: info/infodoc.c:80 -#, fuzzy +#: info/infodoc.c:129 msgid "" " file, and select the node referenced by the first entry " "found.\n" -msgstr " uzlu, na který ukazuje první nalezená polo¾ka." +msgstr " uzlu, na který ukazuje první nalezená polo¾ka.\n" -#: info/infodoc.c:81 -#, fuzzy, c-format +#: info/infodoc.c:130 +#, c-format msgid " %-10s Move to node specified by name.\n" -msgstr " g Pøesun na uzel zadaný pomocí jména." +msgstr " %-10s Pøesun na uzel zadaný pomocí jména.\n" -#: info/infodoc.c:82 -#, fuzzy +#: info/infodoc.c:131 msgid "" " You may include a filename as well, as in (FILENAME)NODENAME.\n" -msgstr " Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL." +msgstr " Také mù¾ete zadat jméno souboru ve tvaru (SOUBOR)UZEL.\n" -#: info/infodoc.c:83 +#: info/infodoc.c:132 #, fuzzy, c-format -msgid "" -" %-10s Search forward through this Info file for a specified string,\n" -msgstr " s Hledání zadaného øetìzce v tomto Info souboru." +msgid " %-10s Search forward for a specified string,\n" +msgstr " %-10s Hledání zadaného øetìzce v tomto Info souboru.\n" -#: info/infodoc.c:84 info/infodoc.c:86 -#, fuzzy +#: info/infodoc.c:133 info/infodoc.c:135 msgid "" " and select the node in which the next occurrence is found.\n" msgstr "" -" a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce." +" a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n" -#: info/infodoc.c:85 +#: info/infodoc.c:134 #, fuzzy, c-format -msgid " %-10s Search backward in this Info file for a specified string,\n" -msgstr " s Hledání zadaného øetìzce v tomto Info souboru." +msgid " %-10s Search backward for a specified string\n" +msgstr " %-10s Hledání zadaného øetìzce v tomto Info souboru.\n" -#: info/infodoc.c:258 +#: info/infodoc.c:313 msgid "The current search path is:\n" -msgstr "" +msgstr "Aktuální hledací cesta je:\n" -#: info/infodoc.c:261 -#, fuzzy +#: info/infodoc.c:316 msgid "" "Commands available in Info windows:\n" "\n" -msgstr "Základní pøíkazy v Info oknech" +msgstr "Pøíkazy dostupné v Info oknech:\n" -#: info/infodoc.c:264 +#: info/infodoc.c:319 msgid "" "Commands available in the echo area:\n" "\n" +msgstr "Pøíkazy dostupné v zobrazovacím poli:\n" + +#: info/infodoc.c:340 +#, fuzzy, c-format +msgid "" +"The following commands can only be invoked via %s:\n" +"\n" msgstr "" +"Následující pøíkazy mohou být vykonány pouze pomocí M-x:\n" +"\n" -#: info/infodoc.c:280 +#: info/infodoc.c:343 +#, fuzzy msgid "" -"The following commands can only be invoked via M-x:\n" +"The following commands cannot be invoked at all:\n" "\n" msgstr "" "Následující pøíkazy mohou být vykonány pouze pomocí M-x:\n" "\n" -#: info/infodoc.c:301 +#: info/infodoc.c:367 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" msgstr "" "--- Pou¾ijte `\\[history-node]' nebo `\\[kill-node]' pro ukonèení ---\n" -#. Create or move to the help window. -#: info/infodoc.c:411 +#: info/infodoc.c:477 msgid "Display help message" msgstr "Zobrazení nápovìdy" -#. Show the Info help node. This means that the "info" file is installed -#. where it can easily be found on your system. -#: info/infodoc.c:429 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" msgstr "Zobrazení Info uzlu `(info)Help'" -#: info/infodoc.c:555 +#: info/infodoc.c:638 msgid "Print documentation for KEY" msgstr "Zobrazení dokumentace ke KLÁVESE" -#: info/infodoc.c:568 +#: info/infodoc.c:650 #, c-format msgid "Describe key: %s" msgstr "Popis klávesy: %s" -#: info/infodoc.c:577 +#: info/infodoc.c:660 #, c-format msgid "ESC %s is undefined." msgstr "ESC %s je nedefinováno." -#: info/infodoc.c:594 +#: info/infodoc.c:676 info/infodoc.c:703 #, c-format msgid "%s is undefined." msgstr "%s je nedefinováno." -#: info/infodoc.c:620 +#: info/infodoc.c:724 #, c-format msgid "%s is defined to %s." msgstr "Klávesa %s je definována pro pøíkaz %s." -#: info/infodoc.c:812 +#: info/infodoc.c:1151 msgid "Show what to type to execute a given command" -msgstr "" +msgstr "Ukázání co napsat pro spu¹tìní daného pøíkazu" -#: info/infodoc.c:816 +#: info/infodoc.c:1155 msgid "Where is command: " msgstr "Kde je pøíkaz: " -#: info/infodoc.c:838 +#: info/infodoc.c:1177 #, c-format msgid "`%s' is not on any keys" msgstr "Pøíkaz `%s' není na ¾ádné klávese" -#: info/infodoc.c:844 +#: info/infodoc.c:1183 #, c-format msgid "%s can only be invoked via %s." msgstr "Pøíkaz %s mù¾e být vyvolán pouze pomocí %s." -#: info/infodoc.c:847 +#: info/infodoc.c:1186 #, c-format msgid "%s can be invoked via %s." msgstr "Pøíkaz %s mù¾e být vyvolán pomocí %s." -#: info/infodoc.c:851 +#: info/infodoc.c:1190 #, c-format msgid "There is no function named `%s'" msgstr "Funkce `%s' není známa" -#: info/m-x.c:69 +#: info/infokey.c:164 +msgid "incorrect number of arguments" +msgstr "" + +#: info/infokey.c:194 +#, fuzzy, c-format +msgid "cannot open input file `%s'" +msgstr "Rouru do `%s' nelze otevøít." + +#: info/infokey.c:207 +#, fuzzy, c-format +msgid "cannot create output file `%s'" +msgstr "Výstupní soubor `%s' nelze vytvoøit." + +#: info/infokey.c:217 +#, c-format +msgid "error writing to `%s'" +msgstr "" + +#: info/infokey.c:222 +#, fuzzy, c-format +msgid "error closing output file `%s'" +msgstr "Výstupní soubor `%s' nelze vytvoøit." + +#: info/infokey.c:443 +msgid "key sequence too long" +msgstr "" + +#: info/infokey.c:521 +msgid "missing key sequence" +msgstr "" + +#: info/infokey.c:600 +msgid "NUL character (\\000) not permitted" +msgstr "" + +#: info/infokey.c:629 +#, c-format +msgid "NUL character (^%c) not permitted" +msgstr "" + +#: info/infokey.c:652 +#, fuzzy +msgid "missing action name" +msgstr "%c%s chybìjící uzavírací závorka" + +#: info/infokey.c:667 info/infokey.c:733 +msgid "section too long" +msgstr "" + +#: info/infokey.c:673 +#, fuzzy, c-format +msgid "unknown action `%s'" +msgstr "Neznámý pøíkaz `%s'" + +#: info/infokey.c:682 +msgid "action name too long" +msgstr "" + +#: info/infokey.c:694 +#, c-format +msgid "extra characters following action `%s'" +msgstr "" + +#: info/infokey.c:704 +#, fuzzy +msgid "missing variable name" +msgstr "%s: chybí argument jména souboru.\n" + +#: info/infokey.c:712 +msgid "missing `=' immediately after variable name" +msgstr "" + +#: info/infokey.c:719 +msgid "variable name too long" +msgstr "" + +#: info/infokey.c:741 +msgid "value too long" +msgstr "" + +#: info/infokey.c:875 +#, c-format +msgid "\"%s\", line %u: " +msgstr "" + +#: info/infokey.c:891 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT-FILE]\n" +"\n" +"Compile infokey source file to infokey file. Reads INPUT-FILE (default\n" +"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n" +"\n" +"Options:\n" +" --output FILE output to FILE instead of $HOME/.info\n" +" --help display this help and exit.\n" +" --version display version information and exit.\n" +msgstr "" + +#: info/infomap.c:1397 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too small" +msgstr "" + +#: info/infomap.c:1400 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too big" +msgstr "" + +#: info/infomap.c:1413 +#, c-format +msgid "Error reading infokey file `%s' - short read" +msgstr "" + +#: info/infomap.c:1431 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1437 +#, c-format +msgid "Your infokey file `%s' is out of date -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1450 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1470 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section code) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1608 +msgid "Bad data in infokey file -- some key bindings ignored" +msgstr "" + +#: info/infomap.c:1659 +msgid "Bad data in infokey file -- some var settings ignored" +msgstr "" + +#: info/m-x.c:70 msgid "Read the name of an Info command and describe it" msgstr "Zadání jména pøíkazu a následné zobrazení jeho popisu" -#: info/m-x.c:73 +#: info/m-x.c:74 msgid "Describe command: " msgstr "Popis pøíkazu: " -#: info/m-x.c:96 +#: info/m-x.c:97 msgid "Read a command name in the echo area and execute it" msgstr "Zadání jména pøíkazu v zobrazovacím poli a jeho vykonání" -#: info/m-x.c:134 +#: info/m-x.c:141 msgid "Cannot execute an `echo-area' command here." msgstr "Pøíkaz zobrazovacího pole nelze vykonat zde." -#: info/m-x.c:150 +#: info/m-x.c:157 msgid "Set the height of the displayed window" msgstr "Nastavení vý¹ky obrazovky" -#: info/m-x.c:163 +#: info/m-x.c:170 #, c-format msgid "Set screen height to (%d): " msgstr "Vý¹ka obrazovky (%d): " -#: info/makedoc.c:132 +#: info/makedoc.c:161 info/makedoc.c:169 msgid "" " Source files groveled to make this file include:\n" "\n" @@ -721,7 +1029,7 @@ msgstr "" "Pøi zpracování zdrojového souboru jsou vkládány tyto soubory:\n" "\n" -#: info/makedoc.c:465 +#: info/makedoc.c:553 #, c-format msgid "Couldn't manipulate the file %s.\n" msgstr "Se souborem %s nelze pracovat.\n" @@ -758,565 +1066,518 @@ msgstr "Zobrazení uzlu, který byl zobrazen pøed tímto" msgid "Select visited node: " msgstr "Vyberte nav¹tívený uzel: " -#: info/nodemenu.c:331 info/session.c:2146 +#: info/nodemenu.c:331 info/session.c:2235 #, c-format msgid "The reference disappeared! (%s)." msgstr "Odkaz se ztratil! (%s)." -#: info/session.c:169 -#, fuzzy, c-format +#: info/session.c:170 +#, c-format msgid "" "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] " "for menu item." msgstr "" -" Vítejte v programu Info verze %s. \"\\[get-help-window]\" - nápovìda, " -"\"\\[menu-item]\" - polo¾ka menu." +"Vítejte v programu Info verze %s. Stisknìte \\[get-help-window] pro " +"nápovìdu, \\[menu-item] pro polo¾ku menu." -#. Move WINDOW's point down to the next line if possible. -#: info/session.c:642 +#: info/session.c:643 msgid "Move down to the next line" msgstr "Posun dolù na dal¹í øádek" -#. Move WINDOW's point up to the previous line if possible. -#: info/session.c:657 +#: info/session.c:658 msgid "Move up to the previous line" msgstr "Posun nahoru na pøedchozí øádek" -#. Move WINDOW's point to the end of the true line. -#: info/session.c:672 +#: info/session.c:673 msgid "Move to the end of the line" msgstr "Pøesun na konec øádku" -#. Move WINDOW's point to the beginning of the true line. -#: info/session.c:692 +#: info/session.c:693 msgid "Move to the start of the line" msgstr "Pøesun na zaèátek øádku" -#: info/session.c:884 makeinfo/node.c:1092 -#, fuzzy +#: info/session.c:885 makeinfo/node.c:1357 msgid "Next" msgstr "Dal¹í" -#: info/session.c:887 -#, fuzzy +#: info/session.c:888 msgid "Following Next node..." msgstr "Pøechod na dal¹í uzel..." -#: info/session.c:904 +#: info/session.c:905 msgid "Selecting first menu item..." msgstr "Zobrazování první polo¾ky menu..." -#: info/session.c:915 -#, fuzzy +#: info/session.c:916 msgid "Selecting Next node..." -msgstr "Zobrazování dal¹ího uzelu..." +msgstr "Zobrazování dal¹ího uzlu..." -#: info/session.c:985 +#: info/session.c:986 #, c-format msgid "Moving Up %d time(s), then Next." -msgstr "" +msgstr "Pøesouvání %d krát nahoru, potom na dal¹í." -#: info/session.c:1009 +#: info/session.c:1010 msgid "No more nodes within this document." msgstr "V tomto dokumentu ji¾ nejsou dal¹í uzly." -#: info/session.c:1033 -#, fuzzy +#: info/session.c:1034 msgid "No `Prev' for this node." msgstr "Pro tento uzel není pøedchozí uzel." -#. Move to the previous node. If this node now contains a menu, -#. and we have not inhibited movement to it, move to the node -#. corresponding to the last menu item. -#: info/session.c:1036 info/session.c:1091 -#, fuzzy +#: info/session.c:1037 info/session.c:1092 msgid "Moving Prev in this window." msgstr "Pøesun na pøedchozí uzel v tomto oknì." -#: info/session.c:1050 -#, fuzzy +#: info/session.c:1051 msgid "No `Prev' or `Up' for this node within this document." -msgstr "V tomto dokumentu ji¾ není pro tento uzel pøedchozí nebo vy¹¹í uzel." +msgstr "V tomto dokumentu není pro tento uzel pøedchozí nebo vy¹¹í uzel." -#: info/session.c:1053 -#, fuzzy +#: info/session.c:1054 msgid "Moving Up in this window." msgstr "Pøesun nahoru v tomto oknì." -#: info/session.c:1101 -#, fuzzy +#: info/session.c:1102 msgid "Moving to `Prev's last menu item." msgstr "Pøesun na poslední polo¾ku menu pøedchozího uzlu." -#: info/session.c:1112 +#: info/session.c:1113 msgid "Move forwards or down through node structure" msgstr "Pøesun na následující uzel nebo na první ni¾¹í v uzlové struktuøe" -#: info/session.c:1128 +#: info/session.c:1129 msgid "Move backwards or up through node structure" msgstr "Pøesun na pøedchozí uzel nebo na první vy¹¹í v uzlové struktuøe" -#. Show the next screen of WINDOW's node. -#: info/session.c:1143 +#: info/session.c:1229 msgid "Scroll forward in this window" msgstr "Posun o stránku dolù v tomto oknì" -#: info/session.c:1192 -#, fuzzy +#: info/session.c:1237 msgid "Scroll forward in this window and set default window size" +msgstr "Posun dopøedu v tomto oknì a nastavení implicitní velikosti okna" + +#: info/session.c:1245 +#, fuzzy +msgid "Scroll forward in this window staying within node" msgstr "Posun o stránku dolù v tomto oknì" -#. Show the previous screen of WINDOW's node. -#: info/session.c:1200 +#: info/session.c:1253 +#, fuzzy +msgid "" +"Scroll forward in this window staying within node and set default window size" +msgstr "Posun dopøedu v tomto oknì a nastavení implicitní velikosti okna" + +#: info/session.c:1261 msgid "Scroll backward in this window" msgstr "Posun o stránku nahoru v tomto oknì" -#: info/session.c:1244 -#, fuzzy +#: info/session.c:1269 msgid "Scroll backward in this window and set default window size" +msgstr "Posun dozadu v tomto oknì a nastavení implicitní velikosti okna" + +#: info/session.c:1278 +#, fuzzy +msgid "Scroll backward in this window staying within node" msgstr "Posun o stránku nahoru v tomto oknì" -#. Move to the beginning of the node. -#: info/session.c:1252 +#: info/session.c:1286 +#, fuzzy +msgid "" +"Scroll backward in this window staying within node and set default window " +"size" +msgstr "Posun dozadu v tomto oknì a nastavení implicitní velikosti okna" + +#: info/session.c:1294 msgid "Move to the start of this node" msgstr "Posun na zaèátek tohoto uzlu" -#. Move to the end of the node. -#: info/session.c:1259 +#: info/session.c:1301 msgid "Move to the end of this node" msgstr "Posun na konec tohoto uzlu" -#. Scroll the window forward by N lines. -#: info/session.c:1266 +#: info/session.c:1308 msgid "Scroll down by lines" -msgstr "" +msgstr "Posun dolù po øádcích" -#. Scroll the window backward by N lines. -#: info/session.c:1283 +#: info/session.c:1325 msgid "Scroll up by lines" -msgstr "" +msgstr "Posun nahoru po øádcích" -#: info/session.c:1301 +#: info/session.c:1343 msgid "Scroll down by half screen size" -msgstr "" +msgstr "Posun dolù o polovinu velikosti obrazovky" -#: info/session.c:1327 +#: info/session.c:1369 msgid "Scroll up by half screen size" -msgstr "" +msgstr "Posun nahoru o polovinu velikosti obrazovky" -#. **************************************************************** -#. -#. Commands for Manipulating Windows -#. -#. **************************************************************** -#. Make the next window in the chain be the active window. -#: info/session.c:1356 +#: info/session.c:1398 msgid "Select the next window" msgstr "Výbìr následujícího okna" -#. Make the previous window in the chain be the active window. -#: info/session.c:1395 +#: info/session.c:1437 msgid "Select the previous window" msgstr "Výbìr pøedchozího okna" -#. Split WINDOW into two windows, both showing the same node. If we -#. are automatically tiling windows, re-tile after the split. -#: info/session.c:1446 +#: info/session.c:1488 msgid "Split the current window" msgstr "Rozdìlení aktuálního okna" -#. Delete WINDOW, forgetting the list of last visited nodes. If we are -#. automatically displaying footnotes, show or remove the footnotes -#. window. If we are automatically tiling windows, re-tile after the -#. deletion. -#: info/session.c:1527 +#: info/session.c:1569 msgid "Delete the current window" msgstr "Smazání aktuálního okna" -#: info/session.c:1535 +#: info/session.c:1577 msgid "Cannot delete a permanent window" msgstr "Permanentní okno nelze smazat" -#. Just keep WINDOW, deleting all others. -#: info/session.c:1568 +#: info/session.c:1610 msgid "Delete all other windows" msgstr "Smazání v¹ech ostatních oknen" -#. Scroll the "other" window of WINDOW. -#: info/session.c:1614 +#: info/session.c:1656 msgid "Scroll the other window" msgstr "Posun druhého okna o stránku dolù" -#: info/session.c:1635 +#: info/session.c:1677 msgid "Scroll the other window backward" msgstr "Posun druhého okna o stránku zpìt" -#. Change the size of WINDOW by AMOUNT. -#: info/session.c:1641 +#: info/session.c:1683 msgid "Grow (or shrink) this window" msgstr "Zmìna velikosti okna" -#: info/session.c:1652 +#: info/session.c:1694 msgid "Divide the available screen space among the visible windows" msgstr "Zvìt¹ení nebo zmen¹ení oken na obrazovce tak, aby byla stejnì velká" -#: info/session.c:1659 +#: info/session.c:1701 msgid "Toggle the state of line wrapping in the current window" msgstr "" "Zmìna stavu zalamování v aktuálním oknì (zapnuto->vypni, vypnuto->zapni)" -#. Make WINDOW display the "Next:" node of the node currently being -#. displayed. -#: info/session.c:1838 -#, fuzzy +#: info/session.c:1880 msgid "Select the Next node" msgstr "Zobrazení následujícího uzlu" -#. Make WINDOW display the "Prev:" node of the node currently being -#. displayed. -#: info/session.c:1846 -#, fuzzy +#: info/session.c:1888 msgid "Select the Prev node" msgstr "Zobrazení pøedchozího uzlu" -#. Make WINDOW display the "Up:" node of the node currently being -#. displayed. -#: info/session.c:1854 -#, fuzzy +#: info/session.c:1896 msgid "Select the Up node" msgstr "Zobrazení vy¹¹ího uzlu" -#. Make WINDOW display the last node of this info file. -#: info/session.c:1861 +#: info/session.c:1903 msgid "Select the last node in this file" msgstr "Zobrazení posledního uzlu v tomto souboru" -#: info/session.c:1888 info/session.c:1921 +#: info/session.c:1930 info/session.c:1963 msgid "This window has no additional nodes" msgstr "Toto okno nemá více dal¹ích uzlù" -#. Make WINDOW display the first node of this info file. -#: info/session.c:1894 +#: info/session.c:1936 msgid "Select the first node in this file" msgstr "Zobrazení prvního uzlu v tomto souboru" -#: info/session.c:1928 +#: info/session.c:1970 msgid "Select the last item in this node's menu" msgstr "Zobrazení poslední polo¾ky menu tohoto uzlu" -#. Use KEY (a digit) to select the Nth menu item in WINDOW->node. -#: info/session.c:1934 +#: info/session.c:1976 msgid "Select this menu item" msgstr "Zobrazení této polo¾ky menu" -#: info/session.c:1963 +#: info/session.c:2005 #, c-format msgid "There aren't %d items in this menu." msgstr "V tomto menu není %d. polo¾ka" -#: info/session.c:2094 +#: info/session.c:2148 #, c-format msgid "Menu item (%s): " msgstr "Polo¾ka menu (%s): " -#: info/session.c:2096 +#: info/session.c:2150 msgid "Menu item: " msgstr "Polo¾ka menu: " -#: info/session.c:2101 +#: info/session.c:2155 #, c-format msgid "Follow xref (%s): " msgstr "Následování køí¾ového odkazu (%s): " -#: info/session.c:2103 +#: info/session.c:2157 msgid "Follow xref: " msgstr "Následování køí¾ového odkazu: " -#. Read a line (with completion) which is the name of a menu item, -#. and select that item. -#: info/session.c:2191 +#: info/session.c:2280 msgid "Read a menu item and select its node" msgstr "Zadání jména polo¾ky menu a následné zobrazení" -#: info/session.c:2199 +#: info/session.c:2288 msgid "Read a footnote or cross reference and select its node" msgstr "" "Zadání jména poznámky pod èarou nebo køí¾ového odkazu a následné zobrazení" -#. Position the cursor at the start of this node's menu. -#: info/session.c:2205 +#: info/session.c:2294 msgid "Move to the start of this node's menu" msgstr "Pøesun na zaèátek menu tohoto uzlu" -#: info/session.c:2229 +#: info/session.c:2318 msgid "Visit as many menu items at once as possible" msgstr "" "Nav¹tívení tolika polo¾ek menu, kolik je mo¾no. Ka¾dá polo¾ka v jiném oknì." -#. Read a line of input which is a node name, and go to that node. -#: info/session.c:2257 +#: info/session.c:2346 msgid "Read a node name and select it" msgstr "Zadání jména uzlu a jeho následné zobrazení" -#: info/session.c:2312 info/session.c:2316 +#: info/session.c:2401 info/session.c:2405 msgid "Goto node: " msgstr "Pøesun na uzel: " -#: info/session.c:2382 -#, fuzzy, c-format +#: info/session.c:2471 +#, c-format msgid "No menu in node `%s'." -msgstr "V uzlu \"%s\" není menu." +msgstr "V uzlu `%s' není menu." -#: info/session.c:2422 -#, fuzzy, c-format +#: info/session.c:2516 +#, c-format msgid "No menu item `%s' in node `%s'." -msgstr "Polo¾ka menu \"%s\" v uzlu \"%s\" není." +msgstr "Polo¾ka menu `%s' v uzlu `%s' není." -#: info/session.c:2452 -#, fuzzy, c-format +#: info/session.c:2546 +#, c-format msgid "Unable to find node referenced by `%s' in `%s'." -msgstr "Uzel, na který se \"%s\" odkazuje, nelze v \"%s\" najít." +msgstr "Uzel, na který se odkazuje `%s' v `%s', nelze najít." -#: info/session.c:2503 +#: info/session.c:2597 msgid "Read a list of menus starting from dir and follow them" msgstr "Ètení seznamu menu zaèínajíce v adresáøi a pokraèujíce dále" -#: info/session.c:2505 +#: info/session.c:2599 msgid "Follow menus: " msgstr "Následování menu: " -#: info/session.c:2703 +#: info/session.c:2797 msgid "Find the node describing program invocation" -msgstr "" +msgstr "Nalezení uzlu popisujícího pøepínaèe programu" -#: info/session.c:2705 +#: info/session.c:2799 #, c-format msgid "Find Invocation node of [%s]: " -msgstr "" +msgstr "Nalezení uzlu s pøepínaèi programu [%s]: " -#: info/session.c:2743 +#: info/session.c:2837 msgid "Read a manpage reference and select it" msgstr "Zadání jména manuálové stránky a následné zobrazení" -#: info/session.c:2747 +#: info/session.c:2841 msgid "Get Manpage: " msgstr "Manuálová stránka: " -#. Move to the "Top" node in this file. -#: info/session.c:2777 +#: info/session.c:2871 msgid "Select the node `Top' in this file" msgstr "Zobrazení nejvy¹¹ího uzlu v tomto souboru" -#. Move to the node "(dir)Top". -#: info/session.c:2783 +#: info/session.c:2877 msgid "Select the node `(dir)'" msgstr "Zobrazení uzlu `(dir)'" -#: info/session.c:2803 +#: info/session.c:2897 #, c-format msgid "Kill node (%s): " msgstr "Zru¹ení uzlu (%s): " -#: info/session.c:2857 +#: info/session.c:2951 #, c-format msgid "Cannot kill node `%s'" msgstr "Uzel `%s' nelze zru¹it" -#: info/session.c:2867 +#: info/session.c:2961 msgid "Cannot kill the last node" msgstr "Poslední uzel nelze zru¹it" -#: info/session.c:2953 +#: info/session.c:3047 msgid "Select the most recently selected node" msgstr "Zobrazení poslední dobou nejvíce nav¹tìvovaných uzlù" -#. Kill named node. -#: info/session.c:2959 +#: info/session.c:3053 msgid "Kill this node" msgstr "Zru¹ení tohoto uzlu" -#. Read the name of a file and select the entire file. -#: info/session.c:2967 +#: info/session.c:3061 msgid "Read the name of a file and select it" msgstr "Zadání jména souboru a jeho následné zobrazení" -#: info/session.c:2971 +#: info/session.c:3065 msgid "Find file: " msgstr "Nalezení souboru: " -#: info/session.c:2988 -#, fuzzy, c-format +#: info/session.c:3082 +#, c-format msgid "Cannot find `%s'." -msgstr "Nemohu najít \"%s\"." +msgstr "Nelze najít `%s'." -#: info/session.c:3033 info/session.c:3154 -#, fuzzy, c-format +#: info/session.c:3127 info/session.c:3248 +#, c-format msgid "Could not create output file `%s'." -msgstr "Výstupní soubor \"%s\" nelze vytvoøit." +msgstr "Výstupní soubor `%s' nelze vytvoøit." -#: info/session.c:3046 info/session.c:3171 info/session.c:3232 +#: info/session.c:3140 info/session.c:3265 info/session.c:3326 msgid "Done." msgstr "Dokonèeno." -#. Maybe we should print some information about the node being output. -#: info/session.c:3102 -#, fuzzy, c-format +#: info/session.c:3196 +#, c-format msgid "Writing node %s..." -msgstr "Zapisuji uzel \"%s\"..." +msgstr "Zapisování uzlu %s..." -#: info/session.c:3180 +#: info/session.c:3274 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" msgstr "Poslání obsahu tohoto uzlu pøíkazu INFO_PRINT_COMMAND" -#: info/session.c:3216 -#, fuzzy, c-format +#: info/session.c:3310 +#, c-format msgid "Cannot open pipe to `%s'." -msgstr "Rouru do \"%s\" nelze otevøít." +msgstr "Rouru do `%s' nelze otevøít." -#. Maybe we should print some information about the node being output. -#: info/session.c:3222 -#, fuzzy, c-format +#: info/session.c:3316 +#, c-format msgid "Printing node %s..." -msgstr "Probíhá tisk uzelu \"%s\"..." +msgstr "Probíhá tisk uzlu %s..." -#: info/session.c:3464 -#, fuzzy, c-format +#: info/session.c:3558 +#, c-format msgid "Searching subfile %s ..." -msgstr "Probíhá hledání podsouboru \"%s\"..." +msgstr "Probíhá hledání podsouboru %s..." -#: info/session.c:3516 -#, fuzzy +#: info/session.c:3610 msgid "Read a string and search for it case-sensitively" -msgstr "Pøeètení øetìzce a jeho vyhledání" +msgstr "Pøeètení øetìzce a jeho vyhledání (zále¾í na velikosti písmen)" -#: info/session.c:3523 +#: info/session.c:3617 msgid "Read a string and search for it" msgstr "Pøeètení øetìzce a jeho vyhledání" -#: info/session.c:3531 -#, fuzzy +#: info/session.c:3625 msgid "Read a string and search backward for it" -msgstr "Pøeètení øetìzce a jeho vyhledání" +msgstr "Pøeètení øetìzce a jeho vyhledání (zpìtné)" -#: info/session.c:3573 -#, fuzzy, c-format +#: info/session.c:3667 +#, c-format msgid "%s%sfor string [%s]: " -msgstr "%s øetìzce [%s]: " +msgstr "%s%søetìzce [%s]: " -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search backward" msgstr "Zpìtné hledání" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search" msgstr "Hledání" -#: info/session.c:3575 +#: info/session.c:3669 msgid " case-sensitively " -msgstr "" +msgstr " (velikost rozhoduje)" -#: info/session.c:3575 +#: info/session.c:3669 msgid " " -msgstr "" +msgstr " " -#: info/session.c:3615 +#: info/session.c:3709 msgid "Search failed." msgstr "Nebylo nalezeno." -#: info/session.c:3633 +#: info/session.c:3727 msgid "Repeat last search in the same direction" -msgstr "" +msgstr "Opakování posledního hledání tím samým smìrem" -#: info/session.c:3636 info/session.c:3646 -#, fuzzy +#: info/session.c:3730 info/session.c:3740 msgid "No previous search string" -msgstr "Není zadán øetìzec, který se má vyhledávat v rejstøíku(cích)." +msgstr "Není pøedchozí hledaný øetìzec" -#: info/session.c:3643 +#: info/session.c:3737 msgid "Repeat last search in the reverse direction" -msgstr "" +msgstr "Opakování posledního hledání opaèným smìrem" -#: info/session.c:3661 info/session.c:3667 +#: info/session.c:3755 info/session.c:3761 msgid "Search interactively for a string as you type it" msgstr "Vyhledávání zadávaného øetìzce hned pøi zadávání" -#: info/session.c:3761 +#: info/session.c:3855 msgid "I-search backward: " msgstr "zpìtné interaktivní hledání: " -#: info/session.c:3763 +#: info/session.c:3857 msgid "I-search: " msgstr "interaktivní hledání: " -#: info/session.c:3788 +#: info/session.c:3882 msgid "Failing " msgstr "Bezvýsledné " -#: info/session.c:4244 +#: info/session.c:4340 msgid "Move to the previous cross reference" msgstr "Pøesun na pøedcházející køí¾ový odkaz" -#: info/session.c:4253 +#: info/session.c:4349 msgid "Move to the next cross reference" msgstr "Pøesun na následující køí¾ový odkaz" -#: info/session.c:4263 +#: info/session.c:4359 msgid "Select reference or menu item appearing on this line" msgstr "Zobrazení odkazu nebo polo¾ky menu, která je na tomto øádku" -#. **************************************************************** -#. -#. Miscellaneous Info Commands -#. -#. **************************************************************** -#. What to do when C-g is pressed in a window. -#: info/session.c:4285 +#: info/session.c:4381 msgid "Cancel current operation" msgstr "Zru¹ení aktuální operace" -#: info/session.c:4292 +#: info/session.c:4388 msgid "Quit" msgstr "Ukonèení operace" -#: info/session.c:4301 +#: info/session.c:4397 msgid "Move the cursor to a specific line of the window" msgstr "Pøesun kurzoru na zadaný øádek okna" -#. Clear the screen and redraw its contents. Given a numeric argument, -#. move the line the cursor is on to the COUNT'th line of the window. -#: info/session.c:4333 +#: info/session.c:4429 msgid "Redraw the display" msgstr "Pøekreslení obrazovky" -#. This command does nothing. It is the fact that a key is bound to it -#. that has meaning. See the code at the top of info_session (). -#: info/session.c:4370 +#: info/session.c:4466 msgid "Quit using Info" msgstr "Ukonèení Infa" -#: info/session.c:4393 +#: info/session.c:4479 +msgid "Run command bound to this key's lowercase variant" +msgstr "" + +#: info/session.c:4491 #, c-format msgid "Unknown command (%s)." msgstr "Neznámý pøíkaz (%s)." -#: info/session.c:4396 +#: info/session.c:4494 msgid "\"\" is invalid" msgstr "Sekvence kláves \"\" je neplatná" -#: info/session.c:4397 +#: info/session.c:4495 #, c-format msgid "\"%s\" is invalid" msgstr "Sekvence kláves \"%s\" je neplatná" -#: info/session.c:4620 +#: info/session.c:4713 msgid "Add this digit to the current numeric argument" msgstr "Pøidání této èíslice do aktuálního èíselného argumentu" -#: info/session.c:4629 +#: info/session.c:4722 msgid "Start (or multiply by 4) the current numeric argument" msgstr "Zaèátek (nebo dìlení ètyømi) aktuálního èíselného argumentu" -#: info/session.c:4644 +#: info/session.c:4737 msgid "Internally used by \\[universal-argument]" msgstr "Vnitønì u¾íváno funkcí \\[universal-argument]" @@ -1324,692 +1585,739 @@ msgstr "Vnitønì u¾íváno funkcí \\[universal-argument]" msgid "readline: Out of virtual memory!\n" msgstr "readline: Nedostatek virtuální pamìti!\n" -#: info/variables.c:40 +#: info/variables.c:37 msgid "When \"On\", footnotes appear and disappear automatically" msgstr "Je-li zapnuto, pak se poznámky pod èarou objevují a mizí automaticky" -#: info/variables.c:44 +#: info/variables.c:41 msgid "When \"On\", creating or deleting a window resizes other windows" msgstr "Je-li zapnuto, vytvoøení a smazání okna, mìní velikost ostatních oken" -#: info/variables.c:48 +#: info/variables.c:45 msgid "When \"On\", flash the screen instead of ringing the bell" msgstr "Je-li zapnuto, pak místo varovného pípnutí blikne obrazovka" -#: info/variables.c:52 +#: info/variables.c:49 msgid "When \"On\", errors cause the bell to ring" msgstr "Je-li zapnuto, pak chyby zpùsobí varovné pípnutí" -#: info/variables.c:56 +#: info/variables.c:53 msgid "When \"On\", Info garbage collects files which had to be uncompressed" msgstr "" "Je-li zapnuto, pak Info zapomíná odkomprimovanou èást komprimovaných souborù" -#: info/variables.c:59 +#: info/variables.c:56 msgid "When \"On\", the portion of the matched search string is highlighted" msgstr "Je-li zapnuto, pak je hledaný øetìzec v nalezeném výrazu zvýraznìn" -#: info/variables.c:63 +#: info/variables.c:60 msgid "Controls what happens when scrolling is requested at the end of a node" msgstr "Øídí co se stane, kdy¾ je po¾adován posun o stranu na konci uzlu" -#: info/variables.c:67 +#: info/variables.c:64 msgid "The number lines to scroll when the cursor moves out of the window" msgstr "" "Poèet øádkù, o které posunout okno, kdy¾ se kurzor dostane mimo viditelnou " "èást" -#: info/variables.c:71 +#: info/variables.c:68 msgid "When \"On\", Info accepts and displays ISO Latin characters" msgstr "Je-li zapnuto, pak Info akceptuje a zobrazuje znaky z normy ISO Latin" -#: info/variables.c:77 +#: info/variables.c:74 msgid "Explain the use of a variable" msgstr "Zobrazení popisu promìnné" -#. Get the variable's name. -#: info/variables.c:83 +#: info/variables.c:80 msgid "Describe variable: " msgstr "Popis promìnné: " -#: info/variables.c:102 +#: info/variables.c:99 msgid "Set the value of an Info variable" msgstr "Nastavení hodnoty Info promìnné" -#. Get the variable's name and value. -#: info/variables.c:108 +#: info/variables.c:105 msgid "Set variable: " msgstr "Nastavení promìnné: " -#: info/variables.c:126 +#: info/variables.c:123 #, c-format msgid "Set %s to value (%d): " msgstr "Nastavení promìnné %s na hodnotu (%d): " -#: info/variables.c:167 +#: info/variables.c:164 #, c-format msgid "Set %s to value (%s): " msgstr "Nastavení promìnné %s na hodnotu (%s): " -#: info/window.c:1101 +#: info/window.c:1164 msgid "--*** Tags out of Date ***" msgstr "--*** Znaèky jsou zastatalé ***" -#. strlen (location_indicator). -#. 10 for the decimal representation of the number of lines in this -#. node, and the remainder of the text that can appear in the line. -#: info/window.c:1112 +#: info/window.c:1175 msgid "-----Info: (), lines ----, " msgstr "-----Info: (), øádkù ----, " -#: info/window.c:1119 +#: info/window.c:1182 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "-%s---Info: %s, øádkù: %d --%s--" -#: info/window.c:1123 +#: info/window.c:1186 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "-%s%s-Info: (%s)%s, øádkù: %d --%s--" -#: info/window.c:1130 +#: info/window.c:1193 #, c-format msgid " Subfile: %s" msgstr " Podsoubor: %s" -#: lib/getopt.c:680 +#: lib/getopt.c:675 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: pøepínaè `%s' není jednoznaèný\n" -#: lib/getopt.c:704 +#: lib/getopt.c:700 #, 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:709 +#: lib/getopt.c:705 #, 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:726 lib/getopt.c:899 +#: lib/getopt.c:723 lib/getopt.c:896 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: pøepínaè `%s' vy¾aduje argument\n" -#. --option -#: lib/getopt.c:755 +#: lib/getopt.c:752 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: neznámý pøepínaè `--%s'\n" -#. +option or -option -#: lib/getopt.c:759 +#: lib/getopt.c:756 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: neznámý pøepínaè `%c%s'\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:785 +#: lib/getopt.c:782 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: neznámý pøepínaè -- %c\n" -#: lib/getopt.c:788 +#: lib/getopt.c:785 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: neznámý pøepínaè -- %c\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:818 lib/getopt.c:948 +#: lib/getopt.c:815 lib/getopt.c:945 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: pøepínaè vy¾aduje argument -- %c\n" -#: lib/getopt.c:865 +#: lib/getopt.c:862 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: pøepínaè `-W %s' není jednoznaèný\n" -#: lib/getopt.c:883 +#: lib/getopt.c:880 #, 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" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "January" -msgstr "" +msgstr "Leden" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "February" -msgstr "" +msgstr "Únor" -#: makeinfo/cmds.c:447 -#, fuzzy +#: makeinfo/cmds.c:515 msgid "March" -msgstr "Hledání" +msgstr "Bøezen" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "April" -msgstr "" +msgstr "Duben" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "May" -msgstr "" +msgstr "Kvìten" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "June" -msgstr "" +msgstr "Èerven" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "July" -msgstr "" +msgstr "Èervenec" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "August" -msgstr "" +msgstr "Srpen" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "September" -msgstr "" +msgstr "Záøí" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "October" -msgstr "" +msgstr "Øíjen" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "November" -msgstr "" +msgstr "Listopad" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "December" -msgstr "" +msgstr "Prosinec" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:658 #, c-format msgid "unlikely character %c in @var" -msgstr "" +msgstr "nepravdìpodobný znak %c ve @var" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:701 msgid "@sc argument all uppercase, thus no effect" +msgstr "@sc argument je celý velkými písmeny, zbyteènì" + +#: makeinfo/cmds.c:759 +#, fuzzy, c-format +msgid "`{' expected, but saw `%c'" +msgstr "`@end' vy¾aduje `%s', ale vidí `%s'" + +#: makeinfo/cmds.c:789 +msgid "end of file inside verb block" msgstr "" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:797 #, fuzzy, c-format +msgid "`}' expected, but saw `%c'" +msgstr "`@end' vy¾aduje `%s', ale vidí `%s'" + +#: makeinfo/cmds.c:942 +#, c-format msgid "%c%s is obsolete" -msgstr "%c%s chbìjící uzavírací závorka" +msgstr "Pøíkaz %c%s je zastaralý" -#: makeinfo/cmds.c:814 -#, fuzzy, c-format +#: makeinfo/cmds.c:1014 +#, c-format msgid "@sp requires a positive numeric argument, not `%s'" -msgstr "%c%s po¾aduje jméno" +msgstr "@sp vy¾aduje kladný èíselný argument a ne `%s'" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" -msgstr "" +msgstr "©patný argument pro %c%s" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142 msgid "none" msgstr "none" -#: makeinfo/defun.c:83 +#: makeinfo/defun.c:85 msgid "Missing `}' in @def arg" -msgstr "" +msgstr "Chybìjící `}' v argumentu @def" -#: makeinfo/defun.c:358 +#: makeinfo/defun.c:363 msgid "Function" -msgstr "" +msgstr "Funkce" -#: makeinfo/defun.c:361 +#: makeinfo/defun.c:366 msgid "Macro" -msgstr "" +msgstr "Makro" -#: makeinfo/defun.c:364 +#: makeinfo/defun.c:369 msgid "Special Form" -msgstr "" +msgstr "Speciální forma" -#: makeinfo/defun.c:368 -#, fuzzy +#: makeinfo/defun.c:373 msgid "Variable" -msgstr "Nastavení promìnné: " +msgstr "Promìnná" -#: makeinfo/defun.c:371 -#, fuzzy +#: makeinfo/defun.c:376 msgid "User Option" -msgstr "Vlo¾ení doplnìní" +msgstr "U¾ivatelská volba" -#: makeinfo/defun.c:375 -#, fuzzy +#: makeinfo/defun.c:380 msgid "Instance Variable" -msgstr "Popis promìnné: " +msgstr "Instance promìnné" -#: makeinfo/defun.c:379 +#: makeinfo/defun.c:384 msgid "Method" -msgstr "" +msgstr "Metoda" -#: makeinfo/defun.c:450 makeinfo/defun.c:454 makeinfo/defun.c:556 -#: makeinfo/defun.c:570 makeinfo/defun.c:610 +#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615 +#: makeinfo/defun.c:631 makeinfo/defun.c:671 msgid "of" -msgstr "" +msgstr "z" -#: makeinfo/defun.c:458 makeinfo/defun.c:462 makeinfo/defun.c:466 -#: makeinfo/defun.c:564 makeinfo/defun.c:615 -#, fuzzy +#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482 +#: makeinfo/defun.c:624 makeinfo/defun.c:676 msgid "on" -msgstr "none" +msgstr "" -#: makeinfo/defun.c:656 +#: makeinfo/defun.c:717 #, c-format msgid "Must be in `%s' insertion to use `%sx'" msgstr "" -#: makeinfo/files.c:460 +#: makeinfo/files.c:448 #, c-format msgid "%s: getwd: %s, %s\n" -msgstr "" +msgstr "%s: getwd: %s, %s\n" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" -msgstr "" +msgstr "`%c%s' potøebuje argument `{...}' a ne pouze `%s'" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" -msgstr "" +msgstr "Chybí uzavírací závorka pro poznámku pod èarou `%s'" -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" -msgstr "" +msgstr "Poznámka pod èarou definována bez rodièovského uzlu" + +#: makeinfo/footnote.c:210 +#, fuzzy +msgid "Footnotes inside footnotes are not allowed" +msgstr "Poznámka pod èarou definována bez rodièovského uzlu" -#: makeinfo/footnote.c:278 +#: makeinfo/footnote.c:298 msgid "Footnotes" -msgstr "" +msgstr "Poznámky pod èarou" -#. The <title> should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:42 msgid "Untitled" +msgstr "Neoznaèeno" + +#: makeinfo/html.c:298 +#, c-format +msgid "Invalid node name: `%s'" msgstr "" -#: makeinfo/index.c:212 -#, fuzzy, c-format +#: makeinfo/index.c:213 +#, c-format msgid "Unknown index `%s'" -msgstr "Neznámý pøíkaz `%s'" +msgstr "Neznámý rejstøík `%s'" -#: makeinfo/index.c:382 -#, fuzzy, c-format +#: makeinfo/index.c:238 +#, c-format +msgid "Info cannot handle `:' in index entry `%s'" +msgstr "" + +#: makeinfo/index.c:396 +#, c-format msgid "Index `%s' already exists" -msgstr "polo¾ka menu `%s' ji¾ pro soubor `%s' existuje" +msgstr "Rejstøík `%s' ji¾ existuje" -#: makeinfo/index.c:425 +#: makeinfo/index.c:439 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" -msgstr "" +msgstr "Neznámý rejstøík `%s' a/nebo `%s' v @synindex" -#: makeinfo/index.c:642 +#: makeinfo/index.c:666 #, c-format msgid "Unknown index `%s' in @printindex" -msgstr "" +msgstr "Neznámý rejstøík `%s' v @printindex" -#: makeinfo/index.c:680 +#: makeinfo/index.c:709 #, c-format msgid "Entry for index `%s' outside of any node" -msgstr "" +msgstr "Polo¾ka pro rejstøík `%s' je mimo v¹echny uzly" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:712 makeinfo/index.c:751 msgid "(outside of any node)" -msgstr "" +msgstr "(mimo v¹echny uzly)" -#: makeinfo/insertion.c:192 +#: makeinfo/insertion.c:198 msgid "Broken-Type in insertion_type_pname" -msgstr "" +msgstr "Chybný typ v insertion_type_pname" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:271 msgid "Enumeration stack overflow" -msgstr "" +msgstr "Výpoèetní zásobník pøetekl" -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:303 #, c-format msgid "lettering overflow, restarting at %c" -msgstr "" +msgstr "písmenkování pøeteklo, znovu zaèínám na %c" -#: makeinfo/insertion.c:481 -#, fuzzy, c-format +#: makeinfo/insertion.c:538 +#, c-format msgid "%s requires an argument: the formatter for %citem" -msgstr "%s: pøepínaè vy¾aduje argument -- %c\n" +msgstr "%s vy¾aduje argument : formátovaè pro %citem" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:693 #, c-format msgid "`@end' expected `%s', but saw `%s'" -msgstr "" +msgstr "`@end' vy¾aduje `%s', ale vidí `%s'" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:931 #, c-format msgid "No matching `%cend %s'" -msgstr "" +msgstr "Chybí odpovídající `%cend %s'" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:1084 #, c-format msgid "%s requires letter or digit" +msgstr "%s vy¾aduje písmeno nebo èíslici" + +#: makeinfo/insertion.c:1158 +msgid "end of file inside verbatim block" msgstr "" -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1318 msgid "@menu seen before first @node, creating `Top' node" -msgstr "" +msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1319 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" +"proto¾e vá¹ uzel @top by mìl být uzavøen v @ifnottex spí¹e ne¾ v @ifinfo?" -#. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1331 msgid "@detailmenu seen before first node, creating `Top' node" -msgstr "" +msgstr "@detailmenu spatøeno pøed prvním uzlem, vytvoøen uzel `Top'" -#: makeinfo/insertion.c:1074 -#, fuzzy, c-format +#: makeinfo/insertion.c:1346 +#, c-format msgid "Unmatched `%c%s'" -msgstr "Nepárová }" +msgstr "Nepárový `%c%s'" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1353 #, c-format msgid "`%c%s' needs something after it" -msgstr "" +msgstr "`%c%s' potøebuje nìjaký argument" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1359 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" -msgstr "" +msgstr "Chybný argument pro `%s', `%s', pou¾ívám `%s'" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1453 #, c-format msgid "@%s not meaningful inside `@%s' block" -msgstr "" +msgstr "@%s není myslitelné uvnitø `@%s' bloku" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1462 #, c-format msgid "@itemx not meaningful inside `%s' block" -msgstr "" +msgstr "@itemx není myslitelný uvnitø `%s' bloku" -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1646 #, c-format msgid "%c%s found outside of an insertion block" -msgstr "" +msgstr "%c%s nalezen mimo vkládaný blok" -#: makeinfo/lang.c:199 +#: makeinfo/lang.c:331 #, 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:384 +#, fuzzy, c-format +msgid "unrecogized encoding name `%s'" +msgstr "%s: neznámý pøepínaè `--%s'\n" + +#: makeinfo/lang.c:387 +#, c-format +msgid "sorry, encoding `%s' not supported" msgstr "" -#. This error message isn't perfect if the argument is multiple -#. characters, but it doesn't seem worth getting right. -#: makeinfo/lang.c:406 +#: makeinfo/lang.c:414 #, c-format -msgid "%c%s expects `i' or `j' as argument, not `%c'" +msgid "invalid encoded character `%s'" msgstr "" -#: makeinfo/lang.c:410 +#: makeinfo/lang.c:502 +#, fuzzy, c-format +msgid "%s is an invalid ISO code, using %c" +msgstr "%s není platný kód jazyka (podle ISO 639)" + +#: makeinfo/lang.c:687 +#, 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:691 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" -msgstr "" +msgstr "%c%s vy¾aduje jeden znak `i' nebo `j' jako argument" #: makeinfo/macro.c:134 #, c-format msgid "macro `%s' previously defined" -msgstr "" +msgstr "makro `%s' ji¾ bylo definováno" #: makeinfo/macro.c:138 -#, fuzzy, c-format +#, c-format msgid "here is the previous definition of `%s'" -msgstr "Funkce `%s' není známa" +msgstr "zde je pøedchozí definice `%s'" #: makeinfo/macro.c:355 #, c-format msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name" -msgstr "" +msgstr "\\ pøi expanzi makra následováno `%s' místo \\ nebo jména parametru" #: makeinfo/macro.c:403 #, c-format msgid "Macro `%s' called on line %d with too many args" -msgstr "" +msgstr "Makro `%s' volané na øádku %d s pøíli¹ mnoha argumenty" -#: makeinfo/macro.c:595 +#: makeinfo/macro.c:594 #, c-format msgid "%cend macro not found" -msgstr "" +msgstr "%cend makro nebylo nalezeno" -#: makeinfo/macro.c:634 +#: makeinfo/macro.c:632 msgid "@quote-arg only useful for single-argument macros" -msgstr "" +msgstr "@quote-arg je u¾iteèné pouze pro jedno-argumentová makra" -#: makeinfo/macro.c:670 +#: makeinfo/macro.c:668 #, c-format msgid "mismatched @end %s with @%s" -msgstr "" +msgstr "pomíchané @end %s s @%s" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:316 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: varování: " -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:339 msgid "Too many errors! Gave up.\n" msgstr "Pøíli¹ mnoho chyb! Konec.\n" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026 #, c-format msgid "Misplaced %c" msgstr "©patnì umístìný znak %c" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:370 #, 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:365 +#: makeinfo/makeinfo.c:373 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" +msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n" + +#: makeinfo/makeinfo.c:376 +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:380 #, c-format msgid "" -"Usage: %s [OPTION]... TEXINFO-FILE...\n" -"\n" -"Translate Texinfo source documentation to various other formats:\n" -"Info files suitable for reading online with Emacs or standalone GNU Info\n" -"(by default); plain text (with --no-headers); or HTML (with --html).\n" -"\n" -"Options:\n" -" --commands-in-node-names allow @ commands in node names.\n" -" -D VAR define a variable, as with @set.\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" --error-limit=NUM quit after NUM errors (default %d).\n" -" --fill-column=NUM break Info lines at NUM characters (default %d).\n" -" --footnote-style=STYLE output footnotes according to STYLE:\n" -" `separate' to place footnotes in their own " -"node,\n" -" `end' to place the footnotes at the end of the\n" -" node in which they are defined (the default).\n" -" --force preserve output even if errors.\n" -" --help display this help and exit.\n" -" --html output HTML rather than Info format;\n" -" -I DIR append DIR to the @include search path.\n" -" --ifhtml process @ifhtml and @html text even when not\n" -" generating HTML.\n" -" --ifinfo process @ifinfo text even when generating HTML.\n" -" --iftex process @iftex and @tex text.\n" -" implies --no-split.\n" -msgstr "" - -#: makeinfo/makeinfo.c:391 -#, fuzzy, c-format +"General options:\n" +" --error-limit=NUM quit after NUM errors (default %d).\n" +" --force preserve output even if errors.\n" +" --help display this help and exit.\n" +" --no-validate suppress node cross-reference validation.\n" +" --no-warn suppress warnings (but not errors).\n" +" --reference-limit=NUM warn about at most NUM references (default %" +"d).\n" +" -v, --verbose explain what is being done.\n" +" --version display version information and exit.\n" +msgstr "" + +#: makeinfo/makeinfo.c:394 +#, no-wrap msgid "" -" --no-headers suppress Info node separators and Node: lines " -"and\n" -" write to standard output without --output.\n" -" --no-ifhtml do not process @ifhtml and @html text.\n" -" --no-ifinfo do not process @ifinfo text.\n" -" --no-iftex do not process @iftex and @tex text.\n" -" --no-split suppress splitting of large Info output files or\n" -" generation of one HTML file per node.\n" -" --no-validate suppress node cross-reference validation.\n" -" --no-warn suppress warnings (but not errors).\n" -" --number-sections include chapter, section, etc. numbers in " -"output.\n" -" -o, --output=FILE output to FILE, ignoring any @setfilename.\n" -" -P DIR prepend DIR to the @include search path.\n" -" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " -"%d).\n" -" if VAL is `none', do not indent;\n" -" if VAL is `asis', preserve existing " -"indentation.\n" -" --reference-limit=NUM warn about at most NUM references (default %d).\n" -" -U VAR undefine a variable, as with @clear.\n" -" -v, --verbose explain what is being done.\n" -" --version display version information and exit.\n" -msgstr "" -"Pou¾ití: %s [PØEPÍNAÈ]... TEXINFO-SOUBOR...\n" -"\n" -" Pøekládá Texinfový zdrojový soubor to mnoha rùzných formátù:\n" -"Info soubory vhodné pro on-line ètení Emacsem nebo samostatným GNU Info\n" -"prohlí¾eèem (implicitní); èistý text (pøepínaèem --no-headers); nebo HTML\n" -"(pøepínaèem --html).\n" +"Output format selection (default is to produce Info):\n" +" --docbook output DocBook rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output XML (TexinfoML) rather than Info.\n" +msgstr "" + +#: makeinfo/makeinfo.c:401 +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" +msgstr "" + +#: makeinfo/makeinfo.c:415 +#, 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" +" --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" +" If VAL is `none', do not indent; if VAL is\n" +" `asis', preserve existing indentation.\n" +" --split-size=NUM split Info files at size NUM (default %d).\n" +msgstr "" + +#: makeinfo/makeinfo.c:433 +msgid "" +"Input file options:\n" +" --commands-in-node-names allow @ commands in node names.\n" +" -D VAR define the variable VAR, as with @set.\n" +" -I DIR append DIR to the @include search path.\n" +" -P DIR prepend DIR to the @include search path.\n" +" -U VAR undefine the variable VAR, as with @clear.\n" +msgstr "" + +#: makeinfo/makeinfo.c:442 +msgid "" +"Conditional processing in input:\n" +" --ifhtml process @ifhtml and @html even if not generating HTML.\n" +" --ifinfo process @ifinfo even if not generating Info.\n" +" --ifplaintext process @ifplaintext even if not generating plain text.\n" +" --iftex process @iftex and @tex; implies --no-split.\n" +" --no-ifhtml do not process @ifhtml and @html text.\n" +" --no-ifinfo do not process @ifinfo text.\n" +" --no-ifplaintext do not process @ifplaintext text.\n" +" --no-iftex do not process @iftex and @tex text.\n" +msgstr "" + +#: 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" +" if generating Info, --ifinfo is on and the others are off;\n" +" if generating plain text, --ifplaintext is on and the others are off;\n" +msgstr "" + +#: makeinfo/makeinfo.c:461 +#, fuzzy +msgid "" +"Examples:\n" +" makeinfo foo.texi write Info to foo's @setfilename\n" +" makeinfo --html foo.texi write HTML to @setfilename\n" +" makeinfo --xml foo.texi write 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" -"Pøepínaèe:\n" -"-D PROMÌNNÁ definuje promìnnou, jako pøíkaz @set\n" -"-I ADRESÁØ pøidá ADRESÁØ na konec seznamu adresáøù, ve kterých\n" -"-P ADRESÁØ pøídá ADRESÁØ na zaèátek seznamu adresáøù, ve " -"kterých\n" -" jsou hledány soubory pro @include\n" -"-U PROMÌNNÁ oddefinuje promìnnou, jako pøíkazem @clear\n" -"--error-limit=ÈÍSLO skonèí, kdy¾ se objeví ÈÍSLO chyb (implicitnì %d)\n" -"--fill-column=ÈÍSLO definuje délku øádku ve znacích (implicitnì %d)\n" -"--footnote-style=STYL ve výstupu budou poznámky pod èarou podle " -"STYLu:\\n\"\n" -" `separate' pro umístìní poznámek pod èarou\n" -" do zvlá¹tního uzlu,\n" -" `end' pro umístìní poznámek pod èarou na konec " -"uzlu,\n" -" ve kterém jsou definovány (implicitní).\n" -"--force vypí¹e výstup, i kdy¾ byly nalezeny chyby\n" -"--help vypí¹e tuto nápovìdu a skonèí\n" -"--html zapí¹e výstup v HTML formátu\n" -"--ifhtml zpùsobí zpracování @ifhtml a @html, i kdy¾ není\n" -" výstupem formát HTML\n" -"--ifinfo zpùsobí zpracování @ifinfo, i kdy¾ je výstupem HTML\n" -"--iftex zpùsobí zpracování @iftex a @tex\n" -"--macro-expand=VÝST-SOUBOR, -E VÝST-SOUBOR výstupem bude originální " -"zdrojový\n" -" kód s expandovanými makry do souboru VÝST-SOUBOR \n" -"--no-headers potlaèí oddìlovaèe uzlù a jejich hlavièky\n" -"--no-ifhtml zpùsobí nevykonávání @ifhtml a @html\n" -"--no-ifinfo zpùsobí nevykonávání @ifinfo\n" -"--no-iftex zpùsobí nevykonávání @iftex a @tex\n" -"--no-split potlaèí rozdìlování velkých výstupních info souborù\n" -" nebo generování jednoho HTML souboru na uzel\n" -"--no-validate potlaèí kontrolu køí¾ových odkazù\n" -"--no-warn potlaèí výpis varování (ne v¹ak chyb)\n" -"--output=SOUB, -o SOUB výstup do SOUBoru, ignoruje pøíkaz @setfilename\n" -"--paragraph-indent=HODN odsadí odstavce HODN mezerami (implicitnì %d).\n" -" jestli¾e je HODN `none' neodsazuje; jestli¾e je " -"HODN\n" -" `asis' zanechá ji¾ existující odsazení.\n" -"--reference-limit=ÈÍSLO oznámí, bude-li køí¾ových odkazù více ne¾ ÈÍSLO\n" -" (implicitnì %d).\n" -"-v, --verbose vypisuje bli¾¹í informace o zpracovávání\n" -"--version vypí¹e oznaèení verze a skonèí\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 "" "\n" " Implicitní nastavení pro podmínky @if... zále¾í na výstupním formátu:\n" "pøi generování HTML je zapnut pøepínaè --ifhtml a ostatní jsou vypnuty;\n" "pøi generování Info souboru nebo èistého textu je zapnut pøepínaè --ifinfo\n" "a ostatní jsou vypnuty.\n" "\n" +"Pøíklady:\n" +" makeinfo foo.texi zapí¹e Info do souboru urèeného\n" +" pomocí @setfilename ve foo.texi\n" +" makeinfo --html foo.texi zapí¹e HTML do souboru urèeného\n" +" pomocí @setfilename ve foo.texi\n" +" makeinfo --no-headers -o - foo.texi vypí¹e èistý text na standardní " +"výstup\n" +" makeinfo --number-sections foo.texi zapí¹e Info s èíslovanými sekcemi\n" +" makeinfo --no-split foo.texi zapí¹e jeden Info soubor jakkoliv " +"velký\n" +"\n" " Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze " "anglicky),\n" "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n" -"zasílejte na <cs@li.org> (èesky).\n" - -#: makeinfo/makeinfo.c:415 -msgid "" -"\n" -"The defaults for the @if... conditionals depend on the output format:\n" -"if generating HTML, --ifhtml is on and the others are off;\n" -"if generating Info or plain text, --ifinfo is on and the others are off.\n" -"\n" -"Examples:\n" -" makeinfo foo.texi write Info to foo's @setfilename\n" -" makeinfo --html foo.texi write HTML to foo's @setfilename\n" -" makeinfo --no-headers -o - foo.texi write plain text to standard output\n" -" makeinfo --number-sections foo.texi write Info with numbered sections\n" -" makeinfo --no-split foo.texi write one Info file however big\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org." -msgstr "" +"zasílejte na <cs@li.org> (èesky)." -#: makeinfo/makeinfo.c:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655 +#: makeinfo/makeinfo.c:676 #, 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:521 +#: makeinfo/makeinfo.c:583 #, c-format msgid "Couldn't open macro expansion output `%s'" msgstr "Výstup %s pro expanzi makra nelze otevøít" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:586 msgid "Cannot specify more than one macro expansion output" msgstr "Pro expanzi makra nelze zadat více ne¾ jeden výstup" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:624 #, 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" +"%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `%" +"s'.\n" -#: makeinfo/makeinfo.c:602 +#: makeinfo/makeinfo.c:665 #, 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:647 +#: makeinfo/makeinfo.c:723 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: chybí argument jména souboru.\n" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:898 #, c-format msgid "Expected `%s'" msgstr "Oèekáváno `%s'" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1365 +msgid "File exists, but is not a directory" +msgstr "" + +#: makeinfo/makeinfo.c:1366 +#, c-format +msgid "Can't create directory `%s': %s" +msgstr "" + +#: makeinfo/makeinfo.c:1414 #, c-format msgid "No `%s' found in `%s'" msgstr "Soubor `%s' nenalezen v `%s'" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1496 #, 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:1327 +#: makeinfo/makeinfo.c:1526 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "Vytváøím %s soubor `%s' ze souboru `%s'.\n" -#: makeinfo/makeinfo.c:1358 -#, fuzzy, c-format +#: makeinfo/makeinfo.c:1561 +#, 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" +"Toto je Info soubor %s, produkován programem makeinfo verze %s ze souboru %" +"s.\n" -#: makeinfo/makeinfo.c:1377 +#: makeinfo/makeinfo.c:1583 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2017,264 +2325,306 @@ msgstr "" "%s: Výstupní soubor maker `%s' byl odstranìn, proto¾e byly nalezeny chyby;\n" "u¾ijte pøepínaè --force k ponechání souboru.\n" -#. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1627 #, 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:1635 +#: makeinfo/makeinfo.c:1853 #, c-format msgid "Unknown command `%s'" msgstr "Neznámý pøíkaz `%s'" -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1875 #, 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:1838 +#: makeinfo/makeinfo.c:2068 #, c-format msgid "%c%s expected `{...}'" msgstr "%c%s oèekáváno `{...}'" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:2098 msgid "Unmatched }" msgstr "Nepárová }" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:2148 msgid "NO_NAME!" msgstr "Funkce neexistuje!" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:2169 #, c-format msgid "%c%s missing close brace" -msgstr "%c%s chbìjící uzavírací závorka" +msgstr "%c%s chybìjící uzavírací závorka" -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 -msgid "see " +#: makeinfo/makeinfo.c:2958 +msgid "First argument to cross-reference may not be empty" msgstr "" -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340 +msgid "see " +msgstr "viz" + +#: makeinfo/makeinfo.c:3018 msgid "See " -msgstr "" +msgstr "Viz" -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:3164 #, c-format msgid "`.' or `,' must follow cross reference, not %c" msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c" -#: makeinfo/makeinfo.c:3026 -#, c-format -msgid "No .png or .jpg for `%s'" +#: makeinfo/makeinfo.c:3212 +msgid "First argument to @inforef may not be empty" +msgstr "" + +#: makeinfo/makeinfo.c:3427 +#, 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:3440 +#, fuzzy, c-format +msgid "No `%s.png' or `.jpg', and no extension supplied" msgstr "®ádný .png nebo .jpg soubor pro `%s'" -#: makeinfo/makeinfo.c:3063 -#, c-format -msgid "@image file `%s' unreadable: %s" +#: makeinfo/makeinfo.c:3490 +#, 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:3070 +#: makeinfo/makeinfo.c:3497 msgid "@image missing filename argument" msgstr "pøíkaz @image postrádá jméno souboru" -#: makeinfo/makeinfo.c:3259 -#, fuzzy, c-format +#: makeinfo/makeinfo.c:3690 +#, c-format msgid "{No value for `%s'}" -msgstr "{Pro \"%s\" není hodnota}" +msgstr "{Pro `%s' není hodnota}" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3744 #, c-format msgid "%c%s requires a name" msgstr "%c%s po¾aduje jméno" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3850 #, c-format msgid "Reached eof before matching @end %s" msgstr "Vstupní soubor skonèil a pøíkaz `@end %s' nebyl nalezen" -#: makeinfo/multi.c:208 -msgid "Missing } in @multitable template" +#: makeinfo/makeinfo.c:4081 +#, c-format +msgid "`%.40s...' is too long for expansion; not expanded" msgstr "" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:226 +msgid "Missing } in @multitable template" +msgstr "Chybìjící } v @multitable vzoru" + +#: makeinfo/multi.c:302 #, c-format msgid "ignoring stray text `%s' after @multitable" msgstr "ignoruji zbloudilý text `%s' po pøíkazu @multitable" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:375 #, 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:401 +#: makeinfo/multi.c:426 #, c-format msgid "Cannot select column #%d in multitable" msgstr "sloupec #%d v multitabulce nelze vybrat" -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:529 msgid "ignoring @tab outside of multitable" msgstr "pøíkaz `@tab' ignorován, je mimo multitabulku" -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:565 msgid "** Multicolumn output from last row:\n" msgstr "** Vícesloupcový výstup z posledního øádku:\n" -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:568 #, c-format msgid "* column #%d: output = %s\n" msgstr "* sloupec #%d: výstup = %s\n" -#: makeinfo/node.c:250 +#: makeinfo/node.c:276 #, c-format msgid "Node `%s' previously defined at line %d" -msgstr "" +msgstr "Uzel `%s' ji¾ byl definován na øádku %d" -#: makeinfo/node.c:514 -#, fuzzy, c-format +#: makeinfo/node.c:594 +#, c-format msgid "Formatting node %s...\n" -msgstr "Zapisuji uzel \"%s\"..." +msgstr "Formátování uzlu %s...\n" -#: makeinfo/node.c:559 +#: makeinfo/node.c:655 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" -msgstr "" +msgstr "Uzel `%s' vy¾aduje pøíkaz na vytváøení sekcí (tøeba %c%s)" -#: makeinfo/node.c:719 +#: makeinfo/node.c:815 #, c-format msgid "No node name specified for `%c%s' command" +msgstr "Pøíkazu `%c%s' nebyl zadán název uzlu" + +#: makeinfo/node.c:856 makeinfo/node.c:1075 +#, c-format +msgid "Anchor `%s' and node `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:774 -#, fuzzy +#: makeinfo/node.c:859 +msgid "This @anchor command ignored; references to it will not work" +msgstr "" + +#: makeinfo/node.c:861 makeinfo/node.c:1078 +msgid "Rename this anchor or use the `--no-split' option" +msgstr "" + +#: makeinfo/node.c:891 +#, c-format +msgid "Unexpected string at end of split-HTML file `%s'" +msgstr "" + +#: makeinfo/node.c:920 msgid "Node:" -msgstr "Dal¹í" +msgstr "Uzel:" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 -#, fuzzy +#: makeinfo/node.c:930 msgid "Next:" -msgstr "Dal¹í" +msgstr "Dal¹í:" -#: makeinfo/node.c:793 -#, fuzzy +#: makeinfo/node.c:940 msgid "Previous:" -msgstr "Pøedchozí" +msgstr "Pøedchozí:" -#: makeinfo/node.c:803 -#, fuzzy +#: makeinfo/node.c:950 msgid "Up:" -msgstr "Nahoru" +msgstr "Nahoru:" -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1072 #, c-format -msgid "%s reference to nonexistent node `%s'" +msgid "Anchors `%s' and `%s' map to the same file name" msgstr "" -#: makeinfo/node.c:1029 -msgid "Menu" +#: makeinfo/node.c:1077 +msgid "@anchor command ignored; references to it will not work" msgstr "" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1277 +#, c-format +msgid "%s reference to nonexistent node `%s'" +msgstr "%s se odkazuje na neexistující uzel `%s'" + +#: makeinfo/node.c:1294 +msgid "Menu" +msgstr "Menu" + +#: makeinfo/node.c:1296 msgid "Cross" -msgstr "" +msgstr "Odkaz" -#: makeinfo/node.c:1115 +#: makeinfo/node.c:1380 #, c-format msgid "Next field of node `%s' not pointed to" -msgstr "" +msgstr "Následující uzel uzlu `%s' neukazuje na tento" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1383 #, c-format msgid "This node (%s) has the bad Prev" -msgstr "" +msgstr "Tento uzel (%s) má chybný odkaz na pøedchozí uzel" -#: makeinfo/node.c:1133 -#, fuzzy +#: makeinfo/node.c:1395 msgid "Prev" msgstr "Pøedchozí" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1438 #, c-format msgid "Prev field of node `%s' not pointed to" -msgstr "" +msgstr "Pøedchozí uzel uzlu `%s' neukazuje na tento" -#: makeinfo/node.c:1180 +#: makeinfo/node.c:1442 #, c-format msgid "This node (%s) has the bad Next" -msgstr "" +msgstr "Tento uzel (%s) má chybný odkaz na následující uzel" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1454 #, c-format msgid "`%s' has no Up field" -msgstr "" +msgstr "`%s' nemá zadán vy¹¹í uzel" -#: makeinfo/node.c:1197 -#, fuzzy +#: makeinfo/node.c:1457 msgid "Up" msgstr "Nahoru" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1523 #, 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:1296 +#: makeinfo/node.c:1552 #, c-format msgid "node `%s' has been referenced %d times" -msgstr "" +msgstr "na uzel `%s' se bylo odkazováno %d krát" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1566 #, c-format msgid "unreferenced node `%s'" -msgstr "" +msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " -msgstr "" +msgstr "Dodatek %c " -#. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" -msgstr "" +msgstr "Interní chyba (hledání sekcí) \"%s\"!" -#: makeinfo/sectioning.c:468 -#, fuzzy, c-format +#: makeinfo/sectioning.c:502 +#, c-format msgid "%c%s is obsolete; use %c%s instead" -msgstr "%c%s chbìjící uzavírací závorka" +msgstr "%c%s je zastaralý; pou¾ijte %c%s" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:518 #, c-format msgid "Node with %ctop as a section already exists" -msgstr "" +msgstr "Uzel s %ctop jako sekcí ji¾ existuje" -#: makeinfo/sectioning.c:496 -#, fuzzy, c-format +#: makeinfo/sectioning.c:526 +#, c-format msgid "Here is the %ctop node" -msgstr "Zobrazení vy¹¹ího uzlu" +msgstr "Ji¾ zde je nejvy¹¹í (%ctop) uzel" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:543 #, c-format msgid "%ctop used before %cnode, defaulting to %s" -msgstr "" +msgstr "%ctop je pou¾it pøed %cnode, pøesmìrováno na %s" -#. in case we are writing stdout -#: makeinfo/toc.c:212 makeinfo/toc.c:261 makeinfo/toc.c:262 +#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299 msgid "Table of Contents" -msgstr "" +msgstr "Obsah" -#. in case we are writing stdout -#: makeinfo/toc.c:292 makeinfo/toc.c:319 makeinfo/toc.c:320 +#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367 msgid "Short Contents" -msgstr "" +msgstr "Krátký obsah" -#: makeinfo/toc.c:354 +#: makeinfo/toc.c:406 #, c-format msgid "%s: TOC should be here, but it was not found" -msgstr "" +msgstr "%s: Obsah bìl být zde, ale nebyl nalezen" + +#: makeinfo/xml.c:1108 +#, c-format +msgid "@image file `%s' unreadable: %s" +msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s" #: util/install-info.c:151 #, c-format @@ -2330,17 +2680,14 @@ msgid "" " If you don't specify any sections, they are determined\n" " from information in the Info file itself.\n" " --version display version information and exit.\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" "Pou¾ití: %s [PØEPÍNAÈ]... [INFO-SOUBOR [DIR-SOUBOR]]\n" "\n" -"Instaluje nebo ma¾e polo¾ky ze souboru INFO-SOUBOR v Info adresáøi " -"DIR-SOUBOR.\n" +"Instaluje nebo ma¾e polo¾ky ze souboru INFO-SOUBOR v Info adresáøi DIR-" +"SOUBOR.\n" "\n" "Pøepínaèe:\n" -"--delete sma¾e existující polo¾ky INFO-SOUBORu z DIS=SOUBORU;\n" +"--delete sma¾e existující polo¾ky INFO-SOUBORu z DIR-SOUBORU;\n" " nevkládá ¾ádné nové.\n" "--dir-file=JMÉNO zadání jména adresáøového souboru Infa. Rovnocenné\n" " s pou¾itím argumentu DIR-SOUBOR.\n" @@ -2356,6 +2703,7 @@ msgstr "" " Rovnocenné s argumentem INFO-SOUBOR.\n" "--info-dir=ADRESÁØ stejné jako --dir-file=ADRESÁØ/dir.\n" "--item=TEXT stejné jako --entry=TEXT.\n" +" Polo¾ka Info adresáøe je aktuální polo¾ka menu.\n" "--quiet potlaèí varování.\n" "--remove stejné jako --delete.\n" "--section=SEKCE vlo¾í polo¾ky adresáøe do sekce SEKCE Info adresáøe.\n" @@ -2369,8 +2717,8 @@ msgstr "" "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky\n" "k pøekladu zasílejte na <cs@li.org> (èesky).\n" -#: util/install-info.c:442 -#, fuzzy, c-format +#: util/install-info.c:444 +#, c-format msgid "" "This is the file .../info/dir, which contains the\n" "topmost node of the Info hierarchy, called (dir)Top.\n" @@ -2391,15 +2739,15 @@ msgstr "" " Toto je soubor .../info/dir, který obsahuje nejvy¹¹í uzly hierarchie\n" "Info dokumentù a je nazýván (dir)Top. Kdy¾ poprvé spustíte Info dostanete\n" "se do tohoto uzlu.\n" -"^_\n" -"Soubor: dir Uzel: Top Toto je vrchol INFO stromu\n" +" \n" +"%s Toto je vrchol INFO stromu\n" "\n" " Tento (Adresáøový uzel) obsahuje menu hlavních témat.\n" " Stiskem \"q\" Info ukonèíte, stiskem \"?\" získáte seznam v¹ech Info " "pøíkazù,\n" " stiskem \"d\" se vrátíte sem, stiskem \"h\" získáte nápovìdu pro " "zaèáteèníky,\n" -" napsáním \"mEmacs\" si zobrazíte manuál k Emacsu, ...\n" +" napsáním \"mEmacs\" si zobrazíte manuál k Emacsu, atd.\n" "\n" " Pokud chcete v Emacsu zobrazit obsah polo¾ky menu nebo následovat " "køí¾ový\n" @@ -2407,105 +2755,99 @@ msgstr "" "\n" "* Menu:\n" -#: util/install-info.c:465 +#: util/install-info.c:467 #, 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:549 +#: util/install-info.c:551 #, c-format msgid "%s: empty file" -msgstr "" +msgstr "%s: prázdný soubor" -#: util/install-info.c:864 util/install-info.c:904 +#: util/install-info.c:866 util/install-info.c:906 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:899 +#: util/install-info.c:901 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:1147 util/install-info.c:1157 +#: util/install-info.c:1150 util/install-info.c:1160 #, c-format msgid "%s: Specify the Info directory only once.\n" msgstr "%s: Info adresáø zadejte pouze jednou.\n" -#: util/install-info.c:1192 +#: util/install-info.c:1195 #, c-format msgid "%s: Specify the Info file only once.\n" msgstr "%s: Info soubor zadejte pouze jednou.\n" -#: util/install-info.c:1241 +#: util/install-info.c:1244 #, c-format msgid "excess command line argument `%s'" msgstr "nadbyteèný argument `%s' v pøíkazovém øádku" -#: util/install-info.c:1245 +#: util/install-info.c:1248 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:1247 +#: util/install-info.c:1251 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" -#. No need to abort here, the original info file may not -#. have the requisite Texinfo commands. This is not -#. something an installer should have to correct (it's a -#. problem for the maintainer), and there's no need to cause -#. subsequent parts of `make install' to fail. -#: util/install-info.c:1269 +#: util/install-info.c:1273 #, c-format msgid "no info dir entry in `%s'" msgstr "v Info adresáøi `%s' není ¾ádná polo¾ka" -#: util/install-info.c:1384 +#: util/install-info.c:1388 #, 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:1407 +#: util/install-info.c:1411 #, c-format msgid "no entries found for `%s'; nothing deleted" msgstr "pro `%s' nebyly nalezeny ¾ádné polo¾ky" -#: util/texindex.c:244 +#: util/texindex.c:245 msgid "display this help and exit" msgstr "vypí¹e tuto nápovìdu a skonèí" -#: util/texindex.c:246 +#: util/texindex.c:247 msgid "keep temporary files around after processing" msgstr "zanechá doèasné soubory po ukonèení" -#: util/texindex.c:248 +#: util/texindex.c:249 msgid "do not keep temporary files around after processing (default)" msgstr "nezanechá doèasné soubory po ukonèení" -#: util/texindex.c:250 +#: util/texindex.c:251 msgid "send output to FILE" msgstr "zapí¹e výstup do SOUBORu" -#: util/texindex.c:252 +#: util/texindex.c:253 msgid "display version information and exit" msgstr "vypí¹e oznaèení verze a skonèí" -#: util/texindex.c:263 +#: util/texindex.c:264 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n" -#: util/texindex.c:264 +#: util/texindex.c:265 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:267 +#: util/texindex.c:268 #, 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" -#. avoid trigraph in cat-id-tbl.c -#: util/texindex.c:269 +#: util/texindex.c:270 msgid "" "\n" "Options:\n" @@ -2513,43 +2855,54 @@ msgstr "" "\n" "Pøepínaèe:\n" -#: util/texindex.c:285 -msgid "" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" -msgstr "" -"\n" -" Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze " -"anglicky),\n" -"obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n" -"zasílejte na <cs@li.org> (èesky).\n" - -#: util/texindex.c:885 util/texindex.c:919 util/texindex.c:995 -#: util/texindex.c:1023 +#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997 +#: util/texindex.c:1025 #, c-format msgid "%s: not a texinfo index file" msgstr "%s: není texinfovský rejstøík" -#: util/texindex.c:980 +#: util/texindex.c:982 #, c-format msgid "failure reopening %s" msgstr "soubor %s nepovedlo se znovu otevøít" -#: util/texindex.c:1222 +#: util/texindex.c:1224 #, c-format msgid "No page number in %s" -msgstr "" +msgstr "Na %s není èíslo stránky" -#: util/texindex.c:1293 +#: util/texindex.c:1295 #, 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" -#: util/texindex.c:1631 +#: util/texindex.c:1633 #, c-format msgid "%s; for file `%s'.\n" -msgstr "%s; v souboru `%s'.\n" +msgstr "%s; pro soubor `%s'.\n" + +#, fuzzy +#~ msgid "" +#~ "Email bug reports to bug-texinfo@gnu.org,\n" +#~ "general questions and discussion to help-texinfo@gnu.org." +#~ msgstr "" +#~ "\n" +#~ " Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze " +#~ "anglicky),\n" +#~ "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n" +#~ "zasílejte na <cs@li.org> (èesky).\n" + +#~ msgid "******************************\n" +#~ msgstr "******************************\n" + +#~ msgid "---------------------\n" +#~ msgstr "---------------------\n" + +#~ msgid "----------------------\n" +#~ msgstr "----------------------\n" + +#~ msgid "---------------\n" +#~ msgstr "---------------\n" #, fuzzy #~ msgid "" @@ -2560,96 +2913,118 @@ msgstr "%s; v souboru `%s'.\n" #~ "(by default); plain text (with --no-headers); or HTML (with --html).\n" #~ "\n" #~ "Options:\n" -#~ " -D VAR define a variable, as with @set.\n" -#~ " -I DIR append DIR to the @include search path.\n" -#~ " -P DIR prepend DIR to the @include search path.\n" -#~ " -U VAR undefine a variable, as with @clear.\n" #~ " --commands-in-node-names allow @ commands in node names.\n" +#~ " -D VAR define a variable, as with @set.\n" +#~ "--docbook output DocBook rather than Info format.\n" +#~ " -E, --macro-expand FILE output macro-expanded source to FILE.\n" #~ " --error-limit=NUM quit after NUM errors (default %d).\n" -#~ " --fill-column=NUM break Info lines at NUM characters (default %d).\n" +#~ " --fill-column=NUM break Info lines at NUM characters (default %" +#~ "d).\n" #~ " --footnote-style=STYLE output footnotes according to STYLE:\n" #~ " `separate' to place footnotes in their own " #~ "node,\n" -#~ " `end' to place the footnotes at the end of the\n" -#~ " node in which they are defined (the default).\n" +#~ " `end' to place the footnotes at the end of " +#~ "the\n" +#~ " node in which they are defined (the " +#~ "default).\n" #~ " --force preserve output even if errors.\n" #~ " --help display this help and exit.\n" -#~ " --html output HTML rather than Info format;\n" -#~ " implies --no-split.\n" +#~ " --html output HTML rather than Info format.\n" +#~ " -I DIR append DIR to the @include search path.\n" +#~ " --ifhtml process @ifhtml and @html text even when not\n" +#~ " generating HTML.\n" +#~ " --ifinfo process @ifinfo text even when generating " +#~ "HTML.\n" +#~ " --iftex process @iftex and @tex text.\n" +#~ " implies --no-split.\n" #~ msgstr "" #~ "Pou¾ití: %s [PØEPÍNAÈ]... TEXINFO-SOUBOR...\n" #~ "\n" #~ " Pøekládá Texinfový zdrojový soubor to mnoha rùzných formátù:\n" #~ "Info soubory vhodné pro on-line ètení Emacsem nebo samostatným GNU Info\n" -#~ "prohlí¾eèem (implicitní); èistý text (pøepínaèem --no-headers); nebo HTML\n" +#~ "prohlí¾eèem (implicitní); èistý text (pøepínaèem --no-headers); nebo " +#~ "HTML\n" #~ "(pøepínaèem --html).\n" #~ "\n" #~ "Pøepínaèe:\n" -#~ "-D PROMÌNNÁ definuje promìnnou, jako pøíkaz @set\n" -#~ "-I ADRESÁØ pøidá ADRESÁØ na konec seznamu adresáøù, ve kterých\n" -#~ "-P ADRESÁØ pøídá ADRESÁØ na zaèátek seznamu adresáøù, ve " -#~ "kterých\n" -#~ " jsou hledány soubory pro @include\n" -#~ "-U PROMÌNNÁ oddefinuje promìnnou, jako pøíkazem @clear\n" -#~ "--error-limit=ÈÍSLO skonèí, kdy¾ se objeví ÈÍSLO chyb (implicitnì %d)\n" -#~ "--fill-column=ÈÍSLO definuje délku øádku ve znacích (implicitnì %d)\n" -#~ "--footnote-style=STYL ve výstupu budou poznámky pod èarou podle " -#~ "STYLu:\\n\"\n" -#~ " `separate' pro umístìní poznámek pod èarou\n" -#~ " do zvlá¹tního uzlu,\n" -#~ " `end' pro umístìní poznámek pod èarou na konec " +#~ "--commands-in-node-names dovoluje @ pøíkazy v názvech uzlù\n" +#~ "-D PROMÌNNÁ definuje promìnnou, jako pøíkaz @set\n" +#~ "-E, --macro-expand SOUBOR výstup zdrojových textù s expandovanými makry\n" +#~ " do SOUBORu\n" +#~ "--error-limit=ÈÍSLO ukonèi se po ÈÍSLO chybách (implicitnì %d)\n" +#~ "--fill-column=ÈÍSLO zalamování na ÈÍSLO znakù (implicitnì %d)\n" +#~ "--footnote-style=STYL umístìní poznámek pod èarou podle STYLu:\n" +#~ " `separate' umístìní poznámek pod èarou do\n" +#~ " samostatného uzlu;\n" +#~ " `end' umístìní poznámek pod èarou na konec " #~ "uzlu,\n" -#~ " ve kterém jsou definovány (implicitní).\n" -#~ "--force vypí¹e výstup, i kdy¾ byly nalezeny chyby\n" +#~ " ve kterém jsou definovány (implicitní);\n" +#~ "--force zanechá výstup dokonce i pøi chybách\n" #~ "--help vypí¹e tuto nápovìdu a skonèí\n" -#~ "--html zapí¹e výstup v HTML formátu\n" +#~ "--html výstup v HTML formátu\n" +#~ "-I ADRESÁØ pøidá ADRESÁØ na konec seznamu adresáøù, ve " +#~ "kterých\n" +#~ " jsou hledány soubory pro @include\n" #~ "--ifhtml zpùsobí zpracování @ifhtml a @html, i kdy¾ není\n" #~ " výstupem formát HTML\n" -#~ "--ifinfo zpùsobí zpracování @ifinfo, i kdy¾ je výstupem HTML\n" -#~ "--iftex zpùsobí zpracování @iftex a @tex\n" -#~ "--macro-expand=VÝST-SOUBOR, -E VÝST-SOUBOR výstupem bude originální " -#~ "zdrojový\n" -#~ " kód s expandovanými makry do souboru VÝST-SOUBOR \n" -#~ "--no-headers potlaèí oddìlovaèe uzlù a jejich hlavièky\n" -#~ "--no-ifhtml zpùsobí nevykonávání @ifhtml a @html\n" -#~ "--no-ifinfo zpùsobí nevykonávání @ifinfo\n" -#~ "--no-iftex zpùsobí nevykonávání @iftex a @tex\n" -#~ "--no-split potlaèí rozdìlování velkých výstupních info souborù\n" +#~ "--ifinfo zpùsobí zpracování @ifinfo, i kdy¾ je výstupem " +#~ "HTML\n" +#~ "--iftex zpùsobí zpracování @iftex a @tex textu\n" +#~ " zahrnuje --no-split.\n" + +#, fuzzy +#~ msgid "" +#~ " --no-headers suppress Info node separators and Node: " +#~ "lines;\n" +#~ " write to standard output without --output.\n" +#~ " --no-ifhtml do not process @ifhtml and @html text.\n" +#~ " --no-ifinfo do not process @ifinfo text.\n" +#~ " --no-iftex do not process @iftex and @tex text.\n" +#~ " --no-split suppress splitting of Info or HTML output,\n" +#~ " generate only one output file.\n" +#~ " --no-validate suppress node cross-reference validation.\n" +#~ " --no-warn suppress warnings (but not errors).\n" +#~ " --number-sections include chapter, section, etc. numbers in " +#~ "output.\n" +#~ " -o, --output=FILE output to FILE (directory if split HTML),\n" +#~ " ignoring any @setfilename.\n" +#~ " -P DIR prepend DIR to the @include search path.\n" +#~ " --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default %" +#~ "d).\n" +#~ " if VAL is `none', do not indent;\n" +#~ " if VAL is `asis', preserve existing " +#~ "indentation.\n" +#~ " --reference-limit=NUM warn about at most NUM references (default %" +#~ "d).\n" +#~ " --split-size=NUM split into files at NUM size. (default %d).\n" +#~ " -U VAR undefine a variable, as with @clear.\n" +#~ " -v, --verbose explain what is being done.\n" +#~ " --version display version information and exit.\n" +#~ " --xml output XML (TexinfoML) rather than Info " +#~ "format.\n" +#~ msgstr "" +#~ "--no-headers potlaèí oddìlovaèe uzlù a jejich hlavièky a " +#~ "zapí¹e \n" +#~ " výstup na standardní výstup (není-li zadáno --" +#~ "output)\n" +#~ "--no-ifhtml zpùsobí nezpracování @ifhtml a @html textu\n" +#~ "--no-ifinfo zpùsobí nezpracování @ifinfo textu\n" +#~ "--no-iftex zpùsobí nezpracování @iftex a @tex textu\n" +#~ "--no-split potlaèí rozdìlování velkých výstupních info " +#~ "souborù\n" #~ " nebo generování jednoho HTML souboru na uzel\n" #~ "--no-validate potlaèí kontrolu køí¾ových odkazù\n" #~ "--no-warn potlaèí výpis varování (ne v¹ak chyb)\n" -#~ "--output=SOUB, -o SOUB výstup do SOUBoru, ignoruje pøíkaz @setfilename\n" +#~ "-o, --output=SOUB výstup do SOUBoru, ignoruje pøíkaz @setfilename\n" +#~ "-P ADRESÁØ pøidá ADRESÁØ na zaèátek seznamu adresáøù, ve " +#~ "kterých\n" +#~ " jsou hledány soubory pro @include\n" #~ "--paragraph-indent=HODN odsadí odstavce HODN mezerami (implicitnì %d).\n" -#~ " jestli¾e je HODN `none' neodsazuje; jestli¾e je " -#~ "HODN\n" -#~ " `asis' zanechá ji¾ existující odsazení.\n" +#~ " jestli¾e je HODN `none' neodsazuje;\n" +#~ " jestli¾e je HODN `asis' zanechá existující " +#~ "odsazení.\n" #~ "--reference-limit=ÈÍSLO oznámí, bude-li køí¾ových odkazù více ne¾ ÈÍSLO\n" #~ " (implicitnì %d).\n" +#~ "-U PROMÌNNÁ oddefinuje promìnnou, jako pøíkazem @clear\n" #~ "-v, --verbose vypisuje bli¾¹í informace o zpracovávání\n" #~ "--version vypí¹e oznaèení verze a skonèí\n" -#~ "\n" -#~ " Implicitní nastavení pro podmínky @if... zále¾í na výstupním formátu:\n" -#~ "pøi generování HTML je zapnut pøepínaè --ifhtml a ostatní jsou vypnuty;\n" -#~ "pøi generování Info souboru nebo èistého textu je zapnut pøepínaè --ifinfo\n" -#~ "a ostatní jsou vypnuty.\n" -#~ "\n" -#~ " Chyby v programu oznamujte na adrese <bug-texinfo@gnu.org> (pouze " -#~ "anglicky),\n" -#~ "obecné otázky smìøujte na <help-texinfo@gnu.org>. Pøipomínky k pøekladu\n" -#~ "zasílejte na <cs@li.org> (èesky).\n" - -#, fuzzy -#~ msgid " %-10s Quit this help (that's a zero not an oh).\n" -#~ msgstr " CTRL-x 0 Ukonèení prohlí¾ení nápovìdy." - -#~ msgid "Virtual memory exhausted in %s ()! Needed %d bytes." -#~ msgstr "Virtuální pamì» vyèerpána ve funkci %s ()! %d bajtù je potøebných." - -#~ msgid " times" -#~ msgstr " krát" - -#~ msgid "%d times" -#~ msgstr "%d krát" - -#~ msgid "multitable item not in active multitable" -#~ msgstr "multitabulková polo¾ka není v aktivní multitabulce" diff --git a/gnu/usr.bin/texinfo/po/de.gmo b/gnu/usr.bin/texinfo/po/de.gmo Binary files differindex cba41ab7123..eba546b7599 100644 --- a/gnu/usr.bin/texinfo/po/de.gmo +++ b/gnu/usr.bin/texinfo/po/de.gmo diff --git a/gnu/usr.bin/texinfo/po/de.po b/gnu/usr.bin/texinfo/po/de.po index b83c3bc9844..839b6591e87 100644 --- a/gnu/usr.bin/texinfo/po/de.po +++ b/gnu/usr.bin/texinfo/po/de.po @@ -1,9 +1,23 @@ # German messages for GNU Texinfo -# Copyright © 1996, 1997, 1998, 1999 Free Software Foundation, Inc. -# Karl Eichwalder <ke@gnu.franken.de>, 1999. +# Copyright © 1996, 1997, 1998, 1999, 2000 Free Software Foundation, Inc. +# Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002. +# Karl Eichwalder <ke@gnu.franken.de>, 1999, 2000. # Karl Eichwalder <ke@suse.de>, 1997, 1998, 1999. # Karl Eichwalder <ke@ke.Central.DE>, 1996. # +# 2001-05-14 +# Update: version 4.0b +# MPi +# +# 2000-02-28 08:25:03 CET +# In HTML output, change 8bit characters to SGML entities (ß -> ß, etc.) +# Reported by Thomas Esken, 1999-09-13. +# -ke- +# +# 1999-10-07 20:56:42 CEST +# Update: version 4.0 +# -ke- +# # 1999-08-18 07:48:14 CEST # Update: version 3.12q. # -ke- @@ -36,28 +50,22 @@ # msgid "" msgstr "" -"Project-Id-Version: texinfo 3.12q\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" -"PO-Revision-Date: 1999-07-28 08:55+02:00\n" -"Last-Translator: Karl Eichwalder <ke@gnu.franken.de>\n" +"Project-Id-Version: texinfo 4.1c\n" +"POT-Creation-Date: 2002-04-01 06:10-0800\n" +"PO-Revision-Date: 2002-03-25 11:56:27+0100\n" +"Last-Translator: Michael Piefel <piefel@informatik.hu-berlin.de>\n" "Language-Team: German <de@li.org>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8-bit\n" -#. **************************************************************** -#. -#. Echo Area Movement Commands -#. -#. **************************************************************** -#: info/echo-area.c:283 info/session.c:711 +#: info/echo-area.c:283 info/session.c:712 msgid "Move forward a character" -msgstr "Ein Zeichen vorwärts bewegen" +msgstr "Ein Zeichen vorwärts bewegen" -#. Move point backward in the node. -#: info/echo-area.c:295 info/session.c:727 +#: info/echo-area.c:295 info/session.c:728 msgid "Move backward a character" -msgstr "Ein Zeichen rückwärts bewegen" +msgstr "Ein Zeichen rückwärts bewegen" #: info/echo-area.c:307 msgid "Move to the start of this line" @@ -67,23 +75,22 @@ msgstr "Zum Anfang dieser Zeile bewegen" msgid "Move to the end of this line" msgstr "Zum Ende dieser Zeile bewegen" -#. Move forward a word in the input line. -#: info/echo-area.c:320 info/session.c:745 +#: info/echo-area.c:320 info/session.c:746 msgid "Move forward a word" -msgstr "Ein Wort vorwärts bewegen" +msgstr "Ein Wort vorwärts bewegen" -#: info/echo-area.c:360 info/session.c:794 +#: info/echo-area.c:360 info/session.c:795 msgid "Move backward a word" -msgstr "Ein Wort rückwärts bewegen" +msgstr "Ein Wort rückwärts bewegen" #: info/echo-area.c:400 msgid "Delete the character under the cursor" -msgstr "Das Zeichen unter dem Cursor löschen" +msgstr "Das Zeichen unter dem Cursor löschen" # checkit #: info/echo-area.c:430 msgid "Delete the character behind the cursor" -msgstr "Das Zeichen hinter dem Cursor löschen" +msgstr "Das Zeichen hinter dem Cursor löschen" #: info/echo-area.c:451 msgid "Cancel or quit operation" @@ -91,11 +98,11 @@ msgstr "Operation abbrechen oder beenden" #: info/echo-area.c:466 msgid "Accept (or force completion of) this line" -msgstr "Akzeptiere diese Zeile (oder erzwinge ihre Vervollständigung)" +msgstr "Akzeptiere diese Zeile (oder erzwinge ihre Vervollständigung)" #: info/echo-area.c:471 msgid "Insert next character verbatim" -msgstr "Das nächste Zeichen wörtlich eingeben" +msgstr "Das nächste Zeichen wörtlich eingeben" #: info/echo-area.c:479 msgid "Insert this character" @@ -106,29 +113,23 @@ msgstr "Dieses Zeichen eingeben" msgid "Insert a TAB character" msgstr "Ein TAB-Zeichen eingeben" -#. Transpose the characters at point. If point is at the end of the line, -#. then transpose the characters before point. #: info/echo-area.c:504 msgid "Transpose characters at point" msgstr "Zeichen am Point umstellen" #: info/echo-area.c:555 msgid "Yank back the contents of the last kill" -msgstr "Füge den Inhalt des letzten Killens ein" +msgstr "Füge den Inhalt des letzten Killens ein" -# IMO muss "kill" auch im Folgenden wörtlich üs werden -ke- +# IMO muss "kill" auch im Folgenden wörtlich üs werden -ke- #: info/echo-area.c:562 msgid "Kill ring is empty" msgstr "Der Kill-Ring ist leer" -#. If the last command was yank, or yank_pop, and the text just before -#. point is identical to the current kill item, then delete that text -#. from the line, rotate the index down, and yank back some other text. #: info/echo-area.c:575 msgid "Yank back a previous kill" -msgstr "Füge ein vorangehendes Killen ein" +msgstr "Füge ein vorangehendes Killen ein" -#. Delete the text from point to end of line. #: info/echo-area.c:608 msgid "Kill to the end of the line" msgstr "Bis zum Ende der Zeile killen" @@ -137,7 +138,6 @@ msgstr "Bis zum Ende der Zeile killen" msgid "Kill to the beginning of the line" msgstr "Bis zum Anfang der Zeile killen" -#. Delete from point to the end of the current word. #: info/echo-area.c:633 msgid "Kill the word following the cursor" msgstr "Das dem Cursor folgende Wort killen" @@ -146,54 +146,55 @@ msgstr "Das dem Cursor folgende Wort killen" msgid "Kill the word preceding the cursor" msgstr "Das dem Cursor vorangehende Wort killen" -#: info/echo-area.c:871 +#: info/echo-area.c:872 info/echo-area.c:932 +msgid "No completions" +msgstr "Keine Vervollständigungen" + +#: info/echo-area.c:874 msgid "Not complete" -msgstr "Nicht vollständig" +msgstr "Nicht vollständig" -#: info/echo-area.c:916 +#: info/echo-area.c:919 msgid "List possible completions" -msgstr "Mögliche Vervollständigungen auflisten" +msgstr "Mögliche Vervollständigungen auflisten" -#: info/echo-area.c:929 -msgid "No completions" -msgstr "Keine Vervollständigungen" - -#: info/echo-area.c:933 +#: info/echo-area.c:936 msgid "Sole completion" -msgstr "Einzige Vervollständigung" +msgstr "Einzige Vervollständigung" -#: info/echo-area.c:942 +#: info/echo-area.c:945 msgid "One completion:\n" -msgstr "Eine Vervollständigung:\n" +msgstr "Eine Vervollständigung:\n" -#: info/echo-area.c:943 +#: info/echo-area.c:946 #, c-format msgid "%d completions:\n" -msgstr "%d Vervollständigungen:\n" +msgstr "%d Vervollständigungen:\n" -#: info/echo-area.c:1089 +#: info/echo-area.c:1092 msgid "Insert completion" -msgstr "Vervollständigung einfügen" +msgstr "Vervollständigung einfügen" -#: info/echo-area.c:1222 +#: info/echo-area.c:1225 msgid "Building completions..." -msgstr "Bilde Vervollständigungen..." +msgstr "Bilde Vervollständigungen..." # checkit -#. Scroll the "other" window. If there is a window showing completions, scroll -#. that one, otherwise scroll the window which was active on entering the read -#. function. -#: info/echo-area.c:1320 +#: info/echo-area.c:1342 msgid "Scroll the completions window" -msgstr "Vervollständigungs-Fenster »scrollen«" +msgstr "Vervollständigungs-Fenster »scrollen«" #: info/footnotes.c:212 msgid "Footnotes could not be displayed" -msgstr "Fußnoten können nicht angezeigt werden" +msgstr "Fußnoten können nicht angezeigt werden" #: info/footnotes.c:238 msgid "Show the footnotes associated with this node in another window" -msgstr "Zeige die mit diesem Node verbundenen Fußnoten im anderen Fenster" +msgstr "Zeige die mit diesem Knoten verbundenen Fußnoten im anderen Fenster" + +#: info/footnotes.h:26 +msgid "---------- Footnotes ----------" +msgstr "---------- Fußnoten ----------" #: info/indices.c:175 msgid "Look up a string in the index for this file" @@ -201,13 +202,13 @@ msgstr "Sieh eine Zeichenkette im Index dieser Datei nach" #: info/indices.c:205 msgid "Finding index entries..." -msgstr "Suche Index-Einträge..." +msgstr "Suche Index-Einträge..." # checkit -# oder sind "Einträge" gemeint? -ke- +# oder sind "Einträge" gemeint? -ke- #: info/indices.c:212 msgid "No indices found." -msgstr "Keine Indices gefunden." +msgstr "Keine Indizes gefunden." #: info/indices.c:222 msgid "Index entry: " @@ -217,8 +218,8 @@ msgstr "Index-Eintrag: " msgid "" "Go to the next matching index item from the last `\\[index-search]' command" msgstr "" -"Geh zum nächsten übereinstimmenden Index-Eintrag vom letzten " -"»\\[index-search]«-Befehl" +"Geh zum nächsten übereinstimmenden Index-Eintrag vom letzten »\\[index-" +"search]«-Befehl" #: info/indices.c:342 msgid "No previous index search string." @@ -226,14 +227,14 @@ msgstr "Keine vorangehende zu suchende Index-Zeichenkette." #: info/indices.c:349 msgid "No index entries." -msgstr "Keine Index-Einträge." +msgstr "Keine Index-Einträge." # checkit # kann im Deutschen nachgebildet werden, aber... -ke- #: info/indices.c:382 #, c-format msgid "No %sindex entries containing \"%s\"." -msgstr "Keine %sIndex-Einträge beinhalten »%s«." +msgstr "Keine %sIndex-Einträge beinhalten »%s«." #: info/indices.c:383 msgid "more " @@ -247,19 +248,24 @@ msgstr "DIES IST NICHT ZU SEHEN" #, c-format msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)" msgstr "" -"»%s« in %s gefunden. (»\\[next-index-match]« versucht nächsten Eintrag zu " +"»%s« in %s gefunden. (»\\[next-index-match]« versucht, nächsten Eintrag zu " "finden.)" #: info/indices.c:549 #, c-format msgid "Scanning indices of \"%s\"..." -msgstr "Index von »%s« wird durchsucht..." +msgstr "Index von »%s« wird durchsucht..." + +#: info/indices.c:603 +#, c-format +msgid "No available info files have \"%s\" in their indices." +msgstr "Keine verfügbare Info-Datei hat »%s« in ihrem Index." #: info/indices.c:632 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "" -"Durchsuche durch alle bekannten Info-Datei-Indices nach einer Zeichenkette " -"und bilde ein Menü" +"Durchsuche durch alle bekannten Info-Datei-Indizes nach einer Zeichenkette " +"und bilde ein Menü" #: info/indices.c:636 msgid "Index apropos: " @@ -272,15 +278,15 @@ msgid "" "* Menu: Nodes whoses indices contain \"%s\":\n" msgstr "" "\n" -"* Menü: Nodes, deren Indices »%s« beinhalten:\n" +"* Menü: Knoten, deren Indizes »%s« beinhalten:\n" -#: info/info.c:248 +#: info/info.c:260 info/infokey.c:884 msgid "Try --help for more information.\n" -msgstr "»--help« gibt weitere Informationen.\n" +msgstr "»--help« gibt weitere Informationen.\n" # Hier de-Standard-Formulierung einsetzen! -#: info/info.c:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 -#: util/texindex.c:336 +#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689 +#: util/install-info.c:1224 util/texindex.c:338 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -288,38 +294,45 @@ msgid "" "under the terms of the GNU General Public License.\n" "For more information about these matters, see the files named COPYING.\n" msgstr "" -"Copyright © %s Free Software Foundation, Inc.\n" -"Dies ist freie Software; in den Quellen befindet sich die Lizenz- und\n" -"Kopierbedingung. Es gibt KEINERLEI Garantie, nicht einmal für die\n" -"TAUGLICHKEIT oder die VERWENDBARKEIT ZU EINEM ANGEGEBENEN ZWECK.\n" +"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" -#: info/info.c:461 +#: info/info.c:462 #, c-format msgid "no index entries found for `%s'\n" -msgstr "Keine Einträge für »%s« gefunden\n" +msgstr "Keine Einträge für »%s« gefunden\n" + +#: info/info.c:555 +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:530 -#, fuzzy, c-format +#: info/info.c:562 +#, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" "\n" "Read documentation in Info format.\n" "\n" "Options:\n" -" --apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n" -" --directory=DIR add DIR to INFOPATH.\n" -" --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" --file=FILENAME specify Info file to visit.\n" -" --help display this help and exit.\n" -" --index-search=STRING go to node pointed by index entry STRING.\n" -" --node=NODENAME specify nodes in first visited Info file.\n" -" --output=FILENAME output selected nodes to FILENAME.\n" -" --restore=FILENAME read initial keystrokes from FILENAME.\n" -" --show-options, --usage go to command-line options node.\n" -" --subnodes recursively output menu items.\n" -"%s --vi-keys use vi-like and less-like key bindings.\n" -" --version display version information and exit.\n" +" --apropos=STRING look up STRING in all indices of all " +"manuals.\n" +" -d, --directory=DIR add DIR to INFOPATH.\n" +" --dribble=FILENAME remember user keystrokes in FILENAME.\n" +" -f, --file=FILENAME specify Info file to visit.\n" +" -h, --help display this help and exit.\n" +" --index-search=STRING go to node pointed by index entry STRING.\n" +" -n, --node=NODENAME specify nodes in first visited Info file.\n" +" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -R, --raw-escapes don't remove ANSI escapes from man pages.\n" +" --restore=FILENAME read initial keystrokes from FILENAME.\n" +" -O, --show-options, --usage go to command-line options node.\n" +"%s --subnodes recursively output menu items.\n" +" --vi-keys use vi-like and less-like key bindings.\n" +" --version display version information and exit.\n" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" @@ -333,458 +346,789 @@ msgid "" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" " info -f ./foo.info show file ./foo.info, not searching dir\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" -"Syntax: %s [OPTION]... [INFO-DATEI [MENU-EINTRAG...]]\n" +"Aufruf: %s [OPTION]... [INFO-DATEI [MENU-EINTRAG...]]\n" "\n" -"Dokumentation lesen, die im Info-Format vorliegt.\n" +"Zum Lesen von Dokumentation, die im Info-Format vorliegt.\n" "\n" "Optionen:\n" -" --directory=VERZ VERZ dem INFOPATH hinzufügen\n" -" --dribble=DATEI Tasteneingaben des Benutzers in DATEI merken\n" -" --file=DATEI zu besuchende Info-DATEI angeben\n" -" --help diese Hilfe anzeigen\n" -" --index-search=Kette zu einem Knoten gehen, auf den der Indexeintrag " +" --apropos=ZKETTE nach einer ZKETTE in allen Indizes aller Manual " +"suchen\n" +" -d, --directory=VERZ VERZ dem INFOPATH hinzufügen\n" +" --dribble=DATEI Tasteneingaben des Benutzers in DATEI merken\n" +" -f, --file=DATEI zu besuchende Info-DATEI angeben\n" +" -h, --help diese Hilfe anzeigen\n" +" --index-search=KETTE zu einem Knoten gehen, auf den der Indexeintrag " "KETTE\n" -" zeigt\n" -" --node=KNOTEN Knoten in der ersten zu besuchenden Info-Datei " +" zeigt\n" +" -n, --node=KNOTEN Knoten in der ersten zu besuchenden Info-Datei " "angeben\n" -" --output=DATEI ausgewählte Knoten nach DATEI ausgeben\n" -" --restore=DATEI die beginnenden Tasteneingaben von DATEI lesen\n" -" --show-options, --usage\n" -" zum Knoten mit den Optionen für den Befehlsaufruf " -"gehen\n" -" --subnodes Menüpunkte rekursiv ausgeben\n" -"%s --vi-keys vi- und less-artige Tastenbindungen benutzen\n" -" --version Programmversion anzeigen\n" +" -o, --output=DATEI ausgewählte Knoten nach DATEI ausgeben\n" +" -R, --raw-escapes ANSI-Escapes aus Manpages nicht entfernen\n" +" --restore=DATEI die beginnenden Tasteneingaben von DATEI lesen\n" +" -O, --show-options, --usage\n" +" zum Knoten mit den Optionen für den " +"Befehlsaufruf gehen\n" +"%s --subnodes Menüpunkte rekursiv ausgeben\n" +" --vi-keys vi- und less-artige Tastenbindungen benutzen\n" +" --version Programmversion anzeigen\n" "\n" -"Der erste Parameter, der keine Option ist, ist der Menüeintrag, von dem aus\n" -"gestartet werden soll; nach diesem Menüeintrag wird in allen »dir«-Datei\n" -"gemäß dem INFOPATH gesucht.\n" -"Wenn kein Menüeintrag angegeben wird, packt info alle »dir«-Dateien " +"Der erste Parameter, der keine Option ist, ist der Menüeintrag, von dem aus\n" +"gestartet werden soll; nach diesem Menüeintrag wird in allen »dir«-Datei\n" +"gemäß dem INFOPATH gesucht.\n" +"Wenn kein Menüeintrag angegeben wird, packt info alle »dir«-Dateien " "zusammen\n" "und zeigt das Ergebnis an.\n" -"Verbleibende Parameter werden als Namen von Menüeinträgen des zuerst " +"Verbleibende Parameter werden als Namen von Menüeinträgen des zuerst " "besuchten\n" "Knotens angesehen.\n" "\n" "Beispiele:\n" -" info Das oberste »dir«-Menü anzeigen\n" -" info emacs Beim emacs-Knoten im obersten »dir«-Menü " +" info Das oberste »dir«-Menü anzeigen\n" +" info emacs Beim emacs-Knoten im obersten »dir«-Menü " "beginnen\n" " info emacs buffers Beim buffers-Knoten im emacs-Manual beginnen\n" -" info --show-options emacs Beim Knoten mit den " -"emacs-Kommandozeilen-Optionen\n" +" info --show-options emacs Beim Knoten mit den emacs-Kommandozeilen-" +"Optionen\n" " beginnen\n" " info -f ./foo.info Datei ./foo.info anzeigen\n" + +#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474 +#: util/install-info.c:421 util/texindex.c:286 +msgid "" "\n" -"Fehler (\"Bugs\") bitte an <bug-texinfo@gnu.org> melden,\n" -"allgemeine Fragen und Gedankenaustausch an <help-texinfo@gnu.org>.\n" +"Email bug reports to bug-texinfo@gnu.org,\n" +"general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" +msgstr "" "\n" -"Für die deutsche Übersetzung ist die Mailingliste <de@li.org> zuständig.\n" +"Fehlerberichte per E-Mail an bug-texinfo@gnu.org schicken,\n" +"allgemeine Fragen und Gedankenaustausch an help-texinfo@gnu.org.\n" +"Texinfos Homepage: http://www.gnu.org/software/texinfo/" -#: info/info.c:604 -#, fuzzy, c-format +#: info/info.c:632 +#, c-format msgid "Cannot find node `%s'." -msgstr "Kann Knoten »%s« nicht killen" +msgstr "Kann den Knoten »%s« nicht finden." -#: info/info.c:605 -#, fuzzy, c-format +#: info/info.c:633 +#, c-format msgid "Cannot find node `(%s)%s'." -msgstr "Kann Knoten »%s« nicht killen" +msgstr "Kann den Knoten »(%s)%s« nicht finden." -#: info/info.c:606 -#, fuzzy +#: info/info.c:634 msgid "Cannot find a window!" -msgstr "Ein permanentes Fenster kann nicht gelöscht werden" +msgstr "Kann kein Fenster finden!" -#: info/info.c:607 +#: info/info.c:635 msgid "Point doesn't appear within this window's node!" -msgstr "" +msgstr "Der Point erscheint nicht in dem Knoten dieses Fensters!" -#: info/info.c:608 -#, fuzzy +#: info/info.c:636 msgid "Cannot delete the last window." -msgstr "Ein permanentes Fenster kann nicht gelöscht werden" +msgstr "Kann das letzte Fenster nicht löschen!" -#: info/info.c:609 -#, fuzzy +#: info/info.c:637 msgid "No menu in this node." -msgstr "Kein Menü im Knoten »%s«." +msgstr "Kein Menü in diesem Knoten." -#: info/info.c:610 -#, fuzzy +#: info/info.c:638 msgid "No footnotes in this node." -msgstr "Keine Querverweise in diesem Knoten." +msgstr "Keine Fußnoten in diesem Knoten." -#: info/info.c:611 +#: info/info.c:639 msgid "No cross references in this node." msgstr "Keine Querverweise in diesem Knoten." -#: info/info.c:612 -#, fuzzy, c-format +#: info/info.c:640 +#, c-format msgid "No `%s' pointer for this node." -msgstr "Kein »Next«-Verweis bei diesem Knoten." +msgstr "Kein »%s«-Verweis für diesem Knoten." -#: info/info.c:613 +#: info/info.c:641 #, c-format msgid "Unknown Info command `%c'; try `?' for help." -msgstr "" +msgstr "Unbekannter Info-Befehl `%c'; `?' eingeben, um Hilfe zu bekommen." -#: info/info.c:614 +#: info/info.c:642 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." -msgstr "" +msgstr "Der Terminaltyp `%s' ist nicht fähig genug, um Info laufen zu lassen." -#: info/info.c:615 -#, fuzzy +#: info/info.c:643 msgid "You are already at the last page of this node." -msgstr "Zum Anfang dieses Knotens bewegen" +msgstr "Sie sind bereits auf der letzten Seite dieses Knotens." -#: info/info.c:616 -#, fuzzy +#: info/info.c:644 msgid "You are already at the first page of this node." -msgstr "Zum Anfang dieses Knotens bewegen" +msgstr "Sie sind bereits auf der ersten Seite dieses Knotens." -#: info/info.c:617 +#: info/info.c:645 msgid "Only one window." -msgstr "" +msgstr "Nur ein Fenster." -#: info/info.c:618 +#: info/info.c:646 msgid "Resulting window would be too small." -msgstr "" +msgstr "Das entstehende Fenster wäre zu klein." -#: info/info.c:619 +#: info/info.c:647 msgid "Not enough room for a help window, please delete a window." -msgstr "" - -#: info/infodoc.c:45 -msgid "Basic Commands in Info Windows\n" -msgstr "Grundbefehle in Info-Fenstern\n" +msgstr "Nicht genügend Platz für ein Hilfefenster, bitte ein Fenster löschen." -#: info/infodoc.c:46 -msgid "******************************\n" -msgstr "*****************************\n" +#: info/infodoc.c:45 info/infodoc.c:94 +msgid "" +"Basic Commands in Info Windows\n" +"******************************\n" +msgstr "" +"Grundbefehle in Info-Fenstern\n" +"*****************************\n" #: info/infodoc.c:48 -#, c-format -msgid " %-10s Quit this help.\n" -msgstr " %-10s Diese Hilfe beenden.\n" +msgid "\\%-10[quit-help] Quit this help.\n" +msgstr "\\%-10[quit-help] Diese Hilfe verlassen. \n" #: info/infodoc.c:49 -#, c-format -msgid " %-10s Quit Info altogether.\n" -msgstr " %-10s Info gänzlich beenden.\n" +msgid "\\%-10[quit] Quit Info altogether.\n" +msgstr "\\%-10[quit] Info gänzlich beenden.\n" #: info/infodoc.c:50 -#, c-format -msgid " %-10s Invoke the Info tutorial.\n" -msgstr " %-10s Das Info-Tutorial aufrufen.\n" +msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" +msgstr "\\%-10[get-info-help-node] Das Info-Tutorial aufrufen.\n" -#: info/infodoc.c:52 -msgid "Moving within a node:\n" -msgstr "Innerhalb eines Knotens bewegen:\n" - -#: info/infodoc.c:53 -msgid "---------------------\n" -msgstr "----------------------\n" +#: info/infodoc.c:52 info/infodoc.c:101 +msgid "" +"Selecting other nodes:\n" +"----------------------\n" +msgstr "" +"Andere Knoten wählen:\n" +"---------------------\n" #: info/infodoc.c:54 -#, c-format -msgid " %-10s Scroll forward a page.\n" -msgstr " %-10s Eine Seite vorwärts blättern.\n" +msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" +msgstr "\\%-10[next-node] Zum nächsten Knoten (»next«) dieses Knoten gehen.\n" #: info/infodoc.c:55 -#, c-format -msgid " %-10s Scroll backward a page.\n" -msgstr " %-10s Eine Seite rückwärts blättern.\n" +msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" +msgstr "" +"\\%-10[prev-node] Zum vorherigen Knoten (»previous«) dieses Knoten gehen.\n" #: info/infodoc.c:56 -#, c-format -msgid " %-10s Go to the beginning of this node.\n" -msgstr " %-10s Zum Beginn dieses Knotens gehen.\n" +msgid "\\%-10[up-node] Move \"up\" from this node.\n" +msgstr "\\%-10[up-node] Von diesem Knoten aus hoch (»up«) gehen.\n" #: info/infodoc.c:57 -#, c-format -msgid " %-10s Go to the end of this node.\n" -msgstr " %-10s Zum Ende dieses Knotens gehen.\n" - -#: info/infodoc.c:58 -#, c-format -msgid " %-10s Scroll forward 1 line.\n" -msgstr " %-10s Eine Seite vorwärts blättern.\n" +msgid "" +"\\%-10[menu-item] Pick menu item specified by name.\n" +" Picking a menu item causes another node to be selected.\n" +msgstr "" +"\\%-10[menu-item] Einen Menüeintrag per Namen auswählen.\n" +" Auswahl eines Menüeintrags führt zu Auswahl eines anderen " +"Knotens.\n" #: info/infodoc.c:59 -#, c-format -msgid " %-10s Scroll backward 1 line.\n" -msgstr " %-10s Eine Seite rückwärts blättern.\n" +msgid "" +"\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n" +msgstr "" +"\\%-10[xref-item] Einem Querverweis folgen. Liest den Namen der Referenz.\n" + +#: info/infodoc.c:60 +msgid "\\%-10[history-node] Move to the last node seen in this window.\n" +msgstr "" +"\\%-10[history-node] Zum letzten in diesem Fenster betrachteten Knoten " +"gehen.\n" #: info/infodoc.c:61 -msgid "Selecting other nodes:\n" -msgstr "Andere Knoten auswählen:\n" +msgid "" +"\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n" +msgstr "" +"\\%-10[move-to-next-xref] Vor zur nächsten Verknüpfung auf dieser Seite " +"springen.\n" #: info/infodoc.c:62 -msgid "----------------------\n" -msgstr "----------------------\n" +msgid "" +"\\%-10[move-to-prev-xref] Skip to previous hypertext link within this " +"node.\n" +msgstr "" +"\\%-10[move-to-prev-xref] Zurück zur vorigen Verknüpfung auf dieser Seite " +"springen.\n" #: info/infodoc.c:63 -#, fuzzy, c-format -msgid " %-10s Move to the `next' node of this node.\n" -msgstr " %-10s Zum \"nächsten\" Knoten dieses Knotens bewegen.\n" +msgid "" +"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" +msgstr "" +"\\%-10[select-reference-this-line] Der Verknüpfung unter dem Cursor " +"folgen.\n" #: info/infodoc.c:64 -#, fuzzy, c-format -msgid " %-10s Move to the `previous' node of this node.\n" -msgstr " %-10s Zum \"vorangehenden\" Knoten dieses Knotens bewegen.\n" +msgid "" +"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" +"node] (DIR)'.\n" +msgstr "" +"\\%-10[dir-node] Zum »directory«-Knoten springen. Gleichbedeutend zu `" +"\\[goto-node] (DIR)'.\n" #: info/infodoc.c:65 -#, fuzzy, c-format +msgid "" +"\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node] Top'.\n" +msgstr "" +"\\%-10[top-node] Zum obersten Knoten springen. Gleichbedeutend zu `\\[goto-" +"node] Top'.\n" + +#: info/infodoc.c:67 info/infodoc.c:115 +msgid "" +"Moving within a node:\n" +"---------------------\n" +msgstr "" +"Bewegung innerhalb eines Knoten:\n" +"--------------------------------\n" + +#: info/infodoc.c:69 +msgid "\\%-10[scroll-forward] Scroll forward a page.\n" +msgstr "\\%-10[scroll-forward] Eine Seite vorwärts blättern.\n" + +#: info/infodoc.c:70 +msgid "\\%-10[scroll-backward] Scroll backward a page.\n" +msgstr "\\%-10[scroll-backward] Eine Seite rückwärts blättern.\n" + +#: info/infodoc.c:71 +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" +msgstr "\\%-10[beginning-of-node] Zum Anfang dieses Knoten gehen.\n" + +#: info/infodoc.c:72 +msgid "\\%-10[end-of-node] Go to the end of this node.\n" +msgstr "\\%-10[end-of-node] Zum Ende dieses Knoten gehen.\n" + +#: info/infodoc.c:73 +msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" +msgstr "\\%-10[scroll-forward] Eine Zeile vorwärts blättern.\n" + +#: info/infodoc.c:74 +msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" +msgstr "\\%-10[scroll-backward] Eine Zeile rückwärts blättern.\n" + +#: info/infodoc.c:76 info/infodoc.c:124 +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "" +"Weitere Befehle:\n" +"----------------\n" + +#: info/infodoc.c:78 +msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" +msgstr "" +"\\%-10[menu-digit] Ersten ... neunten Eintrag aus dem Menü des Knoten " +"wählen.\n" + +#: info/infodoc.c:79 +msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" +msgstr "" +"\\%-10[last-menu-item] Letzten Eintrag aus dem Menü des Knoten wählen.\n" + +#: info/infodoc.c:80 +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] Nach einer angegebenen Zeichenkette in den " +"Indexeintägen dieser\n" +" Info-Datei suchen und zu dem Knoten springen, der vom ersten\n" +" gefundenen Eintrag referenziert wird.\n" + +#: info/infodoc.c:82 +msgid "" +"\\%-10[goto-node] Move to node specified by name.\n" +" You may include a filename as well, as in (FILENAME)NODENAME.\n" +msgstr "" +"\\%-10[goto-node] Zum per Namen angegebenen Knoten springen.\n" +" Ein Dateiname kann mit angegeben werden, also (DATEI)" +"KNOTENNAME.\n" + +#: info/infodoc.c:84 +msgid "" +"\\%-10[search] Search forward for a specified string\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" +"\\%-10[search] Vorwärtssuche durch diese Info-Datei nach angegebener " +"Zeichenkette\n" +" und den Knoten wählen, in dem das nächste Vorkommen gefunden " +"wurde.\n" + +#: info/infodoc.c:86 +msgid "" +"\\%-10[search-backward] Search backward for a specified string\n" +" and select the node in which the previous occurrence is " +"found.\n" +msgstr "" +"\\%-10[search-backward] Rückwärtssuche durch diese Info-Datei nach " +"angegebener Zeichenkette\n" +" und den Knoten wählen, in dem das nächste Vorkommen gefunden " +"wurde.\n" + +#: info/infodoc.c:97 +#, c-format +msgid " %-10s Quit this help.\n" +msgstr " %-10s Diese Hilfe verlassen.\n" + +#: info/infodoc.c:98 +#, c-format +msgid " %-10s Quit Info altogether.\n" +msgstr " %-10s Info gänzlich beenden.\n" + +#: info/infodoc.c:99 +#, c-format +msgid " %-10s Invoke the Info tutorial.\n" +msgstr " %-10s Das Info-Tutorial aufrufen.\n" + +#: info/infodoc.c:103 +#, c-format +msgid " %-10s Move to the `next' node of this node.\n" +msgstr " %-10s Zum nächsten Knoten (»next«) dieses Knoten gehen.\n" + +#: info/infodoc.c:104 +#, c-format +msgid " %-10s Move to the `previous' node of this node.\n" +msgstr " %-10s Zum vorherigen Knoten (»previous«) dieses Knoten gehen.\n" + +#: info/infodoc.c:105 +#, c-format msgid " %-10s Move `up' from this node.\n" -msgstr " %-10s \"hinauf\" von diesem Knoten bewegen.\n" +msgstr " %-10s Von diesem Knoten aus hoch (»up«) gehen.\n" -#: info/infodoc.c:66 +#: info/infodoc.c:106 #, c-format msgid " %-10s Pick menu item specified by name.\n" -msgstr " %-10s Menüpunkt mit Namensangabe wählen.\n" +msgstr " %-10s Einen Menüeintrag per Namen auswählen.\n" -#: info/infodoc.c:67 +#: info/infodoc.c:107 msgid " Picking a menu item causes another node to be selected.\n" msgstr "" -" Auswahl eines Menüpunkts wird einen anderen Knoten auswählen.\n" +" Auswahl eines Menüeintrags führt zu Auswahl eines anderen " +"Knotens.\n" -#: info/infodoc.c:68 +#: info/infodoc.c:108 #, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" -msgstr " %-10s Einem Querverweis folgen. Namen eines Verweises lesen.\n" +msgstr " %-10s Einem Querverweis folgen. Liest den Namen der Referenz.\n" -#: info/infodoc.c:69 +#: info/infodoc.c:109 #, c-format msgid " %-10s Move to the last node seen in this window.\n" -msgstr "" -" %-10s Zum letzten Knoten bewegen, der in diesem Fenster sichtbar war.\n" +msgstr " %-10s Zum letzten in diesem Fenster betrachteten Knoten gehen.\n" -#: info/infodoc.c:70 +#: info/infodoc.c:110 #, c-format msgid " %-10s Skip to next hypertext link within this node.\n" -msgstr " %-10s Zum nächsten Hypertext-Link dieses Knotens springen.\n" +msgstr " %-10s Vor zur nächsten Verknüpfung auf dieser Seite springen.\n" -#: info/infodoc.c:71 +#: info/infodoc.c:111 #, c-format msgid " %-10s Follow the hypertext link under cursor.\n" -msgstr " %-10s Dem Hypertext-Link unter dem Cursor folgen.\n" +msgstr " %-10s Der Verknüpfung unter dem Cursor folgen.\n" -#: info/infodoc.c:72 +#: info/infodoc.c:112 #, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" msgstr "" -" %-10s Zum »directory«-Knoten bewegen. Gleichbedeutend mit »g (DIR)«.\n" +" %-10s Zum »directory«-Knoten springen. Gleichbedeutend mit »g (DIR)«.\n" -#: info/infodoc.c:73 +#: info/infodoc.c:113 #, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" -msgstr "" -" %-10s Zum »directory«-Knoten bewegen. Gleichbedeutend mit »g (DIR)«.\n" +msgstr " %-10s Zum »Top«-Knoten springen. Gleichbedeutend mit »g Top«.\n" + +#: info/infodoc.c:117 +#, c-format +msgid " %-10s Scroll forward a page.\n" +msgstr " %-10s Eine Seite vorwärts blättern.\n" + +#: info/infodoc.c:118 +#, c-format +msgid " %-10s Scroll backward a page.\n" +msgstr " %-10s Eine Seite rückwärts blättern.\n" + +#: info/infodoc.c:119 +#, c-format +msgid " %-10s Go to the beginning of this node.\n" +msgstr " %-10s Zum Anfang dieses Knotens gehen.\n" + +#: info/infodoc.c:120 +#, c-format +msgid " %-10s Go to the end of this node.\n" +msgstr " %-10s Zum Ende dieses Knotens gehen.\n" -#: info/infodoc.c:75 -msgid "Other commands:\n" -msgstr "Andere Befehle:\n" +#: info/infodoc.c:121 +#, c-format +msgid " %-10s Scroll forward 1 line.\n" +msgstr " %-10s Eine Zeile vorwärts blättern.\n" -#: info/infodoc.c:76 -msgid "---------------\n" -msgstr "---------------\n" +#: info/infodoc.c:122 +#, c-format +msgid " %-10s Scroll backward 1 line.\n" +msgstr " %-10s Eine Zeile rückwärts blättern.\n" -#: info/infodoc.c:77 +#: info/infodoc.c:126 #, c-format msgid " %-10s Pick first ... ninth item in node's menu.\n" -msgstr "" -" %-10s Ersten ... neunten Punkt des Menüs dieses Knotens auswählen.\n" +msgstr " %-10s Ersten ... neunten Eintrag aus dem Menü des Knoten wählen.\n" -#: info/infodoc.c:78 +#: info/infodoc.c:127 #, c-format msgid " %-10s Pick last item in node's menu.\n" -msgstr " %-10s Letzten Punkt des Menüs dieses Knotens auswählen.\n" +msgstr " %-10s Letzten Eintrag aus dem Menü des Knoten wählen.\n" -#: info/infodoc.c:79 +#: info/infodoc.c:128 #, c-format msgid "" " %-10s Search for a specified string in the index entries of this Info\n" msgstr "" -" %-10s Nach einer Zeichenkette in den Indexeinträgen dieser Info-Datei\n" +" %-10s Nach einer Zeichenkette in den Indexeinträgen dieser Info-Datei\n" -#: info/infodoc.c:80 +#: info/infodoc.c:129 msgid "" " file, and select the node referenced by the first entry " "found.\n" msgstr "" -" suchen und den Knoten auswählen, bezeichnet vom ersten gefundenen " +" suchen und den Knoten auswählen, bezeichnet vom ersten gefundenen " "Eintrag.\n" -#: info/infodoc.c:81 +#: info/infodoc.c:130 #, c-format msgid " %-10s Move to node specified by name.\n" -msgstr " %-10s Zum Knoten mit Namensangabe bewegen.\n" +msgstr " %-10s Zum per Namen angegebenen Knoten springen.\n" -#: info/infodoc.c:82 +#: info/infodoc.c:131 msgid "" " You may include a filename as well, as in (FILENAME)NODENAME.\n" msgstr "" -" Ein Dateiname kann dabei sein, wie bei (DATEINAME)KNOTEN.\n" +" Ein Dateiname kann mit angegeben werden, also (DATEI)" +"KNOTENNAME.\n" -#: info/infodoc.c:83 +#: info/infodoc.c:132 #, c-format -msgid "" -" %-10s Search forward through this Info file for a specified string,\n" +msgid " %-10s Search forward for a specified string,\n" msgstr "" -" %-10s Diese Info-Datei nach einer angegebenen Zeichenkette durchsuchen\n" +" %-10s Vorwärtssuche durch diese Info-Datei nach angegebener Zeichenkette\n" -#: info/infodoc.c:84 info/infodoc.c:86 +#: info/infodoc.c:133 info/infodoc.c:135 msgid "" " and select the node in which the next occurrence is found.\n" msgstr "" -" und den Knoten auswählen, in dem das nächste Vorkommen gefunden " +" und den Knoten wählen, in dem das nächste Vorkommen gefunden " "wurde.\n" -#: info/infodoc.c:85 +#: info/infodoc.c:134 #, c-format -msgid " %-10s Search backward in this Info file for a specified string,\n" +msgid " %-10s Search backward for a specified string\n" msgstr "" -" %-10s Diese Info-Datei nach einer angegebenen Zeichenkette durchsuchen\n" +" %-10s Rückwärtssuche durch diese Info-Datei nach angegebener " +"Zeichenkette\n" -#: info/infodoc.c:258 +#: info/infodoc.c:313 msgid "The current search path is:\n" -msgstr "Der momentane Suchpfa ist:\n" +msgstr "Der momentane Suchpfad ist:\n" -#: info/infodoc.c:261 +#: info/infodoc.c:316 msgid "" "Commands available in Info windows:\n" "\n" msgstr "" -"Befehle, die in Info-Fenstern verfügbar sind:\n" +"Befehle, die in Info-Fenstern verfügbar sind:\n" "\n" -#: info/infodoc.c:264 +#: info/infodoc.c:319 msgid "" "Commands available in the echo area:\n" "\n" msgstr "" -"Befehle, die in der Echo-Area verfügbar sind:\n" +"Befehle, die in der Echo-Area verfügbar sind:\n" +"\n" + +#: info/infodoc.c:340 +#, c-format +msgid "" +"The following commands can only be invoked via %s:\n" +"\n" +msgstr "" +"Die folgenden Befehle können nur via %s aufgerufen werden:\n" "\n" -#: info/infodoc.c:280 +#: info/infodoc.c:343 msgid "" -"The following commands can only be invoked via M-x:\n" +"The following commands cannot be invoked at all:\n" +"\n" +msgstr "" +"Die folgenden Befehle können überhaupt nicht aufgerufen werden:\n" "\n" -msgstr "Die folgenden Befehle können nur via M-x aufgerufen werden:\n" -#: info/infodoc.c:301 +#: info/infodoc.c:367 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" msgstr "" -"--- »\\[history-node]« oder »\\[kill-node]« benutzen, um zu beenden ---\n" +"--- »\\[history-node]« oder »\\[kill-node]« benutzen, um zu beenden ---\n" -#. Create or move to the help window. -#: info/infodoc.c:411 +#: info/infodoc.c:477 msgid "Display help message" msgstr "Diesen Hilfe-Text anzeigen" -#. Show the Info help node. This means that the "info" file is installed -#. where it can easily be found on your system. -#: info/infodoc.c:429 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" -msgstr "Info-Node »(info)Help« besuchen" +msgstr "Info-Knoten »(info)Help« besuchen" -#: info/infodoc.c:555 +#: info/infodoc.c:638 msgid "Print documentation for KEY" -msgstr "Dokumentation für KEY ausgeben" +msgstr "Dokumentation für KEY ausgeben" -#: info/infodoc.c:568 +#: info/infodoc.c:650 #, c-format msgid "Describe key: %s" msgstr "Beschreibe Taste: %s" -#: info/infodoc.c:577 +#: info/infodoc.c:660 #, c-format msgid "ESC %s is undefined." msgstr "ESC %s ist nicht definiert." -#: info/infodoc.c:594 +#: info/infodoc.c:676 info/infodoc.c:703 #, c-format msgid "%s is undefined." msgstr "%s ist nicht definiert." -#: info/infodoc.c:620 +#: info/infodoc.c:724 #, c-format msgid "%s is defined to %s." msgstr "%s ist definiert als %s." -#: info/infodoc.c:812 +#: info/infodoc.c:1151 msgid "Show what to type to execute a given command" -msgstr "Anzeigen, was einzugeben ist, um einen gegebenen Befehl auszuführen" +msgstr "Anzeigen, was einzugeben ist, um einen gegebenen Befehl auszuführen" -#: info/infodoc.c:816 +#: info/infodoc.c:1155 msgid "Where is command: " msgstr "Wo ist der Befehl: " -#: info/infodoc.c:838 +#: info/infodoc.c:1177 #, c-format msgid "`%s' is not on any keys" -msgstr "»%s« liegt auf keiner Taste" +msgstr "»%s« liegt auf keiner Taste" -#: info/infodoc.c:844 +#: info/infodoc.c:1183 #, c-format msgid "%s can only be invoked via %s." msgstr "%s kann nur via %s aufgerufen werden." -#: info/infodoc.c:847 +#: info/infodoc.c:1186 #, c-format msgid "%s can be invoked via %s." msgstr "%s kann via %s aufgerufen werden." -#: info/infodoc.c:851 +#: info/infodoc.c:1190 #, c-format msgid "There is no function named `%s'" -msgstr "Es gibt keine Funktion mit Namen »%s«" +msgstr "Es gibt keine Funktion mit Namen »%s«" -#: info/m-x.c:69 +#: info/infokey.c:164 +msgid "incorrect number of arguments" +msgstr "falsche Anzahl von Argumenten" + +#: info/infokey.c:194 +#, c-format +msgid "cannot open input file `%s'" +msgstr "Eingabedatei »%s« kann nicht geöffnet werden." + +#: info/infokey.c:207 +#, c-format +msgid "cannot create output file `%s'" +msgstr "Ausgabedatei »%s« kann nicht angelegt werden." + +#: info/infokey.c:217 +#, c-format +msgid "error writing to `%s'" +msgstr "Fehler beim Schreiben von »%s«." + +#: info/infokey.c:222 +#, c-format +msgid "error closing output file `%s'" +msgstr "Fehler beim Schließen der Ausgabedatei »%s«." + +#: info/infokey.c:443 +msgid "key sequence too long" +msgstr "Schlüsselsequenz zu lang." + +#: info/infokey.c:521 +msgid "missing key sequence" +msgstr "Fehlende Schlüsselsequenz." + +#: info/infokey.c:600 +msgid "NUL character (\\000) not permitted" +msgstr "NUL-Zeichen (\\000) nicht erlaubt." + +#: info/infokey.c:629 +#, c-format +msgid "NUL character (^%c) not permitted" +msgstr "NUL-Zeichen (^%c) nicht erlaubt." + +#: info/infokey.c:652 +msgid "missing action name" +msgstr "Fehlender Befehlsname." + +#: info/infokey.c:667 info/infokey.c:733 +msgid "section too long" +msgstr "Abschnitt zu lang." + +#: info/infokey.c:673 +#, c-format +msgid "unknown action `%s'" +msgstr "Unbekannter Befehl »%s«." + +#: info/infokey.c:682 +msgid "action name too long" +msgstr "Befehlsname zu lang." + +#: info/infokey.c:694 +#, c-format +msgid "extra characters following action `%s'" +msgstr "Extrazeichen folgen Befehl »%s«." + +#: info/infokey.c:704 +msgid "missing variable name" +msgstr "Dateiname fehlt." + +#: info/infokey.c:712 +msgid "missing `=' immediately after variable name" +msgstr "Fehlendes »=« direkt hinter Variablenname." + +#: info/infokey.c:719 +msgid "variable name too long" +msgstr "Variablenname zu lang" + +#: info/infokey.c:741 +msgid "value too long" +msgstr "Wert zu lang" + +#: info/infokey.c:875 +#, c-format +msgid "\"%s\", line %u: " +msgstr "»%s«, Zeile %u: " + +#: info/infokey.c:891 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT-FILE]\n" +"\n" +"Compile infokey source file to infokey file. Reads INPUT-FILE (default\n" +"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n" +"\n" +"Options:\n" +" --output FILE output to FILE instead of $HOME/.info\n" +" --help display this help and exit.\n" +" --version display version information and exit.\n" +msgstr "" +"Auruf: %s [OPTION]... [EINGABE-DATEI]\n" +"\n" +"Infokey-Quelldatei in Infokey-Datei kompilieren. Liest EINGABE-DATEI\n" +"(Voreinstellung $HOME/.infokey) und schreibt kompilierte Tastaturdatei\n" +"(per Voreinstellung) nach $HOME/.info.\n" +"\n" +"Optionen:\n" +" --output DATEINAME in DATEINAME statt in $HOME/.info ausgeben\n" +" --help diese Hilfe anzeigen und beenden\n" +" --version Versionsnummer anzeigen und beenden\n" + +#: info/infomap.c:1397 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too small" +msgstr "Ungültige Info-Schlüssel-Datei »%s« wird ignoriert - zu klein" + +#: info/infomap.c:1400 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too big" +msgstr "Ungültige Info-Schlüssel-Datei »%s« wird ignoriert - zu groß" + +#: info/infomap.c:1413 +#, c-format +msgid "Error reading infokey file `%s' - short read" +msgstr "Fehler beim Lesen der Infokey-Datei »%s« - zu kurzes Lesen" + +#: info/infomap.c:1431 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" +msgstr "" +"Ungültige Infokey-Datei »%s« (fehlerhafte Magie) -- bitte mittels infokey " +"erneuern" + +#: info/infomap.c:1437 +#, c-format +msgid "Your infokey file `%s' is out of date -- run infokey to update it" +msgstr "Ihre Infokey-Datei »%s« ist veraltet -- bitte mittels infokey erneuern" + +#: info/infomap.c:1450 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" +msgstr "" +"Ungültige Infokey-Datei »%s« (fehlerhafte Abschnittslänge) -- bitte mittels " +"infokey erneuern" + +#: info/infomap.c:1470 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section code) -- run infokey to update it" +msgstr "" +"Ungültige Infokey-Datei »%s« (fehlerhafter Abschnittscode) -- bitte mittels " +"infokey erneuern" + +#: info/infomap.c:1608 +msgid "Bad data in infokey file -- some key bindings ignored" +msgstr "" +"Fehlerhafte Daten in Infokey-Datei -- einige Tastaturbindungen ignoriert" + +#: info/infomap.c:1659 +msgid "Bad data in infokey file -- some var settings ignored" +msgstr "" +"Fehlerhafte Daten in Infokey-Datei -- einige Variableneinstellungen ignoriert" + +#: info/m-x.c:70 msgid "Read the name of an Info command and describe it" msgstr "Lese den Namen eines Info-Befehls und beschreibe ihn" -#: info/m-x.c:73 +#: info/m-x.c:74 msgid "Describe command: " msgstr "Beschreibe den Befehl: " -#: info/m-x.c:96 +#: info/m-x.c:97 msgid "Read a command name in the echo area and execute it" -msgstr "Lies einen Befehlsnamen in der »Echo-Area« und führe ihn aus" +msgstr "Lies einen Befehlsnamen in der »Echo-Area« und führe ihn aus" -#: info/m-x.c:134 +#: info/m-x.c:141 msgid "Cannot execute an `echo-area' command here." -msgstr "Kann hier keinen »echo-area«-Befehl ausführen." +msgstr "Kann hier keinen »echo-area«-Befehl ausführen." -#: info/m-x.c:150 +#: info/m-x.c:157 msgid "Set the height of the displayed window" -msgstr "Setze die Höhe des angezeigten Fensters" +msgstr "Setze die Höhe des angezeigten Fensters" # checkit -#: info/m-x.c:163 +#: info/m-x.c:170 #, c-format msgid "Set screen height to (%d): " -msgstr "Bildschirm-Höhe auf (%d) setzen: " +msgstr "Bildschirm-Höhe auf (%d) setzen: " # checkit -#: info/makedoc.c:132 +#: info/makedoc.c:161 info/makedoc.c:169 msgid "" " Source files groveled to make this file include:\n" "\n" msgstr "" -" Quelldatei \"groveled\", damit diese Datei enthält:\n" +" Quelldatei \"groveled\", damit diese Datei enthält:\n" "\n" -#: info/makedoc.c:465 +#: info/makedoc.c:553 #, c-format msgid "Couldn't manipulate the file %s.\n" -msgstr "Datei »%s« ist nicht zu verändern.\n" +msgstr "Datei »%s« ist nicht zu verändern.\n" #: info/nodemenu.c:28 msgid "" @@ -794,8 +1138,8 @@ msgid "" " ---------- ----- ---- ---------------" msgstr "" "\n" -"* Menü:\n" -" (Datei)Knoten Zeilen Größe Beinhaltet Datei\n" +"* Menü:\n" +" (Datei)Knoten Zeilen Größe Beinhaltet Datei\n" " ------------- ------ ----- ----------------" #: info/nodemenu.c:199 @@ -803,578 +1147,545 @@ msgid "" "Here is the menu of nodes you have recently visited.\n" "Select one from this menu, or use `\\[history-node]' in another window.\n" msgstr "" -"Hier ist das Menü der Knoten, die zuetzt besucht wurden.\n" -"Einen von diesem Menü auswählen oder »\\[history-node]« im anderen Fenster\n" +"Hier ist das Menü der Knoten, die zuetzt besucht wurden.\n" +"Einen von diesem Menü auswählen oder »\\[history-node]« im anderen Fenster\n" "benutzen.\n" #: info/nodemenu.c:219 msgid "Make a window containing a menu of all of the currently visited nodes" msgstr "" -"Veranlassen, dass ein Fenster ein Menü aller aktuell besuchten Knoten enthält" +"Veranlassen, dass ein Fenster ein Menü aller aktuell besuchten Knoten enthält" #: info/nodemenu.c:299 msgid "Select a node which has been previously visited in a visible window" msgstr "" -"Einen Knoten auswählen, der zuvor in einem sichtbaren Fenster besucht wurde" +"Einen Knoten auswählen, der zuvor in einem sichtbaren Fenster besucht wurde" #: info/nodemenu.c:311 msgid "Select visited node: " -msgstr "Besuchten Knoten auswählen: " +msgstr "Besuchten Knoten auswählen: " -#: info/nodemenu.c:331 info/session.c:2146 +#: info/nodemenu.c:331 info/session.c:2235 #, c-format msgid "The reference disappeared! (%s)." msgstr "Der Verweispunkt ist verschwunden! (%s)." -#: info/session.c:169 -#, fuzzy, c-format +#: info/session.c:170 +#, c-format msgid "" "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] " "for menu item." msgstr "" -"Willkommen bei Info Version %s. \"\\[get-help-window]\" um Hilfe zu " -"bekommen,\n" -"mit \"\\[menu-item]\" Menüpunkt anzeigen." +"Willkommen bei Info (Version %s). \"\\[get-help-window]\" eingeben, um Hilfe " +"zu bekommen, \"\\[menu-item]\", Menüpunkt anzuzeigen." -#. Move WINDOW's point down to the next line if possible. -#: info/session.c:642 +#: info/session.c:643 msgid "Move down to the next line" msgstr "Eine Zeile nach unten bewegen" -#. Move WINDOW's point up to the previous line if possible. -#: info/session.c:657 +#: info/session.c:658 msgid "Move up to the previous line" msgstr "Eine Zeile nach oben bewegen" -#. Move WINDOW's point to the end of the true line. -#: info/session.c:672 +#: info/session.c:673 msgid "Move to the end of the line" msgstr "Zum Ende dieser Zeile bewegen" -#. Move WINDOW's point to the beginning of the true line. -#: info/session.c:692 +#: info/session.c:693 msgid "Move to the start of the line" msgstr "Zum Anfang der Zeile bewegen" -#: info/session.c:884 makeinfo/node.c:1092 +#: info/session.c:885 makeinfo/node.c:1357 msgid "Next" -msgstr "" +msgstr "Next" -#: info/session.c:887 +#: info/session.c:888 msgid "Following Next node..." -msgstr "Folge »Next«-Knoten..." +msgstr "Folge »Next«-Knoten..." -#: info/session.c:904 +#: info/session.c:905 msgid "Selecting first menu item..." -msgstr "Wähle ersten Menüpunkt aus..." +msgstr "Wähle ersten Menüpunkt aus..." -#: info/session.c:915 +#: info/session.c:916 msgid "Selecting Next node..." -msgstr "Wähle »Next«-Knoten aus..." +msgstr "Wähle »Next«-Knoten aus..." -#: info/session.c:985 +#: info/session.c:986 #, c-format msgid "Moving Up %d time(s), then Next." -msgstr "%d mal aufwärts bewegen (»Up«), dann der Nächste (»Next«)." +msgstr "%d mal aufwärts bewegen (»Up«), dann der Nächste (»Next«)." -#: info/session.c:1009 +#: info/session.c:1010 msgid "No more nodes within this document." msgstr "Keine weiteren Knoten in diesem Dokument." -#: info/session.c:1033 -#, fuzzy +#: info/session.c:1034 msgid "No `Prev' for this node." -msgstr "Kein »Prev« bei diesem Knoten." +msgstr "Kein »Prev« für diesem Knoten." # checkit -#. Move to the previous node. If this node now contains a menu, -#. and we have not inhibited movement to it, move to the node -#. corresponding to the last menu item. -#: info/session.c:1036 info/session.c:1091 +#: info/session.c:1037 info/session.c:1092 msgid "Moving Prev in this window." -msgstr "Zum nächsten (»Prev«) in diesem Fenster bewegen." +msgstr "Zum nächsten (»Prev«) in diesem Fenster bewegen." -#: info/session.c:1050 -#, fuzzy +#: info/session.c:1051 msgid "No `Prev' or `Up' for this node within this document." -msgstr "Kein »Prev« oder »Up« für diesen Knoten innerhalb dieses Dokuments." +msgstr "Kein »Prev« oder »Up« für diesen Knoten innerhalb dieses Dokuments." -#: info/session.c:1053 +#: info/session.c:1054 msgid "Moving Up in this window." -msgstr "Nach »Up« in diesem Fenster bewegen." +msgstr "Nach »Up« in diesem Fenster bewegen." -#: info/session.c:1101 -#, fuzzy +#: info/session.c:1102 msgid "Moving to `Prev's last menu item." -msgstr "Nach dem letzten Menüpunkt von »Prev« bewegen." +msgstr "Zum letzten Menüpunkt von »Prev« bewegen." -#: info/session.c:1112 +#: info/session.c:1113 msgid "Move forwards or down through node structure" -msgstr "Vorwärts oder abwärts durch die Knotenstruktur bewegen" +msgstr "Vorwärts oder abwärts durch die Knotenstruktur bewegen" -#: info/session.c:1128 +#: info/session.c:1129 msgid "Move backwards or up through node structure" -msgstr "Zurück oder aufwärts durch die Knotenstruktur bewegen" +msgstr "Zurück oder aufwärts durch die Knotenstruktur bewegen" -#. Show the next screen of WINDOW's node. -#: info/session.c:1143 +#: info/session.c:1229 msgid "Scroll forward in this window" -msgstr "In diesem Fenster vorwärts »scrollen«" +msgstr "In diesem Fenster vorwärts »scrollen«" -#: info/session.c:1192 +#: info/session.c:1237 msgid "Scroll forward in this window and set default window size" msgstr "" -"In diesem Fenster vorwärts »scrollen« und die Standard-Fenstergröße setzen" +"In diesem Fenster vorwärts »scrollen« und die Standard-Fenstergröße setzen" + +#: info/session.c:1245 +msgid "Scroll forward in this window staying within node" +msgstr "In diesem Fenster vorwärts »scrollen« und in Knoten bleiben" + +#: info/session.c:1253 +msgid "" +"Scroll forward in this window staying within node and set default window size" +msgstr "" +"In diesem Fenster vorwärts »scrollen« und in Knoten bleiben und Standard-" +"Fenstergröße setzen" -#. Show the previous screen of WINDOW's node. -#: info/session.c:1200 +#: info/session.c:1261 msgid "Scroll backward in this window" -msgstr "In diesem Fenster rückwärts »scrollen«" +msgstr "In diesem Fenster rückwärts »scrollen«" -#: info/session.c:1244 +#: info/session.c:1269 msgid "Scroll backward in this window and set default window size" msgstr "" -"In diesem Fenster rückwärts »scrollen« und die Standard-Fenstergröße setzen" +"In diesem Fenster rückwärts »scrollen« und die Standard-Fenstergröße setzen" + +#: info/session.c:1278 +msgid "Scroll backward in this window staying within node" +msgstr "In diesem Fenster rückwärts »scrollen« und in Knoten bleiben" + +#: info/session.c:1286 +msgid "" +"Scroll backward in this window staying within node and set default window " +"size" +msgstr "" +"In diesem Fenster rückwärts »scrollen« und in Knoten bleiben und Standard-" +"Fenstergröße setzen" -#. Move to the beginning of the node. -#: info/session.c:1252 +#: info/session.c:1294 msgid "Move to the start of this node" msgstr "Zum Anfang dieses Knotens bewegen" -#. Move to the end of the node. -#: info/session.c:1259 +#: info/session.c:1301 msgid "Move to the end of this node" msgstr "Zum Ende dieses Knotens bewegen" -#. Scroll the window forward by N lines. -#: info/session.c:1266 +#: info/session.c:1308 msgid "Scroll down by lines" -msgstr "Zeilenweise abwärts scrollen" +msgstr "Zeilenweise abwärts scrollen" -#. Scroll the window backward by N lines. -#: info/session.c:1283 +#: info/session.c:1325 msgid "Scroll up by lines" -msgstr "Zeilenweise zurück scrollen" +msgstr "Zeilenweise zurück scrollen" -#: info/session.c:1301 +#: info/session.c:1343 msgid "Scroll down by half screen size" -msgstr "Einen halben Bildschirm abwärts scrollen" +msgstr "Einen halben Bildschirm abwärts scrollen" -#: info/session.c:1327 +#: info/session.c:1369 msgid "Scroll up by half screen size" -msgstr "Einen halben Bildschirm zurück scrollen" - -#. **************************************************************** -#. -#. Commands for Manipulating Windows -#. -#. **************************************************************** -#. Make the next window in the chain be the active window. -#: info/session.c:1356 +msgstr "Einen halben Bildschirm zurück scrollen" + +#: info/session.c:1398 msgid "Select the next window" -msgstr "Das nächste Fenster auswählen" +msgstr "Das nächste Fenster auswählen" -#. Make the previous window in the chain be the active window. -#: info/session.c:1395 +#: info/session.c:1437 msgid "Select the previous window" -msgstr "Das vorige Fenster auswählen" +msgstr "Das vorige Fenster auswählen" -#. Split WINDOW into two windows, both showing the same node. If we -#. are automatically tiling windows, re-tile after the split. -#: info/session.c:1446 +#: info/session.c:1488 msgid "Split the current window" msgstr "Aktuelles Fenster unterteilen" -#. Delete WINDOW, forgetting the list of last visited nodes. If we are -#. automatically displaying footnotes, show or remove the footnotes -#. window. If we are automatically tiling windows, re-tile after the -#. deletion. -#: info/session.c:1527 +#: info/session.c:1569 msgid "Delete the current window" -msgstr "Aktuelles Fenster löschen" +msgstr "Aktuelles Fenster löschen" -#: info/session.c:1535 +#: info/session.c:1577 msgid "Cannot delete a permanent window" -msgstr "Ein permanentes Fenster kann nicht gelöscht werden" +msgstr "Ein permanentes Fenster kann nicht gelöscht werden" -#. Just keep WINDOW, deleting all others. -#: info/session.c:1568 +#: info/session.c:1610 msgid "Delete all other windows" -msgstr "Alle anderen Fenster löschen" +msgstr "Alle anderen Fenster löschen" -#. Scroll the "other" window of WINDOW. -#: info/session.c:1614 +#: info/session.c:1656 msgid "Scroll the other window" -msgstr "Das andere Fenster »scrollen«" +msgstr "Das andere Fenster »scrollen«" -#: info/session.c:1635 +#: info/session.c:1677 msgid "Scroll the other window backward" -msgstr "Das andere Fenster rückwärts blättern" +msgstr "Das andere Fenster rückwärts blättern" -#. Change the size of WINDOW by AMOUNT. -#: info/session.c:1641 +#: info/session.c:1683 msgid "Grow (or shrink) this window" -msgstr "Aktuelles Fenster vergrößern (oder verkleinern)" +msgstr "Aktuelles Fenster vergrößern (oder verkleinern)" -#: info/session.c:1652 +#: info/session.c:1694 msgid "Divide the available screen space among the visible windows" msgstr "" "Den vorhandenen Bildschirmplatz unter allen sichtbaren Fenstern aufteilen" -#: info/session.c:1659 +#: info/session.c:1701 msgid "Toggle the state of line wrapping in the current window" msgstr "Den Status des Zeilenumbruchs im aktuellen Fenster umschalten" -#. Make WINDOW display the "Next:" node of the node currently being -#. displayed. -#: info/session.c:1838 +#: info/session.c:1880 msgid "Select the Next node" -msgstr "Den »Next«-Knoten auswählen" +msgstr "Den »Next«-Knoten auswählen" -#. Make WINDOW display the "Prev:" node of the node currently being -#. displayed. -#: info/session.c:1846 +#: info/session.c:1888 msgid "Select the Prev node" -msgstr "Den »Prev«-Knoten auswählen" +msgstr "Den »Prev«-Knoten auswählen" -#. Make WINDOW display the "Up:" node of the node currently being -#. displayed. -#: info/session.c:1854 +#: info/session.c:1896 msgid "Select the Up node" -msgstr "Den übergeordneten Knoten auswählen (»Up«)" +msgstr "Den übergeordneten Knoten auswählen (»Up«)" -#. Make WINDOW display the last node of this info file. -#: info/session.c:1861 +#: info/session.c:1903 msgid "Select the last node in this file" -msgstr "Den letzten Knoten dieser Datei auswählen" +msgstr "Den letzten Knoten dieser Datei auswählen" # checkit -#: info/session.c:1888 info/session.c:1921 +#: info/session.c:1930 info/session.c:1963 msgid "This window has no additional nodes" msgstr "Dies Fenster hat keine weiteren Knoten" -#. Make WINDOW display the first node of this info file. -#: info/session.c:1894 +#: info/session.c:1936 msgid "Select the first node in this file" -msgstr "Den ersten Knoten dieser Datei auswählen" +msgstr "Den ersten Knoten dieser Datei auswählen" -#: info/session.c:1928 +#: info/session.c:1970 msgid "Select the last item in this node's menu" -msgstr "Den letzten Punkt des Menüs dieses Knotens auswählen" +msgstr "Den letzten Punkt des Menüs dieses Knotens auswählen" -#. Use KEY (a digit) to select the Nth menu item in WINDOW->node. -#: info/session.c:1934 +#: info/session.c:1976 msgid "Select this menu item" -msgstr "Diesen Menüpunkt auswählen" +msgstr "Diesen Menüpunkt auswählen" -#: info/session.c:1963 +#: info/session.c:2005 #, c-format msgid "There aren't %d items in this menu." -msgstr "Es sind keine %d Punkte in diesem Menü." +msgstr "Es sind keine %d Punkte in diesem Menü." -#: info/session.c:2094 +#: info/session.c:2148 #, c-format msgid "Menu item (%s): " -msgstr "Menüpunkt (%s): " +msgstr "Menüpunkt (%s): " -#: info/session.c:2096 +#: info/session.c:2150 msgid "Menu item: " -msgstr "Menüpunkt: " +msgstr "Menüpunkt: " -#: info/session.c:2101 +#: info/session.c:2155 #, c-format msgid "Follow xref (%s): " msgstr "Folge xref (%s): " -#: info/session.c:2103 +#: info/session.c:2157 msgid "Follow xref: " msgstr "Folge xref: " -#. Read a line (with completion) which is the name of a menu item, -#. and select that item. -#: info/session.c:2191 +#: info/session.c:2280 msgid "Read a menu item and select its node" -msgstr "Einen Menüpunkt lesen und seinen Knoten auswählen" +msgstr "Einen Menüpunkt lesen und seinen Knoten auswählen" -#: info/session.c:2199 +#: info/session.c:2288 msgid "Read a footnote or cross reference and select its node" -msgstr "Fußnote oder Querverweis lesen und den Konote auswählen" +msgstr "Fußnote oder Querverweis lesen und den Konote auswählen" -#. Position the cursor at the start of this node's menu. -#: info/session.c:2205 +#: info/session.c:2294 msgid "Move to the start of this node's menu" -msgstr "Zum Anfang des Menüs dieses Knotens bewegen" +msgstr "Zum Anfang des Menüs dieses Knotens bewegen" -#: info/session.c:2229 +#: info/session.c:2318 msgid "Visit as many menu items at once as possible" -msgstr "So viele Menüpunkte wie möglich auf einmal besuchen" +msgstr "So viele Menüpunkte wie möglich auf einmal besuchen" -#. Read a line of input which is a node name, and go to that node. -#: info/session.c:2257 +#: info/session.c:2346 msgid "Read a node name and select it" -msgstr "Den Namen eines Knotens lesen und diesen auswählen" +msgstr "Den Namen eines Knotens lesen und diesen auswählen" -#: info/session.c:2312 info/session.c:2316 +#: info/session.c:2401 info/session.c:2405 msgid "Goto node: " msgstr "Gehe zu Knoten: " -#: info/session.c:2382 -#, fuzzy, c-format +#: info/session.c:2471 +#, c-format msgid "No menu in node `%s'." -msgstr "Kein Menü im Knoten »%s«." +msgstr "Kein Menü im Knoten »%s«." -#: info/session.c:2422 -#, fuzzy, c-format +#: info/session.c:2516 +#, c-format msgid "No menu item `%s' in node `%s'." -msgstr "Kein Menüpunkt »%s« im Knoten »%s«." +msgstr "Kein Menüpunkt »%s« im Knoten »%s«." -#: info/session.c:2452 -#, fuzzy, c-format +#: info/session.c:2546 +#, c-format msgid "Unable to find node referenced by `%s' in `%s'." msgstr "" -"Unmöglich, einen Knoten zu finden, der von »%s« in »%s« referenziert wird." +"Unmöglich, einen Knoten zu finden, der von »%s« in »%s« referenziert wird." -#: info/session.c:2503 +#: info/session.c:2597 msgid "Read a list of menus starting from dir and follow them" -msgstr "Menüliste lesen; bei »dir« beginnen und ihnen folgen" +msgstr "Menüliste lesen; bei »dir« beginnen und ihnen folgen" -#: info/session.c:2505 +#: info/session.c:2599 msgid "Follow menus: " -msgstr "Menüs folgen: " +msgstr "Menüs folgen: " -#: info/session.c:2703 +#: info/session.c:2797 msgid "Find the node describing program invocation" msgstr "Den Knoten finden, der den Programm-Aufruf beschreibt" -#: info/session.c:2705 +#: info/session.c:2799 #, c-format msgid "Find Invocation node of [%s]: " msgstr "Finden den Aufruf-Knoten von [%s]: " -#: info/session.c:2743 +#: info/session.c:2837 msgid "Read a manpage reference and select it" -msgstr "Einen Verweis auf eine Manpage lesen und diese auswählen" +msgstr "Einen Verweis auf eine Manpage lesen und diese auswählen" -#: info/session.c:2747 +#: info/session.c:2841 msgid "Get Manpage: " msgstr "Hole Manpage: " -#. Move to the "Top" node in this file. -#: info/session.c:2777 +#: info/session.c:2871 msgid "Select the node `Top' in this file" -msgstr "Den Knoten »Top« dieser Datei auswählen" +msgstr "Den Knoten »Top« dieser Datei auswählen" -#. Move to the node "(dir)Top". -#: info/session.c:2783 +#: info/session.c:2877 msgid "Select the node `(dir)'" -msgstr "Den Knoten »(dir)« auswählen" +msgstr "Den Knoten »(dir)« auswählen" -#: info/session.c:2803 +#: info/session.c:2897 #, c-format msgid "Kill node (%s): " msgstr "Kille Knoten (%s): " -#: info/session.c:2857 +#: info/session.c:2951 #, c-format msgid "Cannot kill node `%s'" -msgstr "Kann Knoten »%s« nicht killen" +msgstr "Kann Knoten »%s« nicht killen" -#: info/session.c:2867 +#: info/session.c:2961 msgid "Cannot kill the last node" msgstr "Der letzte Knoten kann nicht gekillt werden" -#: info/session.c:2953 +#: info/session.c:3047 msgid "Select the most recently selected node" -msgstr "Den zuletzt gewählten Knoten auswählen" +msgstr "Den zuletzt gewählten Knoten auswählen" -#. Kill named node. -#: info/session.c:2959 +#: info/session.c:3053 msgid "Kill this node" msgstr "Diesen Knoten killen" -#. Read the name of a file and select the entire file. -#: info/session.c:2967 +#: info/session.c:3061 msgid "Read the name of a file and select it" -msgstr "Den Namen einer Datei lesen und diese auswählen" +msgstr "Den Namen einer Datei lesen und diese auswählen" -#: info/session.c:2971 +#: info/session.c:3065 msgid "Find file: " msgstr "Datei finden: " -#: info/session.c:2988 -#, fuzzy, c-format +#: info/session.c:3082 +#, c-format msgid "Cannot find `%s'." -msgstr "Kann »%s« nicht finden." +msgstr "Kann »%s« nicht finden." -#: info/session.c:3033 info/session.c:3154 -#, fuzzy, c-format +#: info/session.c:3127 info/session.c:3248 +#, c-format msgid "Could not create output file `%s'." -msgstr "Ausgabe-Datei »%s« kann nicht angelegt werden." +msgstr "Ausgabe-Datei »%s« kann nicht angelegt werden." -#: info/session.c:3046 info/session.c:3171 info/session.c:3232 +#: info/session.c:3140 info/session.c:3265 info/session.c:3326 msgid "Done." msgstr "Fertig." -#. Maybe we should print some information about the node being output. -#: info/session.c:3102 -#, fuzzy, c-format +#: info/session.c:3196 +#, c-format msgid "Writing node %s..." -msgstr "Knoten »%s« schreiben..." +msgstr "Schreibe Knoten »%s«..." -#: info/session.c:3180 +#: info/session.c:3274 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" msgstr "Den Inhalt dieses Knotens durch INFO_PRINT_COMMAND pipen" -#: info/session.c:3216 -#, fuzzy, c-format +#: info/session.c:3310 +#, c-format msgid "Cannot open pipe to `%s'." -msgstr "Kann nicht nach »%s« pipen." +msgstr "Kann nicht nach »%s« pipen." -#. Maybe we should print some information about the node being output. -#: info/session.c:3222 -#, fuzzy, c-format +#: info/session.c:3316 +#, c-format msgid "Printing node %s..." -msgstr "Drucke Knoten »%s«..." +msgstr "Drucke Knoten »%s«..." -#: info/session.c:3464 -#, fuzzy, c-format +#: info/session.c:3558 +#, c-format msgid "Searching subfile %s ..." -msgstr "Unterdatei »%s« wird durchsucht..." +msgstr "Durchsuche Unterdatei »%s«..." -#: info/session.c:3516 +#: info/session.c:3610 msgid "Read a string and search for it case-sensitively" msgstr "" -"Eine Zeichenkette einlesen und danach gemäß Groß-/Kleinschreibung suchen" +"Eine Zeichenkette einlesen und danach gemäß Groß-/Kleinschreibung suchen" -#: info/session.c:3523 +#: info/session.c:3617 msgid "Read a string and search for it" msgstr "Eine Zeichenkette einlesen und danach suchen" -#: info/session.c:3531 +#: info/session.c:3625 msgid "Read a string and search backward for it" -msgstr "Eine Zeichenkette einlesen und danach rückwärts suchen" +msgstr "Eine Zeichenkette einlesen und danach rückwärts suchen" # checkit -#: info/session.c:3573 +#: info/session.c:3667 #, c-format msgid "%s%sfor string [%s]: " msgstr "%s%s nach Zeichenkette [%s]: " -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search backward" -msgstr "Suche rückwärts" +msgstr "Suche rückwärts" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search" msgstr "Suche" -#: info/session.c:3575 +#: info/session.c:3669 msgid " case-sensitively " -msgstr "gemäß Groß-/Kleinschreibung" +msgstr "gemäß Groß-/Kleinschreibung" -#: info/session.c:3575 +#: info/session.c:3669 msgid " " msgstr " " -#: info/session.c:3615 +#: info/session.c:3709 msgid "Search failed." msgstr "Suche fehlgeschlagen." -#: info/session.c:3633 +#: info/session.c:3727 msgid "Repeat last search in the same direction" msgstr "Letzte Suche in der gleichen Richtung wiederholen" -#: info/session.c:3636 info/session.c:3646 +#: info/session.c:3730 info/session.c:3740 msgid "No previous search string" msgstr "Keine vorherige Such-Zeichenkette." -#: info/session.c:3643 +#: info/session.c:3737 msgid "Repeat last search in the reverse direction" msgstr "Letzte Suche in der entgegengesetzten Richtung wiederholen" -#: info/session.c:3661 info/session.c:3667 +#: info/session.c:3755 info/session.c:3761 msgid "Search interactively for a string as you type it" -msgstr "Interaktiv nach einer Zeichenkette während der Eingabe suchen" +msgstr "Interaktiv nach einer Zeichenkette während der Eingabe suchen" -#: info/session.c:3761 +#: info/session.c:3855 msgid "I-search backward: " -msgstr "Interactive Suche rückwarts: " +msgstr "Interactive Suche rückwarts: " -#: info/session.c:3763 +#: info/session.c:3857 msgid "I-search: " msgstr "Interaktive Suche" # checkit -#: info/session.c:3788 +#: info/session.c:3882 msgid "Failing " msgstr "Fehlgeschlagen " -#: info/session.c:4244 +#: info/session.c:4340 msgid "Move to the previous cross reference" msgstr "Zum vorigen Querverweis bewegen" -#: info/session.c:4253 +#: info/session.c:4349 msgid "Move to the next cross reference" -msgstr "Zum nächsten Querverweis bewegen" +msgstr "Zum nächsten Querverweis bewegen" -#: info/session.c:4263 +#: info/session.c:4359 msgid "Select reference or menu item appearing on this line" -msgstr "Verweis oder Menüpunkt auswählen, der auf dieser Zeile erscheint" +msgstr "Verweis oder Menüpunkt auswählen, der auf dieser Zeile erscheint" # checkit -#. **************************************************************** -#. -#. Miscellaneous Info Commands -#. -#. **************************************************************** -#. What to do when C-g is pressed in a window. -#: info/session.c:4285 +#: info/session.c:4381 msgid "Cancel current operation" msgstr "Momentane Operation abbrechen" -#: info/session.c:4292 +#: info/session.c:4388 msgid "Quit" msgstr "Ende" -#: info/session.c:4301 +#: info/session.c:4397 msgid "Move the cursor to a specific line of the window" msgstr "Den Cursor nach einer bestimmten Zeile des Fensters bewegen" -#. Clear the screen and redraw its contents. Given a numeric argument, -#. move the line the cursor is on to the COUNT'th line of the window. -#: info/session.c:4333 +#: info/session.c:4429 msgid "Redraw the display" msgstr "Anzeige erneut darstellen" -#. This command does nothing. It is the fact that a key is bound to it -#. that has meaning. See the code at the top of info_session (). -#: info/session.c:4370 +#: info/session.c:4466 msgid "Quit using Info" msgstr "Info beenden" -#: info/session.c:4393 +#: info/session.c:4479 +msgid "Run command bound to this key's lowercase variant" +msgstr "" +"Befehl ausführen, der an die kleingeschriebene Variante dieser Taste " +"gebunden ist" + +#: info/session.c:4491 #, c-format msgid "Unknown command (%s)." msgstr "Unbekannter Befehl (%s)." -#: info/session.c:4396 +#: info/session.c:4494 msgid "\"\" is invalid" -msgstr "»« ist ungültig" +msgstr "»« ist ungültig" -#: info/session.c:4397 +#: info/session.c:4495 #, c-format msgid "\"%s\" is invalid" -msgstr "»%s« ist ungültig" +msgstr "»%s« ist ungültig" -#: info/session.c:4620 +#: info/session.c:4713 msgid "Add this digit to the current numeric argument" -msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufügen" +msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufügen" -#: info/session.c:4629 +#: info/session.c:4722 msgid "Start (or multiply by 4) the current numeric argument" msgstr "Beginne (oder multipliziere mit 4) das aktuelle nummerische Argument" -#: info/session.c:4644 +#: info/session.c:4737 msgid "Internally used by \\[universal-argument]" msgstr "Intern gebraucht von \\[universal-argument]" @@ -1382,389 +1693,413 @@ msgstr "Intern gebraucht von \\[universal-argument]" msgid "readline: Out of virtual memory!\n" msgstr "readline: Kein Speicher mehr!\n" -#: info/variables.c:40 +#: info/variables.c:37 msgid "When \"On\", footnotes appear and disappear automatically" -msgstr "Wenn »On«, dann erscheinen und verschwinden Fußnoten automatisch" +msgstr "Wenn »On«, dann erscheinen und verschwinden Fußnoten automatisch" -#: info/variables.c:44 +#: info/variables.c:41 msgid "When \"On\", creating or deleting a window resizes other windows" msgstr "" -"Wenn »On«, dann werden beim Anlegen oder Löschen eines Fensters die anderen " +"Wenn »On«, dann werden beim Anlegen oder Löschen eines Fensters die anderen " "Fenster angepasst" -#: info/variables.c:48 +#: info/variables.c:45 msgid "When \"On\", flash the screen instead of ringing the bell" -msgstr "Wenn »On«, dann den Bildschirm blinken lassen, kein akustisches Signal" +msgstr "Wenn »On«, dann den Bildschirm blinken lassen, kein akustisches Signal" -#: info/variables.c:52 +#: info/variables.c:49 msgid "When \"On\", errors cause the bell to ring" -msgstr "Wenn »On«, dann lassen Fehler ein akustisches Signal ertönen" +msgstr "Wenn »On«, dann lassen Fehler ein akustisches Signal ertönen" # checkit -#: info/variables.c:56 +#: info/variables.c:53 msgid "When \"On\", Info garbage collects files which had to be uncompressed" msgstr "" -"Wenn »On«, Info \"garbage collectet\" Dateien, die ausgepackt werden müssen" +"Wenn »On«, Info \"garbage collectet\" Dateien, die ausgepackt werden müssen" -#: info/variables.c:59 +#: info/variables.c:56 msgid "When \"On\", the portion of the matched search string is highlighted" msgstr "" -"Wenn »On«, die übereinstimmende gefundene Zeichenkette wird gekennzeichnet" +"Wenn »On«, die übereinstimmende gefundene Zeichenkette wird gekennzeichnet" -#: info/variables.c:63 +#: info/variables.c:60 msgid "Controls what happens when scrolling is requested at the end of a node" msgstr "" -"Kontrolliert, was passiert, wenn »scrollen« am Ende eines Knotens veranlasst " +"Kontrolliert, was passiert, wenn »scrollen« am Ende eines Knotens veranlasst " "wird" -#: info/variables.c:67 +#: info/variables.c:64 msgid "The number lines to scroll when the cursor moves out of the window" msgstr "" -"Anzahl der Zeilen zu »scrollen«, wenn der Cursor aus dem Fenster bewegt wird" +"Anzahl der Zeilen zu »scrollen«, wenn der Cursor aus dem Fenster bewegt wird" -#: info/variables.c:71 +#: info/variables.c:68 msgid "When \"On\", Info accepts and displays ISO Latin characters" -msgstr "Wenn »On«, dann akzeptiert Info ISO-Latin-Zeichen und zeigt diese an" +msgstr "Wenn »On«, dann akzeptiert Info ISO-Latin-Zeichen und zeigt diese an" -#: info/variables.c:77 +#: info/variables.c:74 msgid "Explain the use of a variable" -msgstr "Den Zweck einer Variablen erklären" +msgstr "Den Zweck einer Variablen erklären" -#. Get the variable's name. -#: info/variables.c:83 +#: info/variables.c:80 msgid "Describe variable: " msgstr "Beschreibe Variable: " -#: info/variables.c:102 +#: info/variables.c:99 msgid "Set the value of an Info variable" msgstr "Den Wert einer Info-Variablen setzen" -#. Get the variable's name and value. -#: info/variables.c:108 +#: info/variables.c:105 msgid "Set variable: " msgstr "Setze Variable: " -#: info/variables.c:126 +#: info/variables.c:123 #, c-format msgid "Set %s to value (%d): " msgstr "Setze %s auf den Wert (%d): " -#: info/variables.c:167 +#: info/variables.c:164 #, c-format msgid "Set %s to value (%s): " msgstr "Setze %s auf den Wert (%s): " -#: info/window.c:1101 +#: info/window.c:1164 msgid "--*** Tags out of Date ***" msgstr "--*** Tags veraltet ***" -#. strlen (location_indicator). -#. 10 for the decimal representation of the number of lines in this -#. node, and the remainder of the text that can appear in the line. -#: info/window.c:1112 +#: info/window.c:1175 msgid "-----Info: (), lines ----, " msgstr "-----Info: (), Zeilen ----, " -#: info/window.c:1119 +#: info/window.c:1182 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "-%s---Info: %s, %d Zeilen --%s--" -#: info/window.c:1123 +#: info/window.c:1186 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "-%s%s-Info: (%s)%s, %d Zeilen --%s--" -#: info/window.c:1130 +#: info/window.c:1193 #, c-format msgid " Subfile: %s" msgstr " Unterdatei: %s" -#: lib/getopt.c:680 +#: lib/getopt.c:675 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: Option `%s' ist zweideutig\n" -#: lib/getopt.c:704 +#: lib/getopt.c:700 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: Option `--%s' erlaubt kein Argument\n" -#: lib/getopt.c:709 +#: lib/getopt.c:705 #, 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:726 lib/getopt.c:899 +#: lib/getopt.c:723 lib/getopt.c:896 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: Option `%s' benötigt kein Argument\n" +msgstr "%s: Option `%s' benötigt kein Argument\n" -#. --option -#: lib/getopt.c:755 +#: lib/getopt.c:752 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: nicht erkannte Option `--%s'\n" -#. +option or -option -#: lib/getopt.c:759 +#: lib/getopt.c:756 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: nicht erkannte Option `%c%s'\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:785 +#: lib/getopt.c:782 #, c-format msgid "%s: illegal option -- %c\n" -msgstr "%s: ungültige Option -- %c\n" +msgstr "%s: ungültige Option -- %c\n" -#: lib/getopt.c:788 +#: lib/getopt.c:785 #, c-format msgid "%s: invalid option -- %c\n" -msgstr "%s: ungültige Option -- %c\n" +msgstr "%s: ungültige Option -- %c\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:818 lib/getopt.c:948 +#: lib/getopt.c:815 lib/getopt.c:945 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: Option verlangt ein Argument -- %c\n" -#: lib/getopt.c:865 +#: lib/getopt.c:862 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: Option `-W %s' ist zweideutig\n" -#: lib/getopt.c:883 +#: lib/getopt.c:880 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: Option `-W %s' erlaubt kein Argument\n" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "January" msgstr "Januar" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "February" msgstr "Februar" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "March" -msgstr "März" +msgstr "März" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "April" msgstr "April" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "May" msgstr "Mai" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "June" msgstr "Juni" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "July" msgstr "Juli" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "August" msgstr "August" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "September" msgstr "September" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "October" msgstr "Oktober" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "November" msgstr "November" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "December" msgstr "Dezember" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:658 #, c-format msgid "unlikely character %c in @var" msgstr "ungutes Zeichen %c in @var" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:701 msgid "@sc argument all uppercase, thus no effect" -msgstr "@sc Argument durchweg in Großbuchstaben, somit keine Wirkung" +msgstr "@sc Argument durchweg in Großbuchstaben, somit keine Wirkung" + +#: makeinfo/cmds.c:759 +#, c-format +msgid "`{' expected, but saw `%c'" +msgstr "»{« erwartet, aber bekam »%c«" + +#: makeinfo/cmds.c:789 +msgid "end of file inside verb block" +msgstr "Dateiende innerhalb eines Verb-Blocks" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:797 +#, c-format +msgid "`}' expected, but saw `%c'" +msgstr "»}« erwartet, aber bekam »%c«" + +#: makeinfo/cmds.c:942 #, c-format msgid "%c%s is obsolete" msgstr "%c%s ist obsolet" -#: makeinfo/cmds.c:814 +#: makeinfo/cmds.c:1014 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" -msgstr "@sp erfordert ein positives numerisches Argument, nicht »%s«" +msgstr "@sp erfordert ein positives numerisches Argument, nicht »%s«" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "Fehlerhaftes Argument zu %c%s" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140 msgid "asis" msgstr "genau" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142 msgid "none" msgstr "kein" -#: makeinfo/defun.c:83 +#: makeinfo/defun.c:85 msgid "Missing `}' in @def arg" -msgstr "Fehlende »}« beim @def Argument" +msgstr "Fehlende »}« beim @def Argument" -#: makeinfo/defun.c:358 +#: makeinfo/defun.c:363 msgid "Function" msgstr "Funktion" -#: makeinfo/defun.c:361 +#: makeinfo/defun.c:366 msgid "Macro" -msgstr "Macro" +msgstr "Makro" # checkit -#: makeinfo/defun.c:364 +#: makeinfo/defun.c:369 msgid "Special Form" msgstr "Spezielle Form" -#: makeinfo/defun.c:368 +#: makeinfo/defun.c:373 msgid "Variable" msgstr "Variable: " -#: makeinfo/defun.c:371 +#: makeinfo/defun.c:376 msgid "User Option" msgstr "User-Option" -#: makeinfo/defun.c:375 +# What does this mean? -ke- +#: makeinfo/defun.c:380 msgid "Instance Variable" -msgstr "" +msgstr "Instance Variable" -#: makeinfo/defun.c:379 +#: makeinfo/defun.c:384 msgid "Method" -msgstr "Methde" +msgstr "Methode" -#: makeinfo/defun.c:450 makeinfo/defun.c:454 makeinfo/defun.c:556 -#: makeinfo/defun.c:570 makeinfo/defun.c:610 +#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615 +#: makeinfo/defun.c:631 makeinfo/defun.c:671 msgid "of" msgstr "aus" -#: makeinfo/defun.c:458 makeinfo/defun.c:462 makeinfo/defun.c:466 -#: makeinfo/defun.c:564 makeinfo/defun.c:615 +#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482 +#: makeinfo/defun.c:624 makeinfo/defun.c:676 msgid "on" msgstr "ein" # checkit -#: makeinfo/defun.c:656 +#: makeinfo/defun.c:717 #, c-format msgid "Must be in `%s' insertion to use `%sx'" -msgstr "Muss in einer »%s«-Einfügung sein, um »%sx« zu benutzen" +msgstr "Muss in einer »%s«-Einfügung sein, um »%sx« zu benutzen" -#: makeinfo/files.c:460 +#: makeinfo/files.c:448 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" -msgstr "»%c%s« benötigt ein Argument »{...}«, nicht nur »%s«" +msgstr "»%c%s« benötigt ein Argument »{...}«, nicht nur »%s«" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" -msgstr "Keine schließende Klammer für Fußnote »%s«" +msgstr "Keine schließende Klammer für Fußnote »%s«" -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" -msgstr "Fußnote außerhalb eines Elternknotens definiert" +msgstr "Fußnote außerhalb eines Elternknotens definiert" -#: makeinfo/footnote.c:278 +#: makeinfo/footnote.c:210 +msgid "Footnotes inside footnotes are not allowed" +msgstr "Fußnote innerhalb von Fußnoten sind nicht erlaubt" + +#: makeinfo/footnote.c:298 msgid "Footnotes" -msgstr "Fußnoten" +msgstr "Fußnoten" -#. The <title> should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:42 msgid "Untitled" msgstr "Ohne Titel" -#: makeinfo/index.c:212 +#: makeinfo/html.c:298 +#, c-format +msgid "Invalid node name: `%s'" +msgstr "Ungültiger Knotenname: »%s«" + +#: makeinfo/index.c:213 #, c-format msgid "Unknown index `%s'" -msgstr "Unbekannter Index »%s«" +msgstr "Unbekannter Index »%s«" -#: makeinfo/index.c:382 +#: makeinfo/index.c:238 +#, c-format +msgid "Info cannot handle `:' in index entry `%s'" +msgstr "Info kann nicht mit »:« im Indexeintrag »%s« umgehen" + +#: makeinfo/index.c:396 #, c-format msgid "Index `%s' already exists" -msgstr "Index »%s« existiert bereits" +msgstr "Index »%s« existiert bereits" -#: makeinfo/index.c:425 +#: makeinfo/index.c:439 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" -msgstr "Unbekannter Index »%s« und/oder »%s« in @synindex" +msgstr "Unbekannter Index »%s« und/oder »%s« in @synindex" -#: makeinfo/index.c:642 +#: makeinfo/index.c:666 #, c-format msgid "Unknown index `%s' in @printindex" -msgstr "\"Unbekannter Index »%s« in @printindex" +msgstr "\"Unbekannter Index »%s« in @printindex" -#: makeinfo/index.c:680 +#: makeinfo/index.c:709 #, c-format msgid "Entry for index `%s' outside of any node" -msgstr "Eintrag für Index »%s« außerhalb jeglichen Knotens" +msgstr "Eintrag für Index »%s« außerhalb jeglichen Knotens" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:712 makeinfo/index.c:751 msgid "(outside of any node)" -msgstr "(außerhalb jeglichen Knotens)" +msgstr "(außerhalb jeglichen Knotens)" -#: makeinfo/insertion.c:192 +# What does this mean? -ke- +#: makeinfo/insertion.c:198 msgid "Broken-Type in insertion_type_pname" -msgstr "" +msgstr "»Broken-Type« bei »insertion_type_pname«" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:271 msgid "Enumeration stack overflow" -msgstr "Überlauf bei den Zahlen der Aufzählung" +msgstr "Ãœberlauf bei den Zahlen der Aufzählung" -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:303 #, c-format msgid "lettering overflow, restarting at %c" -msgstr "Überlauf bei den Buchstaben der Aufzählung, Beginn wieder bei %c" +msgstr "Ãœberlauf bei den Buchstaben der Aufzählung, Beginn wieder bei %c" # checkit -#: makeinfo/insertion.c:481 +#: makeinfo/insertion.c:538 #, c-format msgid "%s requires an argument: the formatter for %citem" -msgstr "%s benötigt ein Argument: der Formatierer für %citem" +msgstr "%s benötigt ein Argument: der Formatierer für %citem" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:693 #, c-format msgid "`@end' expected `%s', but saw `%s'" -msgstr "»@end« erwartet »%s«, aber bekam »%s«" +msgstr "»@end« erwartet »%s«, aber bekam »%s«" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:931 #, c-format msgid "No matching `%cend %s'" -msgstr "Kein zutreffendes »%cend %s«" +msgstr "Kein zutreffendes »%cend %s«" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:1084 #, c-format msgid "%s requires letter or digit" -msgstr "%s benötigt einen Buchstaben oder eine Zahl" +msgstr "%s benötigt einen Buchstaben oder eine Zahl" + +#: makeinfo/insertion.c:1158 +msgid "end of file inside verbatim block" +msgstr "Dateiende innerhalb eines wörtlichen Blocks" # checkit -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1318 msgid "@menu seen before first @node, creating `Top' node" -msgstr "@menu vor dem ersten @node gesehen, »Top«-Knoten wird angelegt" +msgstr "@menu vor dem ersten @node gesehen, »Top«-Knoten wird angelegt" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1319 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" @@ -1772,602 +2107,728 @@ msgstr "" "umschlossen werden?" # checkit -#. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1331 msgid "@detailmenu seen before first node, creating `Top' node" -msgstr "@detailmenu vor dem ersten Knoten gesehen, »Top«-Knoten wird angelegt" +msgstr "@detailmenu vor dem ersten Knoten gesehen, »Top«-Knoten wird angelegt" -#: makeinfo/insertion.c:1074 +#: makeinfo/insertion.c:1346 #, c-format msgid "Unmatched `%c%s'" -msgstr "Nicht übereinstimmendes »%c%s«" +msgstr "Nicht übereinstimmendes »%c%s«" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1353 #, c-format msgid "`%c%s' needs something after it" -msgstr "»%c%s« benötigt etwas nachfolgendes" +msgstr "»%c%s« benötigt etwas nachfolgendes" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1359 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" -msgstr "Fehlerhaftes Argument zu »%s«, »%s«, benutze »%s«" +msgstr "Fehlerhaftes Argument zu »%s«, »%s«, benutze »%s«" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1453 #, c-format msgid "@%s not meaningful inside `@%s' block" -msgstr "@%s nicht sinnvoll innerhalb eines »@%s«-Blocks" +msgstr "@%s nicht sinnvoll innerhalb eines »@%s«-Blocks" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1462 #, c-format msgid "@itemx not meaningful inside `%s' block" -msgstr "@itemx nicht sinnvoll innerhalb eines »%s«-Blocks" +msgstr "@itemx nicht sinnvoll innerhalb eines »%s«-Blocks" # checkit -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1646 #, c-format msgid "%c%s found outside of an insertion block" -msgstr "%c%s außerhalb eines Einfügungsblocks gefunden" +msgstr "%c%s außerhalb eines Einfügungsblocks gefunden" -#: makeinfo/lang.c:199 +#: makeinfo/lang.c:331 #, c-format msgid "%s is not a valid ISO 639 language code" -msgstr "%s ist kein gÚltiger ISO 639 Language Code" +msgstr "%s ist kein gültiger ISO-639-Language-Code" + +#: makeinfo/lang.c:384 +#, c-format +msgid "unrecogized encoding name `%s'" +msgstr "Nicht erkannter Kodierungsname »%s«" + +#: makeinfo/lang.c:387 +#, c-format +msgid "sorry, encoding `%s' not supported" +msgstr "Kodierung »%s« wird leider nicht unterstützt." + +#: makeinfo/lang.c:414 +#, c-format +msgid "invalid encoded character `%s'" +msgstr "Ungültiges kodiertes Zeichen: »%s«" + +#: makeinfo/lang.c:502 +#, c-format +msgid "%s is an invalid ISO code, using %c" +msgstr "%s ist kein gültiger ISO-639-Language-Code, benutze %c" -#. This error message isn't perfect if the argument is multiple -#. characters, but it doesn't seem worth getting right. -#: makeinfo/lang.c:406 +#: makeinfo/lang.c:687 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" -msgstr "%c%s erwartet »i« oder »j« als Argument, nicht »%c«" +msgstr "%c%s erwartet »i« oder »j« als Argument, nicht »%c«" -#: makeinfo/lang.c:410 +#: makeinfo/lang.c:691 #, 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" +msgstr "%c%s erwartet einen einzelnen Buchstaben »i« oder »j» als Argument" #: makeinfo/macro.c:134 #, c-format msgid "macro `%s' previously defined" -msgstr "Macro »%s« früher definiert" +msgstr "Macro »%s« früher definiert" #: makeinfo/macro.c:138 #, c-format msgid "here is the previous definition of `%s'" -msgstr "hier ist die frühere Definition von »%s«" +msgstr "hier ist die frühere Definition von »%s«" #: makeinfo/macro.c:355 #, c-format msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name" msgstr "" -"Dem \\ folgt in der Macro-Erweiterung »%s« anstelle von \\ oder einem " +"Dem \\ folgt in der Macro-Erweiterung »%s« anstelle von \\ oder einem " "Parameternamen" #: makeinfo/macro.c:403 #, c-format msgid "Macro `%s' called on line %d with too many args" -msgstr "Macro »%s« in Zeile %d mit zuvielen Argumenten aufgerufen" +msgstr "Macro »%s« in Zeile %d mit zuvielen Argumenten aufgerufen" -#: makeinfo/macro.c:595 +#: makeinfo/macro.c:594 #, c-format msgid "%cend macro not found" msgstr "%cend Macro nicht gefunden" -#: makeinfo/macro.c:634 +#: makeinfo/macro.c:632 msgid "@quote-arg only useful for single-argument macros" msgstr "@quote-Argument nur sinnvoll, wenn das Macro nur ein Argument hat" -#: makeinfo/macro.c:670 +#: makeinfo/macro.c:668 #, c-format msgid "mismatched @end %s with @%s" -msgstr "@end %s stimmt nicht mit @%s überein" +msgstr "@end %s stimmt nicht mit @%s überein" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:316 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: Warnung: " -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:339 msgid "Too many errors! Gave up.\n" msgstr "Zu viele Fehler! Abbruch.\n" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026 #, c-format msgid "Misplaced %c" msgstr "Fehlplazierte %c" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:370 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "»%s --help« gibt weitere Informationen.\n" +msgstr "»%s --help« gibt weitere Informationen.\n" -#: makeinfo/makeinfo.c:365 +#: makeinfo/makeinfo.c:373 #, c-format +msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" +msgstr "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n" + +#: makeinfo/makeinfo.c:376 msgid "" -"Usage: %s [OPTION]... TEXINFO-FILE...\n" -"\n" -"Translate Texinfo source documentation to various other formats:\n" -"Info files suitable for reading online with Emacs or standalone GNU Info\n" -"(by default); plain text (with --no-headers); or HTML (with --html).\n" -"\n" -"Options:\n" -" --commands-in-node-names allow @ commands in node names.\n" -" -D VAR define a variable, as with @set.\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" --error-limit=NUM quit after NUM errors (default %d).\n" -" --fill-column=NUM break Info lines at NUM characters (default %d).\n" -" --footnote-style=STYLE output footnotes according to STYLE:\n" -" `separate' to place footnotes in their own " -"node,\n" -" `end' to place the footnotes at the end of the\n" -" node in which they are defined (the default).\n" -" --force preserve output even if errors.\n" -" --help display this help and exit.\n" -" --html output HTML rather than Info format;\n" -" -I DIR append DIR to the @include search path.\n" -" --ifhtml process @ifhtml and @html text even when not\n" -" generating HTML.\n" -" --ifinfo process @ifinfo text even when generating HTML.\n" -" --iftex process @iftex and @tex text.\n" -" implies --no-split.\n" -msgstr "" -"Syntax: %s [OPTION]... TEXINFO-DATEI...\n" -"\n" -"Texinfo-Quelltext in verschiedene andere Formate übersetzen:\n" -"In Info-Dateien (Standard), die mit Emacs oder mit GNU Info gelesen werden\n" -"können; reine Textdateien (mit --no-headers) oder HTML (mit --html).\n" -"\n" -"Optionen:\n" -" --commands-in-node-names @-Befehle in Knotennamen zulassen\n" -" -D VAR eine Variable definieren, wie mit @set\n" -" -E, --macro-expand DATEI originalen Quelltext mit expandierten Macros " +"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 "" +"Ãœbersetzt Texinfo-Quelldatei-Dokumentation in verschiedene andere Formate,\n" +"standardmäßig in Info-Dateien, die online mittels gelesen werden können mit\n" +"einem Info-Leser wie GNU Info (oder auch Emacs, TkInfo, etc.).\n" + +#: makeinfo/makeinfo.c:380 +#, c-format +msgid "" +"General options:\n" +" --error-limit=NUM quit after NUM errors (default %d).\n" +" --force preserve output even if errors.\n" +" --help display this help and exit.\n" +" --no-validate suppress node cross-reference validation.\n" +" --no-warn suppress warnings (but not errors).\n" +" --reference-limit=NUM warn about at most NUM references (default %" +"d).\n" +" -v, --verbose explain what is being done.\n" +" --version display version information and exit.\n" +msgstr "" +"Allgemeine Optionen:\n" +" --error-limit=ZAHL nach ZAHL Fehlern beenden (Standard %d)\n" +" --force Ausgabedatei auch bei Fehlern nicht löschen\n" +" --help diese Hilfe zeigen und beenden\n" +" --no-validate Ãœberprüfen der Knoten-Querverweise " +"unterdrücken\n" +" --no-warn Warnungen (aber keine Fehler) unterdrücken\n" +" --reference-limit=ZAHL warne bei höchstens ZAHL Verweisen (Standard %" +"d)\n" +" -v, --verbose ausführlich die Bearbeitungschritte anzeigen\n" +" --version Programmversion anzeigen und beenden\n" + +#: makeinfo/makeinfo.c:394 +#, no-wrap +msgid "" +"Output format selection (default is to produce Info):\n" +" --docbook output DocBook rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output XML (TexinfoML) rather than Info.\n" +msgstr "" +"Optionen zur Wahl des Ausgabeformats (Voreinstellung ist Info):\n" +" --docbook DocBook anstelle von Info ausgeben\n" +" --html HTML anstelle von Info ausgeben\n" +" --xml XML (TexinfoML) anstelle von Info ausgeben\n" + +#: makeinfo/makeinfo.c:401 +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" +msgstr "" +"Allgemeine Ausgabe-Optionen:\n" +" -E, --macro-expand DATEI originalen Quelltext mit expandierten Makros " "nach\n" -" DATEI ausgeben\n" -" --error-limit=ZAHL nach ZAHL Fehlern beenden (Standard %d)\n" -" --fill-column=ZAHL Zeilen nach ZAHL Zeichen umbrechen (Standard %d)\n" -" --footnote-style=STYLE Fußnoten gemäß STYLE ausgeben:\n" -" »separate«: Fußnoten in einen eigenen Knoten \n" -" plazieren;\n" -" »end«: Fußnoten an das Ende des Knotens " -"setzen,\n" -" in dem sie definiert sind (Standard)\n" -" --force Ausgabedatei auch bei Fehlern nicht löschen\n" -" --help diese Hilfe zeigen\n" -" --html HTML anstelle des Info-Formats ausgeben; " -"impliziert\n" -" --no-splityyy\n" -" -I VERZ VERZ an den Suchpfad für @include anhängen\n" -" --ifhtml @ifhtml- und @html-Text auch bearbeiten, wenn " -"kein\n" -" HTML erzeugt wird\n" -" --ifinfo @ifinfo-Text auch bearbeiten, wenn HTML erzeugt\n" -" wird\n" -" --iftex @iftex und @tex bearbeiten\n" +" DATEI ausgeben, dabei @setfilename ignorieren\n" +" --no-headers Knoten-Unterteiler, »Knoten:«-Kopfzeilen und " +"Menüs\n" +" unterdrücken aus Info-Ausgabe (also nur Text " +"her-\n" +" stellen) oder HTML (also kürzere Ausgabe);\n" +" außerdem in die Standardausgabe schreiben\n" +" --no-split Aufteilen langer Info-Dateien oder das Erzeugen\n" +" einer HTML-Datei je Knoten unterdrücken\n" +" --number-sections Kapitel-, Abschnitt- und Anhangzählungen " +"ausgeben\n" +" -o, --output=DATEI Ausgabe nach DATEI (Verzeichnis wenn " +"aufgeteiltes\n" +" HTML)\n" -# Die "." am Zeilenende habe ich entfernt. -ke- -#: makeinfo/makeinfo.c:391 +#: makeinfo/makeinfo.c:415 #, c-format msgid "" -" --no-headers suppress Info node separators and Node: lines " -"and\n" -" write to standard output without --output.\n" -" --no-ifhtml do not process @ifhtml and @html text.\n" -" --no-ifinfo do not process @ifinfo text.\n" -" --no-iftex do not process @iftex and @tex text.\n" -" --no-split suppress splitting of large Info output files or\n" -" generation of one HTML file per node.\n" -" --no-validate suppress node cross-reference validation.\n" -" --no-warn suppress warnings (but not errors).\n" -" --number-sections include chapter, section, etc. numbers in " -"output.\n" -" -o, --output=FILE output to FILE, ignoring any @setfilename.\n" -" -P DIR prepend DIR to the @include search path.\n" -" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " -"%d).\n" -" if VAL is `none', do not indent;\n" -" if VAL is `asis', preserve existing " -"indentation.\n" -" --reference-limit=NUM warn about at most NUM references (default %d).\n" -" -U VAR undefine a variable, as with @clear.\n" -" -v, --verbose explain what is being done.\n" -" --version display version information and exit.\n" -msgstr "" -" --no-headers Knoten-Unterteiler und »Knoten:« Kopfzeilen\n" -" unterdrücken und ohne --output nach der\n" -" Standards-Ausgabe schreiben\n" -" --no-ifhtml @ifhtml- und @html-Text nicht bearbeiten\n" -" --no-ifinfo @ifinfo-Text nicht bearbeiten\n" -" --no-iftex @iftex- und @tex-Text nicht bearbeiten\n" -" --no-split Aufteilen langer Info-Dateien oder das Erzeugen\n" -" einer HTML-Datei je Knoten unterdrücken\n" -" --no-validate Überprüfen der Knoten-Querverweise unterdrücken\n" -" --no-warn Warnungen (aber keine Fehler) unterdrücken\n" -" --number-sections Kapitel-, Abschnitt- und Anhangzählungen ausgeben\n" -" -o, --output=DATEI Ausgabe nach DATEI und @setfilename ignorieren\n" -" -P VERZ VERZ dem Suchpfad für @include voranstellen\n" -" --paragraph-indent=WERT\n" -" Info-Absätze mit WERT Leerräumen einziehen\n" -" (Standard %d);\n" -" bei WERT gleich »none«: keine Leerräume;\n" -" bei WERT gleich »asis«: existierende Einzüge\n" -" beibehalten\n" -" --reference-limit=ZAHL bei wenigstens ZAHL Verweise melden (Standard %d)\n" -" -U VAR eine Variable aufheben, wie mit @clear\n" -" -v, --verbose ausführlich die Bearbeitungschritte anzeigen\n" -" --version Programmversion anzeigen\n" +"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" +" --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" +" If VAL is `none', do not indent; if VAL is\n" +" `asis', preserve existing indentation.\n" +" --split-size=NUM split Info files at size NUM (default %d).\n" +msgstr "" +"Optionen für Info und Nur-Text:\n" +" --enable-encoding akzentuierte und spezielle Zeichen in die " +"Info-\n" +" Ausgabe gemäß @documentencoding ausgeben\n" +" --fill-column=ZAHL Zeilen nach ZAHL Zeichen umbrechen (Standard %" +"d)\n" +" --footnote-style=STIL Fußnoten in Info gemäß STIL ausgeben:\n" +" »separate«: Fußnoten in eigenen Knoten " +"platzieren;\n" +" »end«: Fußnoten an das Ende des Knotens " +"setzen,\n" +" in dem sie definiert sind (Standard)\n" +" --paragraph-indent=WERT Info-Absätze mit WERT Leerzeichen einziehen\n" +" (Standard %d);\n" +" WERT ist »none«: nicht einziehen;\n" +" WERT ist »asis«: existierende Einzüge " +"behalten\n" +" --split-size=GRÖßE in GRÖßE große Dateien splitten (Standard %d)\n" + +#: makeinfo/makeinfo.c:433 +msgid "" +"Input file options:\n" +" --commands-in-node-names allow @ commands in node names.\n" +" -D VAR define the variable VAR, as with @set.\n" +" -I DIR append DIR to the @include search path.\n" +" -P DIR prepend DIR to the @include search path.\n" +" -U VAR undefine the variable VAR, as with @clear.\n" +msgstr "" +"Eingabedatei-Optionen:\n" +" --commands-in-node-names @-Befehle in Knotennamen zulassen\n" +" -D VAR eine Variable definieren, wie mit @set\n" +" -I VERZ VERZ an den Suchpfad für @include anhängen\n" +" -P VERZ VERZ dem Suchpfad für @include " +"voranstellen\n" +" -U VAR eine Variable aufheben, wie mit @clear\n" + +#: makeinfo/makeinfo.c:442 +#, fuzzy +msgid "" +"Conditional processing in input:\n" +" --ifhtml process @ifhtml and @html even if not generating HTML.\n" +" --ifinfo process @ifinfo even if not generating Info.\n" +" --ifplaintext process @ifplaintext even if not generating plain text.\n" +" --iftex process @iftex and @tex; implies --no-split.\n" +" --no-ifhtml do not process @ifhtml and @html text.\n" +" --no-ifinfo do not process @ifinfo text.\n" +" --no-ifplaintext do not process @ifplaintext text.\n" +" --no-iftex do not process @iftex and @tex text.\n" +msgstr "" +"Bedingte Verarbeitung in Eingabe:\n" +" --ifhtml @ifhtml- und @html-Text auch bearbeiten, wenn kein\n" +" HTML erzeugt wird\n" +" --ifinfo @ifinfo-Text auch bearbeiten, wenn HTML erzeugt wird\n" +" --iftex @iftex und @tex bearbeiten; impliziert --no-split\n" +" --no-ifhtml @ifhtml- und @html-Text nicht bearbeiten\n" +" --no-ifinfo @ifinfo-Text nicht bearbeiten\n" +" --no-iftex @iftex- und @tex-Text nicht bearbeiten\n" + +#: makeinfo/makeinfo.c:454 +#, fuzzy +msgid "" +" The defaults for the @if... conditionals depend on the output format:\n" +" if generating HTML, --ifhtml is on and the others are off;\n" +" if generating Info, --ifinfo is on and the others are off;\n" +" if generating plain text, --ifplaintext is on and the others are off;\n" +msgstr "" +" Die Voreinstellungen für die @if...-Bedingungen hängen vom Ausgabeformat " +"ab:\n" +" wird HTML erzeugt, ist --ifhtml aktiviert und die anderen sind " +"deaktiviert;\n" +" wird Info oder reiner Text erzeugt, ist --ifinfo aktiviert\n" +" und die anderen sind deaktiviert.\n" # Die "." am Zeilenende habe ich entfernt. -ke- -#: makeinfo/makeinfo.c:415 +#: makeinfo/makeinfo.c:461 msgid "" -"\n" -"The defaults for the @if... conditionals depend on the output format:\n" -"if generating HTML, --ifhtml is on and the others are off;\n" -"if generating Info or plain text, --ifinfo is on and the others are off.\n" -"\n" "Examples:\n" -" makeinfo foo.texi write Info to foo's @setfilename\n" -" makeinfo --html foo.texi write HTML to foo's @setfilename\n" -" makeinfo --no-headers -o - foo.texi write plain text to standard output\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 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" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org." +" 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 "" -"\n" -"Die Voreinstellungen für die @if...-Bedingungen hängen vom Ausgabeformat " -"ab:\n" -" wenn HTML erzeugt wird, ist --ifhtml aktiviert und die anderen sind\n" -" de-aktiviert;\n" -" wenn Info oder reiner Text erzeugt wird, ist --ifinfo aktiviert\n" -" und die anderen sind de-aktiviert.\n" -"\n" "Beispiele:\n" -" makeinfo foo.texi Info gemäß @setfilename von foo\n" -" schreiben\n" -" makeinfo --html foo.texi HTML gemäß @setfilename von foo\n" -" schreiben\n" -" makeinfo --no-headers -o - foo.texi reinen Text nach der Standard-\n" -" Ausgabe schreiben\n" -" makeinfo --number-sections foo.texi Info mit nummerierten Abschnitten\n" -" makeinfo --no-split foo.texi eine Info-Datei, sehr voluminös\n" +" makeinfo foo.texi Info gemäß @setfilename von foo " +"schreiben\n" +" makeinfo --html foo.texi HTML gemäß @setfilename schreiben\n" +" makeinfo --xml foo.texi XML gemäß @setfilename schreiben\n" +" makeinfo --docbook foo.texi DocBook-XML gemäß @setfilename " +"schreiben\n" +" makeinfo --no-headers foo.texi reinen Text in Standardausgabe " +"schreiben\n" "\n" -"Fehlerberichte bitte an <bug-texinfo@gnu.org> schicken,\n" -"allgemeine Fragen und Gedankenaustausch an <help-texinfo@gnu.org>.\n" -"\n" -"Für die deutsche Übersetzung ist die Mailingliste <de@li.org> zuständig." +" makeinfo --html --no-headers foo.texi HTML ohne Menüs oder »Knoten«-" +"Zeilen\n" +" makeinfo --number-sections foo.texi Info mit nummerierten Abschnitten\n" +" makeinfo --no-split foo.texi nur eine Info-Datei, sehr " +"voluminös\n" -#: makeinfo/makeinfo.c:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655 +#: makeinfo/makeinfo.c:676 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" -msgstr "%s: %s Argument muss numerisch sein, nicht »%s«.\n" +msgstr "%s: %s Argument muss numerisch sein, nicht »%s«.\n" # checkit -#: makeinfo/makeinfo.c:521 +#: makeinfo/makeinfo.c:583 #, c-format msgid "Couldn't open macro expansion output `%s'" -msgstr "Die Macro-Auflösung für »%s« kann nicht geöffnet werden" +msgstr "Die Macro-Auflösung für »%s« kann nicht geöffnet werden" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:586 msgid "Cannot specify more than one macro expansion output" msgstr "Mehr als eine Ausgabedatei darf nicht angegeben werden" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:624 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" -"%s: Arg für --paragraph-indent muss numerisch/»none«/»asis« sein, nicht " -"»%s«.\n" +"%s: Arg für --paragraph-indent muss numerisch/»none«/»asis« sein, nicht »%" +"s«.\n" -#: makeinfo/makeinfo.c:602 +#: makeinfo/makeinfo.c:665 #, 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" +"%s: Argument für --footnote-style muss »separate« oder »end« sein, nicht »%" +"s«.\n" -#: makeinfo/makeinfo.c:647 +#: makeinfo/makeinfo.c:723 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: Datei-Angabe fehlt.\n" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:898 #, c-format msgid "Expected `%s'" -msgstr "Erwartet »%s«" +msgstr "Erwartet »%s«" + +#: makeinfo/makeinfo.c:1365 +msgid "File exists, but is not a directory" +msgstr "Datei existiert, ist aber kein Verzeichnis" + +#: makeinfo/makeinfo.c:1366 +#, c-format +msgid "Can't create directory `%s': %s" +msgstr "Kann Verzeichnis »%s« nicht anlegen: %s" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1414 #, c-format msgid "No `%s' found in `%s'" -msgstr "Kein »%s« in »%s« gefunden" +msgstr "Kein »%s« in »%s« gefunden" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1496 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -"%s: Macro-Auflösung nach der Standard-Ausgabe, da auch die Info-Ausgabe nach " +"%s: Macro-Auflösung nach der Standard-Ausgabe, da auch die Info-Ausgabe nach " "dort geht.\n" -#: makeinfo/makeinfo.c:1327 +#: makeinfo/makeinfo.c:1526 #, c-format msgid "Making %s file `%s' from `%s'.\n" -msgstr "Erzeuge %s Datei »%s« von »%s«.\n" +msgstr "Erzeuge %s Datei »%s« von »%s«.\n" -#: makeinfo/makeinfo.c:1358 +#: makeinfo/makeinfo.c:1561 #, 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:1377 +#: makeinfo/makeinfo.c:1583 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" -"%s: Entferne Macro-Ausgabe-Datei »%s« wegen der Fehler; --force benutzen, um " +"%s: Entferne Macro-Ausgabe-Datei »%s« wegen der Fehler; --force benutzen, um " "diese beizubehalten.\n" -#. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1627 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" -"%s: Entferne Ausgabe-Datei »%s« wegen der Fehler; --force benutzen, um diese " +"%s: Entferne Ausgabe-Datei »%s« wegen der Fehler; --force benutzen, um diese " "beizubehalten.\n" -#: makeinfo/makeinfo.c:1635 +#: makeinfo/makeinfo.c:1853 #, c-format msgid "Unknown command `%s'" -msgstr "Unbekannter Befehl »%s«" +msgstr "Unbekannter Befehl »%s«" -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1875 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" -"Geschweifte Klammern verwenden, um einen Befehl als Argument an »@%s« zu " +"Geschweifte Klammern verwenden, um einen Befehl als Argument an »@%s« zu " "geben" -#: makeinfo/makeinfo.c:1838 +#: makeinfo/makeinfo.c:2068 #, c-format msgid "%c%s expected `{...}'" -msgstr "%c%s erwartete »{...}«" +msgstr "%c%s erwartete »{...}«" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:2098 msgid "Unmatched }" -msgstr "Nicht übereinstimmende }" +msgstr "Nicht übereinstimmende }" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:2148 msgid "NO_NAME!" msgstr "Kein_NAME!" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:2169 #, c-format msgid "%c%s missing close brace" -msgstr "%c%s fehlende schließende Klammer" +msgstr "%c%s fehlende schließende Klammer" + +#: makeinfo/makeinfo.c:2958 +msgid "First argument to cross-reference may not be empty" +msgstr "Erstes Argument für Querverweis darf nicht leer sein." -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 +#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340 msgid "see " msgstr "siehe" -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:3018 msgid "See " msgstr "Siehe" # checkit -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:3164 #, c-format msgid "`.' or `,' must follow cross reference, not %c" -msgstr "».« or »,« muss einem Querverweis folgen, nicht %c" +msgstr "».« or »,« muss einem Querverweis folgen, nicht %c" + +#: makeinfo/makeinfo.c:3212 +msgid "First argument to @inforef may not be empty" +msgstr "Erstes Argument für @inforef darf nicht leer sein." -#: makeinfo/makeinfo.c:3026 +#: makeinfo/makeinfo.c:3427 #, c-format -msgid "No .png or .jpg for `%s'" -msgstr "Kein .png oder .jpg für »%s«" +msgid "@image file `%s' (for HTML) not readable: %s" +msgstr "@image-Datei »%s« (für HTML) nicht lesbar: %s" -#: makeinfo/makeinfo.c:3063 +#: makeinfo/makeinfo.c:3440 #, c-format -msgid "@image file `%s' unreadable: %s" -msgstr "@image-Datei »%s« nicht lesbar: %s" +msgid "No `%s.png' or `.jpg', and no extension supplied" +msgstr "Kein .png oder .jpg für »%s« und keine Erweiterung angegeben." + +#: makeinfo/makeinfo.c:3490 +#, c-format +msgid "@image file `%s' (for text) unreadable: %s" +msgstr "@image-Datei »%s« (für Text) nicht lesbar: %s" -#: makeinfo/makeinfo.c:3070 +#: makeinfo/makeinfo.c:3497 msgid "@image missing filename argument" msgstr "@image fehlt als Argument ein Dateiname" # checkit -#: makeinfo/makeinfo.c:3259 +#: makeinfo/makeinfo.c:3690 #, c-format msgid "{No value for `%s'}" -msgstr "{Kein Wert für »%s«}" +msgstr "{Kein Wert für »%s«}" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3744 #, c-format msgid "%c%s requires a name" msgstr "%c%s erfordert einen Namen" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3850 #, c-format msgid "Reached eof before matching @end %s" msgstr "Das Ende der Datei vor dem erforderlichen @end %s erreicht" -#: makeinfo/multi.c:208 +#: makeinfo/makeinfo.c:4081 +#, c-format +msgid "`%.40s...' is too long for expansion; not expanded" +msgstr "»%.40s...« ist zum Expandieren zu lang; nicht expandiert" + +#: makeinfo/multi.c:226 msgid "Missing } in @multitable template" -msgstr "Fehlende »}« beim @multitable-Template" +msgstr "Fehlende »}« beim @multitable-Template" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:302 #, c-format msgid "ignoring stray text `%s' after @multitable" -msgstr "irriger Text »%s« nach @multitable wird ignoriert" +msgstr "irriger Text »%s« nach @multitable wird ignoriert" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:375 #, c-format msgid "Too many columns in multitable item (max %d)" msgstr "zu viele Spalten im \"multitable\"-Eintrag (maximal %d)" -#: makeinfo/multi.c:401 +#: makeinfo/multi.c:426 #, c-format msgid "Cannot select column #%d in multitable" -msgstr "Spalte #%d kann in der \"multitable\" nicht ausgewählt werden" +msgstr "Spalte #%d kann in der \"multitable\" nicht ausgewählt werden" -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:529 msgid "ignoring @tab outside of multitable" -msgstr "@tab außerhalb der \"multitable\" wird übergangen" +msgstr "@tab außerhalb der \"multitable\" wird übergangen" # checkit -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:565 msgid "** Multicolumn output from last row:\n" msgstr "** Mehrspalten-Ausgabe von der letzten Zeile:\n" # checkit -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:568 #, c-format msgid "* column #%d: output = %s\n" msgstr "* Spalte #%d: Ausgabe = %s\n" -#: makeinfo/node.c:250 +#: makeinfo/node.c:276 #, c-format msgid "Node `%s' previously defined at line %d" -msgstr "Knoten »%s« bereits zuvor in Zeile %d definiert" +msgstr "Knoten »%s« bereits zuvor in Zeile %d definiert" -#: makeinfo/node.c:514 +#: makeinfo/node.c:594 #, c-format msgid "Formatting node %s...\n" -msgstr "Formatiere Knoten »%s«...\n" +msgstr "Formatiere Knoten »%s«...\n" -#: makeinfo/node.c:559 +#: makeinfo/node.c:655 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" -msgstr "Knoten »%s« benötigt einen Abschnittsbefehl (z.B. %c%s)" +msgstr "Knoten »%s« benötigt einen Abschnittsbefehl (z.B. %c%s)" -#: makeinfo/node.c:719 +#: makeinfo/node.c:815 #, c-format msgid "No node name specified for `%c%s' command" -msgstr "Kein Knotenname für den Befehl »%c%s« angegeben" +msgstr "Kein Knotenname für den Befehl »%c%s« angegeben" + +#: makeinfo/node.c:856 makeinfo/node.c:1075 +#, c-format +msgid "Anchor `%s' and node `%s' map to the same file name" +msgstr "Anker »%s« und Knoten »%s« zeigen auf gleichen Dateinamen." + +#: makeinfo/node.c:859 +msgid "This @anchor command ignored; references to it will not work" +msgstr "" +"Dieser @anchor-Befehl wird ignoriert; Referenzen auf ihn funktionieren nicht" -#: makeinfo/node.c:774 +#: makeinfo/node.c:861 makeinfo/node.c:1078 +msgid "Rename this anchor or use the `--no-split' option" +msgstr "Benennen Sie diesen Anker um oder benutzen Sie die Option »--no-split«" + +#: makeinfo/node.c:891 +#, c-format +msgid "Unexpected string at end of split-HTML file `%s'" +msgstr "Nicht erwartete Zeichenkette am Ende der gesplitteten HTML-Datei »%s«" + +#: makeinfo/node.c:920 msgid "Node:" msgstr "Knoten:" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 +#: makeinfo/node.c:930 msgid "Next:" -msgstr "Nächster:" +msgstr "Nächster:" -#: makeinfo/node.c:793 +#: makeinfo/node.c:940 msgid "Previous:" msgstr "Vorheriger:" -#: makeinfo/node.c:803 +#: makeinfo/node.c:950 msgid "Up:" -msgstr "Aufwärts:" +msgstr "Aufwärts:" + +#: makeinfo/node.c:1072 +#, 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:1077 +msgid "@anchor command ignored; references to it will not work" +msgstr "@anchor-Befehl wird ignoriert; Referenzen auf ihn funktionieren nicht" -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1277 #, c-format msgid "%s reference to nonexistent node `%s'" -msgstr "%s Verweis auf den nicht existierenden Knoten »%s«" +msgstr "%s Verweis auf den nicht existierenden Knoten »%s«" -#: makeinfo/node.c:1029 +#: makeinfo/node.c:1294 msgid "Menu" -msgstr "" +msgstr "Menu" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1296 msgid "Cross" -msgstr "" +msgstr "Cross" -#: makeinfo/node.c:1115 +#: makeinfo/node.c:1380 #, c-format msgid "Next field of node `%s' not pointed to" -msgstr "Das Feld »nächstes« (Next) des Knotens »%s« verweist nicht auf" +msgstr "Das Feld »nächstes« (Next) des Knotens »%s« verweist nicht auf" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1383 #, c-format msgid "This node (%s) has the bad Prev" msgstr "" -"Dieser Knoten (%s) hat einen fehlerhaften Eintrag im Feld »voriges« (Prev)" +"Dieser Knoten (%s) hat einen fehlerhaften Eintrag im Feld »voriges« (Prev)" -#: makeinfo/node.c:1133 +#: makeinfo/node.c:1395 msgid "Prev" -msgstr "" +msgstr "Prev" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1438 #, c-format msgid "Prev field of node `%s' not pointed to" -msgstr "Das Feld »voriges« (Prev) des Knotens »%s« verweist nicht auf" +msgstr "Das Feld »voriges« (Prev) des Knotens »%s« verweist nicht auf" -#: makeinfo/node.c:1180 +#: makeinfo/node.c:1442 #, c-format msgid "This node (%s) has the bad Next" msgstr "" -"Dieser Knoten (%s) hat einen fehlerhaften Eintrag im Feld »nächstes« (Next)" +"Dieser Knoten (%s) hat einen fehlerhaften Eintrag im Feld »nächstes« (Next)" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1454 #, c-format msgid "`%s' has no Up field" -msgstr "»%s« hat kein »Up«-Feld" +msgstr "»%s« hat kein »Up«-Feld" -#: makeinfo/node.c:1197 +#: makeinfo/node.c:1457 msgid "Up" -msgstr "" +msgstr "Up" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1523 #, 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 " -"übergeordnetes Ziel ist" +"Dem Knoten »%s« fehlt ein Menüeintrag für »%s« obwohl er dessen " +"übergeordnetes Ziel ist" -#: makeinfo/node.c:1296 +#: makeinfo/node.c:1552 #, c-format msgid "node `%s' has been referenced %d times" -msgstr "Knoten »%s« wurde %d mal referenziert" +msgstr "Knoten »%s« wurde %d mal referenziert" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1566 #, c-format msgid "unreferenced node `%s'" -msgstr "Nicht referenzierter Knoter »%s«" +msgstr "Nicht referenzierter Knoten »%s«" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " msgstr "Anhang %c " -#. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" -msgstr "Interner Fehler (search_sectioning) »%s«!" +msgstr "Interner Fehler (search_sectioning) »%s«!" -#: makeinfo/sectioning.c:468 +#: makeinfo/sectioning.c:502 #, c-format msgid "%c%s is obsolete; use %c%s instead" msgstr "%c%s ist obsolet; %c%s stattdessen benutzen" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:518 #, c-format msgid "Node with %ctop as a section already exists" msgstr "Knoten mit %ctop als ein Abschnitt exisiert bereits" -#: makeinfo/sectioning.c:496 +#: makeinfo/sectioning.c:526 #, c-format msgid "Here is the %ctop node" msgstr "Hier ist der %ctop-Knoten" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:543 #, c-format msgid "%ctop used before %cnode, defaulting to %s" msgstr "%ctop vor %cnode benutzt, Voreinstellung %s wird genommen" -#. in case we are writing stdout -#: makeinfo/toc.c:212 makeinfo/toc.c:261 makeinfo/toc.c:262 +#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299 msgid "Table of Contents" msgstr "Inhaltsverzeichnis" -#. in case we are writing stdout -#: makeinfo/toc.c:292 makeinfo/toc.c:319 makeinfo/toc.c:320 +#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367 msgid "Short Contents" msgstr "Inhalt in Kurzform" -#: makeinfo/toc.c:354 +#: makeinfo/toc.c:406 #, c-format msgid "%s: TOC should be here, but it was not found" msgstr "%s: Inhaltsverzeichnis sollte hier sein, jedoch nicht gefunden" +#: makeinfo/xml.c:1108 +#, c-format +msgid "@image file `%s' unreadable: %s" +msgstr "@image-Datei »%s« nicht lesbar: %s" + #: util/install-info.c:151 #, c-format msgid "%s: warning: " @@ -2381,12 +2842,12 @@ msgstr "kein Speicher mehr" #: util/install-info.c:232 #, c-format msgid " for %s" -msgstr " für %s" +msgstr " für %s" #: util/install-info.c:381 #, c-format msgid "\tTry `%s --help' for a complete list of options.\n" -msgstr "»%s --help« gibt weitere Informationen.\n" +msgstr "»%s --help« gibt weitere Informationen.\n" # Die "." am Zeilenende habe ich entfernt. -ke- #: util/install-info.c:389 @@ -2424,28 +2885,25 @@ msgid "" " If you don't specify any sections, they are determined\n" " from information in the Info file itself.\n" " --version display version information and exit.\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" -"Syntax: %s [OPTION]... [INFO-DATEI [VERZ-DATEI]]\n" +"Aufruf: %s [OPTION]... [INFO-DATEI [VERZ-DATEI]]\n" "\n" -"»dir«-Einträge von der INFO-DATEI in der Info-Verzeichnis-Datei VERZ-DATEI\n" -"installieren oder löschen.\n" +"»dir«-Einträge von der INFO-DATEI in der Info-Verzeichnis-Datei VERZ-DATEI\n" +"installieren oder löschen.\n" "\n" "Optionen:\n" -" --delete vorhandene Einträge für INFO-DATEI aus VERZ-DATEI " -"löschen;\n" -" keine neuen Einträge einfügen\n" +" --delete vorhandene Einträge für INFO-DATEI aus VERZ-DATEI " +"löschen;\n" +" keine neuen Einträge einfügen\n" " --dir-file=NAME Name der Info-Verzeichnis-Datei angeben. " "Gleichbedeutend\n" " mit dem VERZ-DATEI-Argument\n" -" --entry=TEXT TEXT als einen Info-Verzeichnis-Eintrag einfügen. TEXT " +" --entry=TEXT TEXT als einen Info-Verzeichnis-Eintrag einfügen. TEXT " "soll\n" -" die Form einer Zeile eines Info-Menüpunkts haben,\n" -" zuzüglich Null oder mehrerer Extra-Zeilen, die mit\n" +" die Form einer Zeile eines Info-Menüpunkts haben,\n" +" zuzüglich Null oder mehrerer Extra-Zeilen, die mit\n" " Leerraum (\"whitespace\") beginnen. Wenn mehr als ein\n" -" Eintrag angegeben wird, werden alle hinzugefügt. Wenn " +" Eintrag angegeben wird, werden alle hinzugefügt. Wenn " "gar\n" " kein Eintrag angegeben wird, wird der Eintragstext der\n" " Info-Datei selbst entnommen.\n" @@ -2453,26 +2911,22 @@ msgstr "" " --info-file=DATEI Info-Datei angeben, die im Verzeichnis zu installieren " "ist.\n" " Gleichbedeutend mit dem INFO-DATEI-Argument\n" -" --info-dir=VERZ wie --dir-file=VERZ/dir.\n" -" --item=TEXT wie --entry TEXT.\n" -" Ein Info-Verzeichnis-Eintrag ist nämlich ein Menüpunkt\n" -" --quiet Warnungen unterdrücken\n" +" --info-dir=VERZ wie --dir-file=VERZ/dir\n" +" --item=TEXT wie --entry TEXT\n" +" Ein Info-Verzeichnis-Eintrag ist nämlich ein " +"Menüpunkt.\n" +" --quiet Warnungen unterdrücken\n" " --remove wie --delete\n" -" --section=ABSCHN die Einträge dieser Datei in den Abschnitt ABSCHN des\n" +" --section=ABSCHN die Einträge dieser Datei in den Abschnitt ABSCHN des\n" " Verzeichnisses stellen. Wenn mehr als ein Abschnitt\n" -" angegeben wird, werden alle Einträge in jedem der\n" -" Abschnitte hinzugefügt. Wenn gar kein Abschnitt " +" angegeben wird, werden alle Einträge in jedem der\n" +" Abschnitte hinzugefügt. Wenn gar kein Abschnitt " "angegeben\n" " wird, wird der Eintragstext der Info-Datei selbst\n" " entnommen.\n" " --version Programmversion anzeigen\n" -"\n" -"Fehlerberichte bitte an <bug-texinfo@gnu.org> schicken,\n" -"allgemeine Fragen und Gedankenaustausch an <help-texinfo@gnu.org>.\n" -"\n" -"Für die deutsche Übersetzung ist die Mailingliste <de@li.org> zuständig.\n" -#: util/install-info.c:442 +#: util/install-info.c:444 #, c-format msgid "" "This is the file .../info/dir, which contains the\n" @@ -2492,120 +2946,114 @@ msgid "" "* Menu:\n" msgstr "" "Dies ist die Datei .../info/dir, die den obersten Knoten der\n" -"Info-Hierarchie enthält, genannt (dir)Top.\n" +"Info-Hierarchie enthält, genannt (dir)Top.\n" "Beim ersten Aufruf von Info geht es bei diesem Knoten los.\n" " \n" "%s\tDies ist der Beginn des INFO-Baums\n" "\n" -" Dieser Verzeichnis-Knoten zeigt ein Menü aller Hauptpunkte an.\n" +" Dieser Verzeichnis-Knoten zeigt ein Menü aller Hauptpunkte an.\n" " Beenden mit \"q\", \"?\" listet alle Info-Befehle auf, \"d\" kehrt nach " "hierher\n" -" zurück, \"h\" gibt eine Einsteiger-Hilfe,\n" +" zurück, \"h\" gibt eine Einsteiger-Hilfe,\n" " \"mEmacs<Return>\" besucht das Emacs-Manual, etc.\n" "\n" -" Im Emacs kann man mit mouse-button-2 auf einen Menüpunkt oder einen\n" -" Querverweis klicken, um einen solchen auswählen.\n" +" Im Emacs kann man mit mouse-button-2 auf einen Menüpunkt oder einen\n" +" Querverweis klicken, um einen solchen auswählen.\n" "\n" -"* Menü:\n" +"* Menü:\n" -#: util/install-info.c:465 +#: util/install-info.c:467 #, c-format msgid "%s: could not read (%s) and could not create (%s)\n" msgstr "%s: kann nicht gelesen (%s) und kann nicht angelegt werden (%s)\n" -#: util/install-info.c:549 +#: util/install-info.c:551 #, c-format msgid "%s: empty file" msgstr "%s: leere Datei" -#: util/install-info.c:864 util/install-info.c:904 +#: util/install-info.c:866 util/install-info.c:906 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:899 +#: util/install-info.c:901 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:1147 util/install-info.c:1157 +#: util/install-info.c:1150 util/install-info.c:1160 #, c-format msgid "%s: Specify the Info directory only once.\n" msgstr "%s: Info-Verzeichnis nur einmal angeben.\n" -#: util/install-info.c:1192 +#: util/install-info.c:1195 #, c-format msgid "%s: Specify the Info file only once.\n" msgstr "%s: Info-Datei nur einmal angeben.\n" # checkit -#: util/install-info.c:1241 +#: util/install-info.c:1244 #, c-format msgid "excess command line argument `%s'" -msgstr "Kommandozeilen-Argument »%s« wird übergangen" +msgstr "Kommandozeilen-Argument »%s« wird übergangen" -#: util/install-info.c:1245 +#: util/install-info.c:1248 msgid "No input file specified; try --help for more information." -msgstr "Keine Eingabe-Datei angegeben; »--help« gibt weitere Informationen." +msgstr "Keine Eingabe-Datei angegeben; »--help« gibt weitere Informationen." -#: util/install-info.c:1247 +#: util/install-info.c:1251 msgid "No dir file specified; try --help for more information." -msgstr "Keine dir-Datei angegeben; »--help« gibt weitere Informationen." +msgstr "Keine dir-Datei angegeben; »--help« gibt weitere Informationen." -#. No need to abort here, the original info file may not -#. have the requisite Texinfo commands. This is not -#. something an installer should have to correct (it's a -#. problem for the maintainer), and there's no need to cause -#. subsequent parts of `make install' to fail. -#: util/install-info.c:1269 +#: util/install-info.c:1273 #, c-format msgid "no info dir entry in `%s'" -msgstr "Kein Info-Verzeichnis-Eintrag in »%s«" +msgstr "Kein Info-Verzeichnis-Eintrag in »%s«" -#: util/install-info.c:1384 +#: util/install-info.c:1388 #, c-format msgid "menu item `%s' already exists, for file `%s'" -msgstr "Menüpunkt »%s« bereits vorhanden, für Datei »%s«" +msgstr "Menüpunkt »%s« bereits vorhanden, für Datei »%s«" -#: util/install-info.c:1407 +#: util/install-info.c:1411 #, c-format msgid "no entries found for `%s'; nothing deleted" -msgstr "keine Einträge für »%s« gefunden; nichts entfernt" +msgstr "keine Einträge für »%s« gefunden; nichts entfernt" -#: util/texindex.c:244 +#: util/texindex.c:245 msgid "display this help and exit" msgstr "diese Hilfe anzeigen" -#: util/texindex.c:246 +#: util/texindex.c:247 msgid "keep temporary files around after processing" -msgstr "temporäre Dateien bis nach der Verarbeitung aufheben" +msgstr "temporäre Dateien bis nach der Verarbeitung aufheben" -#: util/texindex.c:248 +#: util/texindex.c:249 msgid "do not keep temporary files around after processing (default)" -msgstr "keine temporäre Dateien bis nach der Verarbeitung aufheben (Standard)" +msgstr "keine temporäre Dateien bis nach der Verarbeitung aufheben (Standard)" -#: util/texindex.c:250 +#: util/texindex.c:251 msgid "send output to FILE" msgstr "Ausgabe nach DATEI schicken" -#: util/texindex.c:252 +#: util/texindex.c:253 msgid "display version information and exit" msgstr "Programmversion anzeigen" -#: util/texindex.c:263 +#: util/texindex.c:264 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Aufruf: %s [OPTION]... DATEI...\n" -#: util/texindex.c:264 +#: util/texindex.c:265 msgid "Generate a sorted index for each TeX output FILE.\n" -msgstr "Erzeuge einen sortierten Index für jede TeX-Ausgabedatei.\n" +msgstr "Erzeuge einen sortierten Index für jede TeX-Ausgabedatei.\n" -#: util/texindex.c:267 +#: util/texindex.c:268 #, 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" +msgstr "DATEI... ist normalerweise »foo.%c%c« für ein Dokument »foo.texi«.\n" -#. avoid trigraph in cat-id-tbl.c -#: util/texindex.c:269 +#: util/texindex.c:270 msgid "" "\n" "Options:\n" @@ -2613,46 +3061,51 @@ msgstr "" "\n" "Optionen:\n" -#: util/texindex.c:285 -msgid "" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" -msgstr "" -"\n" -"Fehlerberichte per E-Mail an bug-texinfo@gnu.org schicken,\n" -"allgemeine Fragen und Gedankenaustausch an help-texinfo@gnu.org.\n" - -#: util/texindex.c:885 util/texindex.c:919 util/texindex.c:995 -#: util/texindex.c:1023 +#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997 +#: util/texindex.c:1025 #, c-format msgid "%s: not a texinfo index file" msgstr "%s: keine Texinfo-Indexdatei" -#: util/texindex.c:980 +#: util/texindex.c:982 #, c-format msgid "failure reopening %s" -msgstr "Fehler beim Wiederöffnen von »%s«" +msgstr "Fehler beim Wiederöffnen von »%s«" -#: util/texindex.c:1222 +#: util/texindex.c:1224 #, c-format msgid "No page number in %s" msgstr "Keine Seitenzahl in %s" # checkit -#: util/texindex.c:1293 +#: util/texindex.c:1295 #, c-format msgid "entry %s follows an entry with a secondary name" -msgstr "Eintrag »%s« folgt einem Eintrag mit einem Zweitnamen" +msgstr "Eintrag »%s« folgt einem Eintrag mit einem Zweitnamen" -#: util/texindex.c:1631 +#: util/texindex.c:1633 #, c-format msgid "%s; for file `%s'.\n" -msgstr "%s; für Datei »%s«.\n" +msgstr "%s; für Datei »%s«.\n" #~ msgid "" -#~ "---------- Footnotes ----------\n" -#~ "\n" +#~ "Email bug reports to bug-texinfo@gnu.org,\n" +#~ "general questions and discussion to help-texinfo@gnu.org." #~ msgstr "" -#~ "---------- Fußnoten -----------\n" -#~ "\n" +#~ "Fehlerberichte per E-Mail an bug-texinfo@gnu.org schicken,\n" +#~ "allgemeine Fragen und Gedankenaustausch an help-texinfo@gnu.org." + +#~ msgid "Basic Commands in Info Windows\n" +#~ msgstr "Grundbefehle in Info-Fenstern\n" + +#~ msgid "Moving within a node:\n" +#~ msgstr "Innerhalb eines Knotens bewegen:\n" + +#~ msgid "Selecting other nodes:\n" +#~ msgstr "Andere Knoten auswählen:\n" + +#~ msgid "Other commands:\n" +#~ msgstr "Andere Befehle:\n" + +#~ msgid "%s' argument to @image command not found" +#~ msgstr "%s'-Argument für @image-Befehl nicht gefunden" diff --git a/gnu/usr.bin/texinfo/po/de_AT.gmo b/gnu/usr.bin/texinfo/po/de_AT.gmo Binary files differindex 4c5d80f445d..0842096e409 100644 --- a/gnu/usr.bin/texinfo/po/de_AT.gmo +++ b/gnu/usr.bin/texinfo/po/de_AT.gmo diff --git a/gnu/usr.bin/texinfo/po/de_AT.po b/gnu/usr.bin/texinfo/po/de_AT.po index 9fd3f3d906d..44ba2128791 100644 --- a/gnu/usr.bin/texinfo/po/de_AT.po +++ b/gnu/usr.bin/texinfo/po/de_AT.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 3.12d\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" +"POT-Creation-Date: 2002-04-01 06:10-0800\n" "PO-Revision-Date: 1999-02-16 21:14+01:00\n" "Last-Translator: Karl Eichwalder <ke@suse.de>\n" "Language-Team: German <de@li.org>\n" @@ -16,17 +16,11 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#. **************************************************************** -#. -#. Echo Area Movement Commands -#. -#. **************************************************************** -#: info/echo-area.c:283 info/session.c:711 +#: info/echo-area.c:283 info/session.c:712 msgid "Move forward a character" msgstr "" -#. Move point backward in the node. -#: info/echo-area.c:295 info/session.c:727 +#: info/echo-area.c:295 info/session.c:728 msgid "Move backward a character" msgstr "" @@ -38,12 +32,11 @@ msgstr "" msgid "Move to the end of this line" msgstr "" -#. Move forward a word in the input line. -#: info/echo-area.c:320 info/session.c:745 +#: info/echo-area.c:320 info/session.c:746 msgid "Move forward a word" msgstr "" -#: info/echo-area.c:360 info/session.c:794 +#: info/echo-area.c:360 info/session.c:795 msgid "Move backward a word" msgstr "" @@ -75,8 +68,6 @@ msgstr "" msgid "Insert a TAB character" msgstr "" -#. Transpose the characters at point. If point is at the end of the line, -#. then transpose the characters before point. #: info/echo-area.c:504 msgid "Transpose characters at point" msgstr "" @@ -89,14 +80,10 @@ msgstr "" msgid "Kill ring is empty" msgstr "" -#. If the last command was yank, or yank_pop, and the text just before -#. point is identical to the current kill item, then delete that text -#. from the line, rotate the index down, and yank back some other text. #: info/echo-area.c:575 msgid "Yank back a previous kill" msgstr "" -#. Delete the text from point to end of line. #: info/echo-area.c:608 msgid "Kill to the end of the line" msgstr "" @@ -105,7 +92,6 @@ msgstr "" msgid "Kill to the beginning of the line" msgstr "" -#. Delete from point to the end of the current word. #: info/echo-area.c:633 msgid "Kill the word following the cursor" msgstr "" @@ -114,43 +100,40 @@ msgstr "" msgid "Kill the word preceding the cursor" msgstr "" -#: info/echo-area.c:871 -msgid "Not complete" +#: info/echo-area.c:872 info/echo-area.c:932 +msgid "No completions" msgstr "" -#: info/echo-area.c:916 -msgid "List possible completions" +#: info/echo-area.c:874 +msgid "Not complete" msgstr "" -#: info/echo-area.c:929 -msgid "No completions" +#: info/echo-area.c:919 +msgid "List possible completions" msgstr "" -#: info/echo-area.c:933 +#: info/echo-area.c:936 msgid "Sole completion" msgstr "" -#: info/echo-area.c:942 +#: info/echo-area.c:945 msgid "One completion:\n" msgstr "" -#: info/echo-area.c:943 +#: info/echo-area.c:946 #, c-format msgid "%d completions:\n" msgstr "" -#: info/echo-area.c:1089 +#: info/echo-area.c:1092 msgid "Insert completion" msgstr "" -#: info/echo-area.c:1222 +#: info/echo-area.c:1225 msgid "Building completions..." msgstr "" -#. Scroll the "other" window. If there is a window showing completions, scroll -#. that one, otherwise scroll the window which was active on entering the read -#. function. -#: info/echo-area.c:1320 +#: info/echo-area.c:1342 msgid "Scroll the completions window" msgstr "" @@ -162,6 +145,10 @@ msgstr "" msgid "Show the footnotes associated with this node in another window" msgstr "" +#: info/footnotes.h:26 +msgid "---------- Footnotes ----------" +msgstr "" + #: info/indices.c:175 msgid "Look up a string in the index for this file" msgstr "" @@ -214,6 +201,11 @@ msgstr "" msgid "Scanning indices of \"%s\"..." msgstr "" +#: info/indices.c:603 +#, c-format +msgid "No available info files have \"%s\" in their indices." +msgstr "" + #: info/indices.c:632 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "" @@ -229,12 +221,12 @@ msgid "" "* Menu: Nodes whoses indices contain \"%s\":\n" msgstr "" -#: info/info.c:248 +#: info/info.c:260 info/infokey.c:884 msgid "Try --help for more information.\n" msgstr "" -#: info/info.c:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 -#: util/texindex.c:336 +#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689 +#: util/install-info.c:1224 util/texindex.c:338 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -243,12 +235,16 @@ msgid "" "For more information about these matters, see the files named COPYING.\n" msgstr "" -#: info/info.c:461 +#: info/info.c:462 #, c-format msgid "no index entries found for `%s'\n" msgstr "" -#: info/info.c:530 +#: info/info.c:555 +msgid " -b, --speech-friendly be friendly to speech synthesizers.\n" +msgstr "" + +#: info/info.c:562 #, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" @@ -256,19 +252,21 @@ msgid "" "Read documentation in Info format.\n" "\n" "Options:\n" -" --apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n" -" --directory=DIR add DIR to INFOPATH.\n" -" --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" --file=FILENAME specify Info file to visit.\n" -" --help display this help and exit.\n" -" --index-search=STRING go to node pointed by index entry STRING.\n" -" --node=NODENAME specify nodes in first visited Info file.\n" -" --output=FILENAME output selected nodes to FILENAME.\n" -" --restore=FILENAME read initial keystrokes from FILENAME.\n" -" --show-options, --usage go to command-line options node.\n" -" --subnodes recursively output menu items.\n" -"%s --vi-keys use vi-like and less-like key bindings.\n" -" --version display version information and exit.\n" +" --apropos=STRING look up STRING in all indices of all " +"manuals.\n" +" -d, --directory=DIR add DIR to INFOPATH.\n" +" --dribble=FILENAME remember user keystrokes in FILENAME.\n" +" -f, --file=FILENAME specify Info file to visit.\n" +" -h, --help display this help and exit.\n" +" --index-search=STRING go to node pointed by index entry STRING.\n" +" -n, --node=NODENAME specify nodes in first visited Info file.\n" +" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -R, --raw-escapes don't remove ANSI escapes from man pages.\n" +" --restore=FILENAME read initial keystrokes from FILENAME.\n" +" -O, --show-options, --usage go to command-line options node.\n" +"%s --subnodes recursively output menu items.\n" +" --vi-keys use vi-like and less-like key bindings.\n" +" --version display version information and exit.\n" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" @@ -282,380 +280,650 @@ msgid "" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" " info -f ./foo.info show file ./foo.info, not searching dir\n" +msgstr "" + +#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474 +#: util/install-info.c:421 util/texindex.c:286 +msgid "" "\n" "Email bug reports to bug-texinfo@gnu.org,\n" "general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" msgstr "" -#: info/info.c:604 +#: info/info.c:632 #, c-format msgid "Cannot find node `%s'." msgstr "" -#: info/info.c:605 +#: info/info.c:633 #, c-format msgid "Cannot find node `(%s)%s'." msgstr "" -#: info/info.c:606 +#: info/info.c:634 msgid "Cannot find a window!" msgstr "" -#: info/info.c:607 +#: info/info.c:635 msgid "Point doesn't appear within this window's node!" msgstr "" -#: info/info.c:608 +#: info/info.c:636 msgid "Cannot delete the last window." msgstr "" -#: info/info.c:609 +#: info/info.c:637 msgid "No menu in this node." msgstr "" -#: info/info.c:610 +#: info/info.c:638 msgid "No footnotes in this node." msgstr "" -#: info/info.c:611 +#: info/info.c:639 msgid "No cross references in this node." msgstr "" -#: info/info.c:612 +#: info/info.c:640 #, c-format msgid "No `%s' pointer for this node." msgstr "" -#: info/info.c:613 +#: info/info.c:641 #, c-format msgid "Unknown Info command `%c'; try `?' for help." msgstr "" -#: info/info.c:614 +#: info/info.c:642 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." msgstr "" -#: info/info.c:615 +#: info/info.c:643 msgid "You are already at the last page of this node." msgstr "" -#: info/info.c:616 +#: info/info.c:644 msgid "You are already at the first page of this node." msgstr "" -#: info/info.c:617 +#: info/info.c:645 msgid "Only one window." msgstr "" -#: info/info.c:618 +#: info/info.c:646 msgid "Resulting window would be too small." msgstr "" -#: info/info.c:619 +#: info/info.c:647 msgid "Not enough room for a help window, please delete a window." msgstr "" -#: info/infodoc.c:45 -msgid "Basic Commands in Info Windows\n" -msgstr "" - -#: info/infodoc.c:46 -msgid "******************************\n" +#: info/infodoc.c:45 info/infodoc.c:94 +msgid "" +"Basic Commands in Info Windows\n" +"******************************\n" msgstr "" #: info/infodoc.c:48 -#, c-format -msgid " %-10s Quit this help.\n" +msgid "\\%-10[quit-help] Quit this help.\n" msgstr "" #: info/infodoc.c:49 -#, c-format -msgid " %-10s Quit Info altogether.\n" +msgid "\\%-10[quit] Quit Info altogether.\n" msgstr "" #: info/infodoc.c:50 -#, c-format -msgid " %-10s Invoke the Info tutorial.\n" -msgstr "" - -#: info/infodoc.c:52 -msgid "Moving within a node:\n" +msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" msgstr "" -#: info/infodoc.c:53 -msgid "---------------------\n" +#: info/infodoc.c:52 info/infodoc.c:101 +msgid "" +"Selecting other nodes:\n" +"----------------------\n" msgstr "" #: info/infodoc.c:54 -#, c-format -msgid " %-10s Scroll forward a page.\n" +msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" msgstr "" #: info/infodoc.c:55 -#, c-format -msgid " %-10s Scroll backward a page.\n" +msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" msgstr "" #: info/infodoc.c:56 -#, c-format -msgid " %-10s Go to the beginning of this node.\n" +msgid "\\%-10[up-node] Move \"up\" from this node.\n" msgstr "" #: info/infodoc.c:57 -#, c-format -msgid " %-10s Go to the end of this node.\n" +msgid "" +"\\%-10[menu-item] Pick menu item specified by name.\n" +" Picking a menu item causes another node to be selected.\n" msgstr "" -#: info/infodoc.c:58 -#, c-format -msgid " %-10s Scroll forward 1 line.\n" +#: info/infodoc.c:59 +msgid "" +"\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n" msgstr "" -#: info/infodoc.c:59 -#, c-format -msgid " %-10s Scroll backward 1 line.\n" +#: info/infodoc.c:60 +msgid "\\%-10[history-node] Move to the last node seen in this window.\n" msgstr "" #: info/infodoc.c:61 -msgid "Selecting other nodes:\n" +msgid "" +"\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n" msgstr "" #: info/infodoc.c:62 -msgid "----------------------\n" +msgid "" +"\\%-10[move-to-prev-xref] Skip to previous hypertext link within this " +"node.\n" msgstr "" #: info/infodoc.c:63 +msgid "" +"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" +msgstr "" + +#: info/infodoc.c:64 +msgid "" +"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" +"node] (DIR)'.\n" +msgstr "" + +#: info/infodoc.c:65 +msgid "" +"\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node] Top'.\n" +msgstr "" + +#: info/infodoc.c:67 info/infodoc.c:115 +msgid "" +"Moving within a node:\n" +"---------------------\n" +msgstr "" + +#: info/infodoc.c:69 +msgid "\\%-10[scroll-forward] Scroll forward a page.\n" +msgstr "" + +#: info/infodoc.c:70 +msgid "\\%-10[scroll-backward] Scroll backward a page.\n" +msgstr "" + +#: info/infodoc.c:71 +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" +msgstr "" + +#: info/infodoc.c:72 +msgid "\\%-10[end-of-node] Go to the end of this node.\n" +msgstr "" + +#: info/infodoc.c:73 +msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" +msgstr "" + +#: info/infodoc.c:74 +msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" +msgstr "" + +#: info/infodoc.c:76 info/infodoc.c:124 +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "" + +#: info/infodoc.c:78 +msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" +msgstr "" + +#: info/infodoc.c:79 +msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" +msgstr "" + +#: info/infodoc.c:80 +msgid "" +"\\%-10[index-search] Search for a specified string in the index entries of " +"this Info\n" +" file, and select the node referenced by the first entry " +"found.\n" +msgstr "" + +#: info/infodoc.c:82 +msgid "" +"\\%-10[goto-node] Move to node specified by name.\n" +" You may include a filename as well, as in (FILENAME)NODENAME.\n" +msgstr "" + +#: info/infodoc.c:84 +msgid "" +"\\%-10[search] Search forward for a specified string\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" + +#: info/infodoc.c:86 +msgid "" +"\\%-10[search-backward] Search backward for a specified string\n" +" and select the node in which the previous occurrence is " +"found.\n" +msgstr "" + +#: info/infodoc.c:97 +#, c-format +msgid " %-10s Quit this help.\n" +msgstr "" + +#: info/infodoc.c:98 +#, c-format +msgid " %-10s Quit Info altogether.\n" +msgstr "" + +#: info/infodoc.c:99 +#, c-format +msgid " %-10s Invoke the Info tutorial.\n" +msgstr "" + +#: info/infodoc.c:103 #, c-format msgid " %-10s Move to the `next' node of this node.\n" msgstr "" -#: info/infodoc.c:64 +#: info/infodoc.c:104 #, c-format msgid " %-10s Move to the `previous' node of this node.\n" msgstr "" -#: info/infodoc.c:65 +#: info/infodoc.c:105 #, c-format msgid " %-10s Move `up' from this node.\n" msgstr "" -#: info/infodoc.c:66 +#: info/infodoc.c:106 #, c-format msgid " %-10s Pick menu item specified by name.\n" msgstr "" -#: info/infodoc.c:67 +#: info/infodoc.c:107 msgid " Picking a menu item causes another node to be selected.\n" msgstr "" -#: info/infodoc.c:68 +#: info/infodoc.c:108 #, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" msgstr "" -#: info/infodoc.c:69 +#: info/infodoc.c:109 #, c-format msgid " %-10s Move to the last node seen in this window.\n" msgstr "" -#: info/infodoc.c:70 +#: info/infodoc.c:110 #, c-format msgid " %-10s Skip to next hypertext link within this node.\n" msgstr "" -#: info/infodoc.c:71 +#: info/infodoc.c:111 #, c-format msgid " %-10s Follow the hypertext link under cursor.\n" msgstr "" -#: info/infodoc.c:72 +#: info/infodoc.c:112 #, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" msgstr "" -#: info/infodoc.c:73 +#: info/infodoc.c:113 #, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" msgstr "" -#: info/infodoc.c:75 -msgid "Other commands:\n" +#: info/infodoc.c:117 +#, c-format +msgid " %-10s Scroll forward a page.\n" msgstr "" -#: info/infodoc.c:76 -msgid "---------------\n" +#: info/infodoc.c:118 +#, c-format +msgid " %-10s Scroll backward a page.\n" msgstr "" -#: info/infodoc.c:77 +#: info/infodoc.c:119 +#, c-format +msgid " %-10s Go to the beginning of this node.\n" +msgstr "" + +#: info/infodoc.c:120 +#, c-format +msgid " %-10s Go to the end of this node.\n" +msgstr "" + +#: info/infodoc.c:121 +#, c-format +msgid " %-10s Scroll forward 1 line.\n" +msgstr "" + +#: info/infodoc.c:122 +#, c-format +msgid " %-10s Scroll backward 1 line.\n" +msgstr "" + +#: info/infodoc.c:126 #, c-format msgid " %-10s Pick first ... ninth item in node's menu.\n" msgstr "" -#: info/infodoc.c:78 +#: info/infodoc.c:127 #, c-format msgid " %-10s Pick last item in node's menu.\n" msgstr "" -#: info/infodoc.c:79 +#: info/infodoc.c:128 #, c-format msgid "" " %-10s Search for a specified string in the index entries of this Info\n" msgstr "" -#: info/infodoc.c:80 +#: info/infodoc.c:129 msgid "" " file, and select the node referenced by the first entry " "found.\n" msgstr "" -#: info/infodoc.c:81 +#: info/infodoc.c:130 #, c-format msgid " %-10s Move to node specified by name.\n" msgstr "" -#: info/infodoc.c:82 +#: info/infodoc.c:131 msgid "" " You may include a filename as well, as in (FILENAME)NODENAME.\n" msgstr "" -#: info/infodoc.c:83 +#: info/infodoc.c:132 #, c-format -msgid "" -" %-10s Search forward through this Info file for a specified string,\n" +msgid " %-10s Search forward for a specified string,\n" msgstr "" -#: info/infodoc.c:84 info/infodoc.c:86 +#: info/infodoc.c:133 info/infodoc.c:135 msgid "" " and select the node in which the next occurrence is found.\n" msgstr "" -#: info/infodoc.c:85 +#: info/infodoc.c:134 #, c-format -msgid " %-10s Search backward in this Info file for a specified string,\n" +msgid " %-10s Search backward for a specified string\n" msgstr "" -#: info/infodoc.c:258 +#: info/infodoc.c:313 msgid "The current search path is:\n" msgstr "" -#: info/infodoc.c:261 +#: info/infodoc.c:316 msgid "" "Commands available in Info windows:\n" "\n" msgstr "" -#: info/infodoc.c:264 +#: info/infodoc.c:319 msgid "" "Commands available in the echo area:\n" "\n" msgstr "" -#: info/infodoc.c:280 +#: info/infodoc.c:340 +#, c-format msgid "" -"The following commands can only be invoked via M-x:\n" +"The following commands can only be invoked via %s:\n" "\n" msgstr "" -#: info/infodoc.c:301 +#: info/infodoc.c:343 +msgid "" +"The following commands cannot be invoked at all:\n" +"\n" +msgstr "" + +#: info/infodoc.c:367 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" msgstr "" -#. Create or move to the help window. -#: info/infodoc.c:411 +#: info/infodoc.c:477 msgid "Display help message" msgstr "" -#. Show the Info help node. This means that the "info" file is installed -#. where it can easily be found on your system. -#: info/infodoc.c:429 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" msgstr "" -#: info/infodoc.c:555 +#: info/infodoc.c:638 msgid "Print documentation for KEY" msgstr "" -#: info/infodoc.c:568 +#: info/infodoc.c:650 #, c-format msgid "Describe key: %s" msgstr "" -#: info/infodoc.c:577 +#: info/infodoc.c:660 #, c-format msgid "ESC %s is undefined." msgstr "" -#: info/infodoc.c:594 +#: info/infodoc.c:676 info/infodoc.c:703 #, c-format msgid "%s is undefined." msgstr "" -#: info/infodoc.c:620 +#: info/infodoc.c:724 #, c-format msgid "%s is defined to %s." msgstr "" -#: info/infodoc.c:812 +#: info/infodoc.c:1151 msgid "Show what to type to execute a given command" msgstr "" -#: info/infodoc.c:816 +#: info/infodoc.c:1155 msgid "Where is command: " msgstr "" -#: info/infodoc.c:838 +#: info/infodoc.c:1177 #, c-format msgid "`%s' is not on any keys" msgstr "" -#: info/infodoc.c:844 +#: info/infodoc.c:1183 #, c-format msgid "%s can only be invoked via %s." msgstr "" -#: info/infodoc.c:847 +#: info/infodoc.c:1186 #, c-format msgid "%s can be invoked via %s." msgstr "" -#: info/infodoc.c:851 +#: info/infodoc.c:1190 #, c-format msgid "There is no function named `%s'" msgstr "" -#: info/m-x.c:69 +#: info/infokey.c:164 +msgid "incorrect number of arguments" +msgstr "" + +#: info/infokey.c:194 +#, c-format +msgid "cannot open input file `%s'" +msgstr "" + +#: info/infokey.c:207 +#, c-format +msgid "cannot create output file `%s'" +msgstr "" + +#: info/infokey.c:217 +#, c-format +msgid "error writing to `%s'" +msgstr "" + +#: info/infokey.c:222 +#, c-format +msgid "error closing output file `%s'" +msgstr "" + +#: info/infokey.c:443 +msgid "key sequence too long" +msgstr "" + +#: info/infokey.c:521 +msgid "missing key sequence" +msgstr "" + +#: info/infokey.c:600 +msgid "NUL character (\\000) not permitted" +msgstr "" + +#: info/infokey.c:629 +#, c-format +msgid "NUL character (^%c) not permitted" +msgstr "" + +#: info/infokey.c:652 +msgid "missing action name" +msgstr "" + +#: info/infokey.c:667 info/infokey.c:733 +msgid "section too long" +msgstr "" + +#: info/infokey.c:673 +#, c-format +msgid "unknown action `%s'" +msgstr "" + +#: info/infokey.c:682 +msgid "action name too long" +msgstr "" + +#: info/infokey.c:694 +#, c-format +msgid "extra characters following action `%s'" +msgstr "" + +#: info/infokey.c:704 +msgid "missing variable name" +msgstr "" + +#: info/infokey.c:712 +msgid "missing `=' immediately after variable name" +msgstr "" + +#: info/infokey.c:719 +msgid "variable name too long" +msgstr "" + +#: info/infokey.c:741 +msgid "value too long" +msgstr "" + +#: info/infokey.c:875 +#, c-format +msgid "\"%s\", line %u: " +msgstr "" + +#: info/infokey.c:891 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT-FILE]\n" +"\n" +"Compile infokey source file to infokey file. Reads INPUT-FILE (default\n" +"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n" +"\n" +"Options:\n" +" --output FILE output to FILE instead of $HOME/.info\n" +" --help display this help and exit.\n" +" --version display version information and exit.\n" +msgstr "" + +#: info/infomap.c:1397 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too small" +msgstr "" + +#: info/infomap.c:1400 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too big" +msgstr "" + +#: info/infomap.c:1413 +#, c-format +msgid "Error reading infokey file `%s' - short read" +msgstr "" + +#: info/infomap.c:1431 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1437 +#, c-format +msgid "Your infokey file `%s' is out of date -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1450 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1470 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section code) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1608 +msgid "Bad data in infokey file -- some key bindings ignored" +msgstr "" + +#: info/infomap.c:1659 +msgid "Bad data in infokey file -- some var settings ignored" +msgstr "" + +#: info/m-x.c:70 msgid "Read the name of an Info command and describe it" msgstr "" -#: info/m-x.c:73 +#: info/m-x.c:74 msgid "Describe command: " msgstr "" -#: info/m-x.c:96 +#: info/m-x.c:97 msgid "Read a command name in the echo area and execute it" msgstr "" -#: info/m-x.c:134 +#: info/m-x.c:141 msgid "Cannot execute an `echo-area' command here." msgstr "" -#: info/m-x.c:150 +#: info/m-x.c:157 msgid "Set the height of the displayed window" msgstr "" -#: info/m-x.c:163 +#: info/m-x.c:170 #, c-format msgid "Set screen height to (%d): " msgstr "" -#: info/makedoc.c:132 +#: info/makedoc.c:161 info/makedoc.c:169 msgid "" " Source files groveled to make this file include:\n" "\n" msgstr "" -#: info/makedoc.c:465 +#: info/makedoc.c:553 #, c-format msgid "Couldn't manipulate the file %s.\n" msgstr "" @@ -686,544 +954,509 @@ msgstr "" msgid "Select visited node: " msgstr "" -#: info/nodemenu.c:331 info/session.c:2146 +#: info/nodemenu.c:331 info/session.c:2235 #, c-format msgid "The reference disappeared! (%s)." msgstr "" -#: info/session.c:169 +#: info/session.c:170 #, c-format msgid "" "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] " "for menu item." msgstr "" -#. Move WINDOW's point down to the next line if possible. -#: info/session.c:642 +#: info/session.c:643 msgid "Move down to the next line" msgstr "" -#. Move WINDOW's point up to the previous line if possible. -#: info/session.c:657 +#: info/session.c:658 msgid "Move up to the previous line" msgstr "" -#. Move WINDOW's point to the end of the true line. -#: info/session.c:672 +#: info/session.c:673 msgid "Move to the end of the line" msgstr "" -#. Move WINDOW's point to the beginning of the true line. -#: info/session.c:692 +#: info/session.c:693 msgid "Move to the start of the line" msgstr "" -#: info/session.c:884 makeinfo/node.c:1092 +#: info/session.c:885 makeinfo/node.c:1357 msgid "Next" msgstr "" -#: info/session.c:887 +#: info/session.c:888 msgid "Following Next node..." msgstr "" -#: info/session.c:904 +#: info/session.c:905 msgid "Selecting first menu item..." msgstr "" -#: info/session.c:915 +#: info/session.c:916 msgid "Selecting Next node..." msgstr "" -#: info/session.c:985 +#: info/session.c:986 #, c-format msgid "Moving Up %d time(s), then Next." msgstr "" -#: info/session.c:1009 +#: info/session.c:1010 msgid "No more nodes within this document." msgstr "" -#: info/session.c:1033 +#: info/session.c:1034 msgid "No `Prev' for this node." msgstr "" -#. Move to the previous node. If this node now contains a menu, -#. and we have not inhibited movement to it, move to the node -#. corresponding to the last menu item. -#: info/session.c:1036 info/session.c:1091 +#: info/session.c:1037 info/session.c:1092 msgid "Moving Prev in this window." msgstr "" -#: info/session.c:1050 +#: info/session.c:1051 msgid "No `Prev' or `Up' for this node within this document." msgstr "" -#: info/session.c:1053 +#: info/session.c:1054 msgid "Moving Up in this window." msgstr "" -#: info/session.c:1101 +#: info/session.c:1102 msgid "Moving to `Prev's last menu item." msgstr "" -#: info/session.c:1112 +#: info/session.c:1113 msgid "Move forwards or down through node structure" msgstr "" -#: info/session.c:1128 +#: info/session.c:1129 msgid "Move backwards or up through node structure" msgstr "" -#. Show the next screen of WINDOW's node. -#: info/session.c:1143 +#: info/session.c:1229 msgid "Scroll forward in this window" msgstr "" -#: info/session.c:1192 +#: info/session.c:1237 msgid "Scroll forward in this window and set default window size" msgstr "" -#. Show the previous screen of WINDOW's node. -#: info/session.c:1200 +#: info/session.c:1245 +msgid "Scroll forward in this window staying within node" +msgstr "" + +#: info/session.c:1253 +msgid "" +"Scroll forward in this window staying within node and set default window size" +msgstr "" + +#: info/session.c:1261 msgid "Scroll backward in this window" msgstr "" -#: info/session.c:1244 +#: info/session.c:1269 msgid "Scroll backward in this window and set default window size" msgstr "" -#. Move to the beginning of the node. -#: info/session.c:1252 +#: info/session.c:1278 +msgid "Scroll backward in this window staying within node" +msgstr "" + +#: info/session.c:1286 +msgid "" +"Scroll backward in this window staying within node and set default window " +"size" +msgstr "" + +#: info/session.c:1294 msgid "Move to the start of this node" msgstr "" -#. Move to the end of the node. -#: info/session.c:1259 +#: info/session.c:1301 msgid "Move to the end of this node" msgstr "" -#. Scroll the window forward by N lines. -#: info/session.c:1266 +#: info/session.c:1308 msgid "Scroll down by lines" msgstr "" -#. Scroll the window backward by N lines. -#: info/session.c:1283 +#: info/session.c:1325 msgid "Scroll up by lines" msgstr "" -#: info/session.c:1301 +#: info/session.c:1343 msgid "Scroll down by half screen size" msgstr "" -#: info/session.c:1327 +#: info/session.c:1369 msgid "Scroll up by half screen size" msgstr "" -#. **************************************************************** -#. -#. Commands for Manipulating Windows -#. -#. **************************************************************** -#. Make the next window in the chain be the active window. -#: info/session.c:1356 +#: info/session.c:1398 msgid "Select the next window" msgstr "" -#. Make the previous window in the chain be the active window. -#: info/session.c:1395 +#: info/session.c:1437 msgid "Select the previous window" msgstr "" -#. Split WINDOW into two windows, both showing the same node. If we -#. are automatically tiling windows, re-tile after the split. -#: info/session.c:1446 +#: info/session.c:1488 msgid "Split the current window" msgstr "" -#. Delete WINDOW, forgetting the list of last visited nodes. If we are -#. automatically displaying footnotes, show or remove the footnotes -#. window. If we are automatically tiling windows, re-tile after the -#. deletion. -#: info/session.c:1527 +#: info/session.c:1569 msgid "Delete the current window" msgstr "" -#: info/session.c:1535 +#: info/session.c:1577 msgid "Cannot delete a permanent window" msgstr "" -#. Just keep WINDOW, deleting all others. -#: info/session.c:1568 +#: info/session.c:1610 msgid "Delete all other windows" msgstr "" -#. Scroll the "other" window of WINDOW. -#: info/session.c:1614 +#: info/session.c:1656 msgid "Scroll the other window" msgstr "" -#: info/session.c:1635 +#: info/session.c:1677 msgid "Scroll the other window backward" msgstr "" -#. Change the size of WINDOW by AMOUNT. -#: info/session.c:1641 +#: info/session.c:1683 msgid "Grow (or shrink) this window" msgstr "" -#: info/session.c:1652 +#: info/session.c:1694 msgid "Divide the available screen space among the visible windows" msgstr "" -#: info/session.c:1659 +#: info/session.c:1701 msgid "Toggle the state of line wrapping in the current window" msgstr "" -#. Make WINDOW display the "Next:" node of the node currently being -#. displayed. -#: info/session.c:1838 +#: info/session.c:1880 msgid "Select the Next node" msgstr "" -#. Make WINDOW display the "Prev:" node of the node currently being -#. displayed. -#: info/session.c:1846 +#: info/session.c:1888 msgid "Select the Prev node" msgstr "" -#. Make WINDOW display the "Up:" node of the node currently being -#. displayed. -#: info/session.c:1854 +#: info/session.c:1896 msgid "Select the Up node" msgstr "" -#. Make WINDOW display the last node of this info file. -#: info/session.c:1861 +#: info/session.c:1903 msgid "Select the last node in this file" msgstr "" -#: info/session.c:1888 info/session.c:1921 +#: info/session.c:1930 info/session.c:1963 msgid "This window has no additional nodes" msgstr "" -#. Make WINDOW display the first node of this info file. -#: info/session.c:1894 +#: info/session.c:1936 msgid "Select the first node in this file" msgstr "" -#: info/session.c:1928 +#: info/session.c:1970 msgid "Select the last item in this node's menu" msgstr "" -#. Use KEY (a digit) to select the Nth menu item in WINDOW->node. -#: info/session.c:1934 +#: info/session.c:1976 msgid "Select this menu item" msgstr "" -#: info/session.c:1963 +#: info/session.c:2005 #, c-format msgid "There aren't %d items in this menu." msgstr "" -#: info/session.c:2094 +#: info/session.c:2148 #, c-format msgid "Menu item (%s): " msgstr "" -#: info/session.c:2096 +#: info/session.c:2150 msgid "Menu item: " msgstr "" -#: info/session.c:2101 +#: info/session.c:2155 #, c-format msgid "Follow xref (%s): " msgstr "" -#: info/session.c:2103 +#: info/session.c:2157 msgid "Follow xref: " msgstr "" -#. Read a line (with completion) which is the name of a menu item, -#. and select that item. -#: info/session.c:2191 +#: info/session.c:2280 msgid "Read a menu item and select its node" msgstr "" -#: info/session.c:2199 +#: info/session.c:2288 msgid "Read a footnote or cross reference and select its node" msgstr "" -#. Position the cursor at the start of this node's menu. -#: info/session.c:2205 +#: info/session.c:2294 msgid "Move to the start of this node's menu" msgstr "" -#: info/session.c:2229 +#: info/session.c:2318 msgid "Visit as many menu items at once as possible" msgstr "" -#. Read a line of input which is a node name, and go to that node. -#: info/session.c:2257 +#: info/session.c:2346 msgid "Read a node name and select it" msgstr "" -#: info/session.c:2312 info/session.c:2316 +#: info/session.c:2401 info/session.c:2405 msgid "Goto node: " msgstr "" -#: info/session.c:2382 +#: info/session.c:2471 #, c-format msgid "No menu in node `%s'." msgstr "" -#: info/session.c:2422 +#: info/session.c:2516 #, c-format msgid "No menu item `%s' in node `%s'." msgstr "" -#: info/session.c:2452 +#: info/session.c:2546 #, c-format msgid "Unable to find node referenced by `%s' in `%s'." msgstr "" -#: info/session.c:2503 +#: info/session.c:2597 msgid "Read a list of menus starting from dir and follow them" msgstr "" -#: info/session.c:2505 +#: info/session.c:2599 msgid "Follow menus: " msgstr "" -#: info/session.c:2703 +#: info/session.c:2797 msgid "Find the node describing program invocation" msgstr "" -#: info/session.c:2705 +#: info/session.c:2799 #, c-format msgid "Find Invocation node of [%s]: " msgstr "" -#: info/session.c:2743 +#: info/session.c:2837 msgid "Read a manpage reference and select it" msgstr "" -#: info/session.c:2747 +#: info/session.c:2841 msgid "Get Manpage: " msgstr "" -#. Move to the "Top" node in this file. -#: info/session.c:2777 +#: info/session.c:2871 msgid "Select the node `Top' in this file" msgstr "" -#. Move to the node "(dir)Top". -#: info/session.c:2783 +#: info/session.c:2877 msgid "Select the node `(dir)'" msgstr "" -#: info/session.c:2803 +#: info/session.c:2897 #, c-format msgid "Kill node (%s): " msgstr "" -#: info/session.c:2857 +#: info/session.c:2951 #, c-format msgid "Cannot kill node `%s'" msgstr "" -#: info/session.c:2867 +#: info/session.c:2961 msgid "Cannot kill the last node" msgstr "" -#: info/session.c:2953 +#: info/session.c:3047 msgid "Select the most recently selected node" msgstr "" -#. Kill named node. -#: info/session.c:2959 +#: info/session.c:3053 msgid "Kill this node" msgstr "" -#. Read the name of a file and select the entire file. -#: info/session.c:2967 +#: info/session.c:3061 msgid "Read the name of a file and select it" msgstr "" -#: info/session.c:2971 +#: info/session.c:3065 msgid "Find file: " msgstr "" -#: info/session.c:2988 +#: info/session.c:3082 #, c-format msgid "Cannot find `%s'." msgstr "" -#: info/session.c:3033 info/session.c:3154 +#: info/session.c:3127 info/session.c:3248 #, c-format msgid "Could not create output file `%s'." msgstr "" -#: info/session.c:3046 info/session.c:3171 info/session.c:3232 +#: info/session.c:3140 info/session.c:3265 info/session.c:3326 msgid "Done." msgstr "" -#. Maybe we should print some information about the node being output. -#: info/session.c:3102 +#: info/session.c:3196 #, c-format msgid "Writing node %s..." msgstr "" -#: info/session.c:3180 +#: info/session.c:3274 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" msgstr "" -#: info/session.c:3216 +#: info/session.c:3310 #, c-format msgid "Cannot open pipe to `%s'." msgstr "" -#. Maybe we should print some information about the node being output. -#: info/session.c:3222 +#: info/session.c:3316 #, c-format msgid "Printing node %s..." msgstr "" -#: info/session.c:3464 +#: info/session.c:3558 #, c-format msgid "Searching subfile %s ..." msgstr "" -#: info/session.c:3516 +#: info/session.c:3610 msgid "Read a string and search for it case-sensitively" msgstr "" -#: info/session.c:3523 +#: info/session.c:3617 msgid "Read a string and search for it" msgstr "" -#: info/session.c:3531 +#: info/session.c:3625 msgid "Read a string and search backward for it" msgstr "" -#: info/session.c:3573 +#: info/session.c:3667 #, c-format msgid "%s%sfor string [%s]: " msgstr "" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search backward" msgstr "" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search" msgstr "" -#: info/session.c:3575 +#: info/session.c:3669 msgid " case-sensitively " msgstr "" -#: info/session.c:3575 +#: info/session.c:3669 msgid " " msgstr "" -#: info/session.c:3615 +#: info/session.c:3709 msgid "Search failed." msgstr "" -#: info/session.c:3633 +#: info/session.c:3727 msgid "Repeat last search in the same direction" msgstr "" -#: info/session.c:3636 info/session.c:3646 +#: info/session.c:3730 info/session.c:3740 msgid "No previous search string" msgstr "" -#: info/session.c:3643 +#: info/session.c:3737 msgid "Repeat last search in the reverse direction" msgstr "" -#: info/session.c:3661 info/session.c:3667 +#: info/session.c:3755 info/session.c:3761 msgid "Search interactively for a string as you type it" msgstr "" -#: info/session.c:3761 +#: info/session.c:3855 msgid "I-search backward: " msgstr "" -#: info/session.c:3763 +#: info/session.c:3857 msgid "I-search: " msgstr "" -#: info/session.c:3788 +#: info/session.c:3882 msgid "Failing " msgstr "" -#: info/session.c:4244 +#: info/session.c:4340 msgid "Move to the previous cross reference" msgstr "" -#: info/session.c:4253 +#: info/session.c:4349 msgid "Move to the next cross reference" msgstr "" -#: info/session.c:4263 +#: info/session.c:4359 msgid "Select reference or menu item appearing on this line" msgstr "" -#. **************************************************************** -#. -#. Miscellaneous Info Commands -#. -#. **************************************************************** -#. What to do when C-g is pressed in a window. -#: info/session.c:4285 +#: info/session.c:4381 msgid "Cancel current operation" msgstr "" -#: info/session.c:4292 +#: info/session.c:4388 msgid "Quit" msgstr "" -#: info/session.c:4301 +#: info/session.c:4397 msgid "Move the cursor to a specific line of the window" msgstr "" -#. Clear the screen and redraw its contents. Given a numeric argument, -#. move the line the cursor is on to the COUNT'th line of the window. -#: info/session.c:4333 +#: info/session.c:4429 msgid "Redraw the display" msgstr "" -#. This command does nothing. It is the fact that a key is bound to it -#. that has meaning. See the code at the top of info_session (). -#: info/session.c:4370 +#: info/session.c:4466 msgid "Quit using Info" msgstr "" -#: info/session.c:4393 +#: info/session.c:4479 +msgid "Run command bound to this key's lowercase variant" +msgstr "" + +#: info/session.c:4491 #, c-format msgid "Unknown command (%s)." msgstr "" -#: info/session.c:4396 +#: info/session.c:4494 msgid "\"\" is invalid" msgstr "" -#: info/session.c:4397 +#: info/session.c:4495 #, c-format msgid "\"%s\" is invalid" msgstr "" -#: info/session.c:4620 +#: info/session.c:4713 msgid "Add this digit to the current numeric argument" msgstr "" -#: info/session.c:4629 +#: info/session.c:4722 msgid "Start (or multiply by 4) the current numeric argument" msgstr "" -#: info/session.c:4644 +#: info/session.c:4737 msgid "Internally used by \\[universal-argument]" msgstr "" @@ -1231,429 +1464,468 @@ msgstr "" msgid "readline: Out of virtual memory!\n" msgstr "" -#: info/variables.c:40 +#: info/variables.c:37 msgid "When \"On\", footnotes appear and disappear automatically" msgstr "" -#: info/variables.c:44 +#: info/variables.c:41 msgid "When \"On\", creating or deleting a window resizes other windows" msgstr "" -#: info/variables.c:48 +#: info/variables.c:45 msgid "When \"On\", flash the screen instead of ringing the bell" msgstr "" -#: info/variables.c:52 +#: info/variables.c:49 msgid "When \"On\", errors cause the bell to ring" msgstr "" -#: info/variables.c:56 +#: info/variables.c:53 msgid "When \"On\", Info garbage collects files which had to be uncompressed" msgstr "" -#: info/variables.c:59 +#: info/variables.c:56 msgid "When \"On\", the portion of the matched search string is highlighted" msgstr "" -#: info/variables.c:63 +#: info/variables.c:60 msgid "Controls what happens when scrolling is requested at the end of a node" msgstr "" -#: info/variables.c:67 +#: info/variables.c:64 msgid "The number lines to scroll when the cursor moves out of the window" msgstr "" -#: info/variables.c:71 +#: info/variables.c:68 msgid "When \"On\", Info accepts and displays ISO Latin characters" msgstr "" -#: info/variables.c:77 +#: info/variables.c:74 msgid "Explain the use of a variable" msgstr "" -#. Get the variable's name. -#: info/variables.c:83 +#: info/variables.c:80 msgid "Describe variable: " msgstr "" -#: info/variables.c:102 +#: info/variables.c:99 msgid "Set the value of an Info variable" msgstr "" -#. Get the variable's name and value. -#: info/variables.c:108 +#: info/variables.c:105 msgid "Set variable: " msgstr "" -#: info/variables.c:126 +#: info/variables.c:123 #, c-format msgid "Set %s to value (%d): " msgstr "" -#: info/variables.c:167 +#: info/variables.c:164 #, c-format msgid "Set %s to value (%s): " msgstr "" -#: info/window.c:1101 +#: info/window.c:1164 msgid "--*** Tags out of Date ***" msgstr "" -#. strlen (location_indicator). -#. 10 for the decimal representation of the number of lines in this -#. node, and the remainder of the text that can appear in the line. -#: info/window.c:1112 +#: info/window.c:1175 msgid "-----Info: (), lines ----, " msgstr "" -#: info/window.c:1119 +#: info/window.c:1182 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "" -#: info/window.c:1123 +#: info/window.c:1186 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "" -#: info/window.c:1130 +#: info/window.c:1193 #, c-format msgid " Subfile: %s" msgstr "" -#: lib/getopt.c:680 +#: lib/getopt.c:675 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:704 +#: lib/getopt.c:700 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:709 +#: lib/getopt.c:705 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:726 lib/getopt.c:899 +#: lib/getopt.c:723 lib/getopt.c:896 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "" -#. --option -#: lib/getopt.c:755 +#: lib/getopt.c:752 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "" -#. +option or -option -#: lib/getopt.c:759 +#: lib/getopt.c:756 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:785 +#: lib/getopt.c:782 #, c-format msgid "%s: illegal option -- %c\n" msgstr "" -#: lib/getopt.c:788 +#: lib/getopt.c:785 #, c-format msgid "%s: invalid option -- %c\n" msgstr "" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:818 lib/getopt.c:948 +#: lib/getopt.c:815 lib/getopt.c:945 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "" -#: lib/getopt.c:865 +#: lib/getopt.c:862 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "" -#: lib/getopt.c:883 +#: lib/getopt.c:880 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "January" msgstr "Jänner" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "February" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "March" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "April" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "May" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "June" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "July" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "August" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "September" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "October" msgstr "" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "November" msgstr "" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "December" msgstr "" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:658 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:701 msgid "@sc argument all uppercase, thus no effect" msgstr "" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:759 +#, c-format +msgid "`{' expected, but saw `%c'" +msgstr "" + +#: makeinfo/cmds.c:789 +msgid "end of file inside verb block" +msgstr "" + +#: makeinfo/cmds.c:797 +#, c-format +msgid "`}' expected, but saw `%c'" +msgstr "" + +#: makeinfo/cmds.c:942 #, c-format msgid "%c%s is obsolete" msgstr "" -#: makeinfo/cmds.c:814 +#: makeinfo/cmds.c:1014 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140 msgid "asis" msgstr "" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142 msgid "none" msgstr "" -#: makeinfo/defun.c:83 +#: makeinfo/defun.c:85 msgid "Missing `}' in @def arg" msgstr "" -#: makeinfo/defun.c:358 +#: makeinfo/defun.c:363 msgid "Function" msgstr "" -#: makeinfo/defun.c:361 +#: makeinfo/defun.c:366 msgid "Macro" msgstr "" -#: makeinfo/defun.c:364 +#: makeinfo/defun.c:369 msgid "Special Form" msgstr "" -#: makeinfo/defun.c:368 +#: makeinfo/defun.c:373 msgid "Variable" msgstr "" -#: makeinfo/defun.c:371 +#: makeinfo/defun.c:376 msgid "User Option" msgstr "" -#: makeinfo/defun.c:375 +#: makeinfo/defun.c:380 msgid "Instance Variable" msgstr "" -#: makeinfo/defun.c:379 +#: makeinfo/defun.c:384 msgid "Method" msgstr "" -#: makeinfo/defun.c:450 makeinfo/defun.c:454 makeinfo/defun.c:556 -#: makeinfo/defun.c:570 makeinfo/defun.c:610 +#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615 +#: makeinfo/defun.c:631 makeinfo/defun.c:671 msgid "of" msgstr "" -#: makeinfo/defun.c:458 makeinfo/defun.c:462 makeinfo/defun.c:466 -#: makeinfo/defun.c:564 makeinfo/defun.c:615 +#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482 +#: makeinfo/defun.c:624 makeinfo/defun.c:676 msgid "on" msgstr "" -#: makeinfo/defun.c:656 +#: makeinfo/defun.c:717 #, c-format msgid "Must be in `%s' insertion to use `%sx'" msgstr "" -#: makeinfo/files.c:460 +#: makeinfo/files.c:448 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" msgstr "" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" msgstr "" -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" msgstr "" -#: makeinfo/footnote.c:278 +#: makeinfo/footnote.c:210 +msgid "Footnotes inside footnotes are not allowed" +msgstr "" + +#: makeinfo/footnote.c:298 msgid "Footnotes" msgstr "" -#. The <title> should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:42 msgid "Untitled" msgstr "" -#: makeinfo/index.c:212 +#: makeinfo/html.c:298 +#, c-format +msgid "Invalid node name: `%s'" +msgstr "" + +#: makeinfo/index.c:213 #, c-format msgid "Unknown index `%s'" msgstr "" -#: makeinfo/index.c:382 +#: makeinfo/index.c:238 +#, c-format +msgid "Info cannot handle `:' in index entry `%s'" +msgstr "" + +#: makeinfo/index.c:396 #, c-format msgid "Index `%s' already exists" msgstr "" -#: makeinfo/index.c:425 +#: makeinfo/index.c:439 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "" -#: makeinfo/index.c:642 +#: makeinfo/index.c:666 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "" -#: makeinfo/index.c:680 +#: makeinfo/index.c:709 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:712 makeinfo/index.c:751 msgid "(outside of any node)" msgstr "" -#: makeinfo/insertion.c:192 +#: makeinfo/insertion.c:198 msgid "Broken-Type in insertion_type_pname" msgstr "" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:271 msgid "Enumeration stack overflow" msgstr "" -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:303 #, c-format msgid "lettering overflow, restarting at %c" msgstr "" -#: makeinfo/insertion.c:481 +#: makeinfo/insertion.c:538 #, c-format msgid "%s requires an argument: the formatter for %citem" msgstr "" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:693 #, c-format msgid "`@end' expected `%s', but saw `%s'" msgstr "" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:931 #, c-format msgid "No matching `%cend %s'" msgstr "" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:1084 #, c-format msgid "%s requires letter or digit" msgstr "" -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1158 +msgid "end of file inside verbatim block" +msgstr "" + +#: makeinfo/insertion.c:1318 msgid "@menu seen before first @node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1319 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" -#. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1331 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1074 +#: makeinfo/insertion.c:1346 #, c-format msgid "Unmatched `%c%s'" msgstr "" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1353 #, c-format msgid "`%c%s' needs something after it" msgstr "" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1359 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" msgstr "" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1453 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1462 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "" -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1646 #, c-format msgid "%c%s found outside of an insertion block" msgstr "" -#: makeinfo/lang.c:199 +#: makeinfo/lang.c:331 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "" -#. This error message isn't perfect if the argument is multiple -#. characters, but it doesn't seem worth getting right. -#: makeinfo/lang.c:406 +#: makeinfo/lang.c:384 +#, c-format +msgid "unrecogized encoding name `%s'" +msgstr "" + +#: makeinfo/lang.c:387 +#, c-format +msgid "sorry, encoding `%s' not supported" +msgstr "" + +#: makeinfo/lang.c:414 +#, c-format +msgid "invalid encoded character `%s'" +msgstr "" + +#: makeinfo/lang.c:502 +#, c-format +msgid "%s is an invalid ISO code, using %c" +msgstr "" + +#: makeinfo/lang.c:687 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "" -#: makeinfo/lang.c:410 +#: makeinfo/lang.c:691 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "" @@ -1678,427 +1950,522 @@ msgstr "" msgid "Macro `%s' called on line %d with too many args" msgstr "" -#: makeinfo/macro.c:595 +#: makeinfo/macro.c:594 #, c-format msgid "%cend macro not found" msgstr "" -#: makeinfo/macro.c:634 +#: makeinfo/macro.c:632 msgid "@quote-arg only useful for single-argument macros" msgstr "" -#: makeinfo/macro.c:670 +#: makeinfo/macro.c:668 #, c-format msgid "mismatched @end %s with @%s" msgstr "" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:316 #, c-format msgid "%s:%d: warning: " msgstr "" -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:339 msgid "Too many errors! Gave up.\n" msgstr "" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026 #, c-format msgid "Misplaced %c" msgstr "" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:370 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: makeinfo/makeinfo.c:365 +#: makeinfo/makeinfo.c:373 #, c-format +msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" +msgstr "" + +#: makeinfo/makeinfo.c:376 msgid "" -"Usage: %s [OPTION]... TEXINFO-FILE...\n" -"\n" -"Translate Texinfo source documentation to various other formats:\n" -"Info files suitable for reading online with Emacs or standalone GNU Info\n" -"(by default); plain text (with --no-headers); or HTML (with --html).\n" -"\n" -"Options:\n" -" --commands-in-node-names allow @ commands in node names.\n" -" -D VAR define a variable, as with @set.\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" --error-limit=NUM quit after NUM errors (default %d).\n" -" --fill-column=NUM break Info lines at NUM characters (default %d).\n" -" --footnote-style=STYLE output footnotes according to STYLE:\n" -" `separate' to place footnotes in their own " -"node,\n" -" `end' to place the footnotes at the end of the\n" -" node in which they are defined (the default).\n" -" --force preserve output even if errors.\n" -" --help display this help and exit.\n" -" --html output HTML rather than Info format;\n" -" -I DIR append DIR to the @include search path.\n" -" --ifhtml process @ifhtml and @html text even when not\n" -" generating HTML.\n" -" --ifinfo process @ifinfo text even when generating HTML.\n" -" --iftex process @iftex and @tex text.\n" -" implies --no-split.\n" -msgstr "" - -#: makeinfo/makeinfo.c:391 +"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:380 #, c-format msgid "" -" --no-headers suppress Info node separators and Node: lines " -"and\n" -" write to standard output without --output.\n" -" --no-ifhtml do not process @ifhtml and @html text.\n" -" --no-ifinfo do not process @ifinfo text.\n" -" --no-iftex do not process @iftex and @tex text.\n" -" --no-split suppress splitting of large Info output files or\n" -" generation of one HTML file per node.\n" -" --no-validate suppress node cross-reference validation.\n" -" --no-warn suppress warnings (but not errors).\n" -" --number-sections include chapter, section, etc. numbers in " -"output.\n" -" -o, --output=FILE output to FILE, ignoring any @setfilename.\n" -" -P DIR prepend DIR to the @include search path.\n" -" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " -"%d).\n" -" if VAL is `none', do not indent;\n" -" if VAL is `asis', preserve existing " -"indentation.\n" -" --reference-limit=NUM warn about at most NUM references (default %d).\n" -" -U VAR undefine a variable, as with @clear.\n" -" -v, --verbose explain what is being done.\n" -" --version display version information and exit.\n" +"General options:\n" +" --error-limit=NUM quit after NUM errors (default %d).\n" +" --force preserve output even if errors.\n" +" --help display this help and exit.\n" +" --no-validate suppress node cross-reference validation.\n" +" --no-warn suppress warnings (but not errors).\n" +" --reference-limit=NUM warn about at most NUM references (default %" +"d).\n" +" -v, --verbose explain what is being done.\n" +" --version display version information and exit.\n" +msgstr "" + +#: makeinfo/makeinfo.c:394 +#, no-wrap +msgid "" +"Output format selection (default is to produce Info):\n" +" --docbook output DocBook rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output XML (TexinfoML) rather than Info.\n" +msgstr "" + +#: makeinfo/makeinfo.c:401 +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" msgstr "" #: makeinfo/makeinfo.c:415 +#, 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" +" --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" +" If VAL is `none', do not indent; if VAL is\n" +" `asis', preserve existing indentation.\n" +" --split-size=NUM split Info files at size NUM (default %d).\n" +msgstr "" + +#: makeinfo/makeinfo.c:433 +msgid "" +"Input file options:\n" +" --commands-in-node-names allow @ commands in node names.\n" +" -D VAR define the variable VAR, as with @set.\n" +" -I DIR append DIR to the @include search path.\n" +" -P DIR prepend DIR to the @include search path.\n" +" -U VAR undefine the variable VAR, as with @clear.\n" +msgstr "" + +#: makeinfo/makeinfo.c:442 +msgid "" +"Conditional processing in input:\n" +" --ifhtml process @ifhtml and @html even if not generating HTML.\n" +" --ifinfo process @ifinfo even if not generating Info.\n" +" --ifplaintext process @ifplaintext even if not generating plain text.\n" +" --iftex process @iftex and @tex; implies --no-split.\n" +" --no-ifhtml do not process @ifhtml and @html text.\n" +" --no-ifinfo do not process @ifinfo text.\n" +" --no-ifplaintext do not process @ifplaintext text.\n" +" --no-iftex do not process @iftex and @tex text.\n" +msgstr "" + +#: 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" +" if generating Info, --ifinfo is on and the others are off;\n" +" if generating plain text, --ifplaintext is on and the others are off;\n" +msgstr "" + +#: makeinfo/makeinfo.c:461 msgid "" -"\n" -"The defaults for the @if... conditionals depend on the output format:\n" -"if generating HTML, --ifhtml is on and the others are off;\n" -"if generating Info or plain text, --ifinfo is on and the others are off.\n" -"\n" "Examples:\n" -" makeinfo foo.texi write Info to foo's @setfilename\n" -" makeinfo --html foo.texi write HTML to foo's @setfilename\n" -" makeinfo --no-headers -o - foo.texi write plain text to standard output\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 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" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org." +" makeinfo --html --no-headers foo.texi write html without node lines, " +"menus\n" +" makeinfo --number-sections foo.texi write Info with numbered sections\n" +" makeinfo --no-split foo.texi write one Info file however big\n" msgstr "" -#: makeinfo/makeinfo.c:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655 +#: makeinfo/makeinfo.c:676 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:521 +#: makeinfo/makeinfo.c:583 #, c-format msgid "Couldn't open macro expansion output `%s'" msgstr "" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:586 msgid "Cannot specify more than one macro expansion output" msgstr "" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:624 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:602 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:647 +#: makeinfo/makeinfo.c:723 #, c-format msgid "%s: missing file argument.\n" msgstr "" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:898 #, c-format msgid "Expected `%s'" msgstr "" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1365 +msgid "File exists, but is not a directory" +msgstr "" + +#: makeinfo/makeinfo.c:1366 +#, c-format +msgid "Can't create directory `%s': %s" +msgstr "" + +#: makeinfo/makeinfo.c:1414 #, c-format msgid "No `%s' found in `%s'" msgstr "" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1496 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -#: makeinfo/makeinfo.c:1327 +#: makeinfo/makeinfo.c:1526 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:1358 +#: makeinfo/makeinfo.c:1561 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" -#: makeinfo/makeinfo.c:1377 +#: makeinfo/makeinfo.c:1583 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1627 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1635 +#: makeinfo/makeinfo.c:1853 #, c-format msgid "Unknown command `%s'" msgstr "" -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1875 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" -#: makeinfo/makeinfo.c:1838 +#: makeinfo/makeinfo.c:2068 #, c-format msgid "%c%s expected `{...}'" msgstr "" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:2098 msgid "Unmatched }" msgstr "" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:2148 msgid "NO_NAME!" msgstr "" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:2169 #, c-format msgid "%c%s missing close brace" msgstr "" -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 +#: makeinfo/makeinfo.c:2958 +msgid "First argument to cross-reference may not be empty" +msgstr "" + +#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340 msgid "see " msgstr "" -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:3018 msgid "See " msgstr "" -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:3164 #, c-format msgid "`.' or `,' must follow cross reference, not %c" msgstr "" -#: makeinfo/makeinfo.c:3026 +#: makeinfo/makeinfo.c:3212 +msgid "First argument to @inforef may not be empty" +msgstr "" + +#: makeinfo/makeinfo.c:3427 #, c-format -msgid "No .png or .jpg for `%s'" +msgid "@image file `%s' (for HTML) not readable: %s" msgstr "" -#: makeinfo/makeinfo.c:3063 +#: makeinfo/makeinfo.c:3440 #, c-format -msgid "@image file `%s' unreadable: %s" +msgid "No `%s.png' or `.jpg', and no extension supplied" msgstr "" -#: makeinfo/makeinfo.c:3070 +#: makeinfo/makeinfo.c:3490 +#, c-format +msgid "@image file `%s' (for text) unreadable: %s" +msgstr "" + +#: makeinfo/makeinfo.c:3497 msgid "@image missing filename argument" msgstr "" -#: makeinfo/makeinfo.c:3259 +#: makeinfo/makeinfo.c:3690 #, c-format msgid "{No value for `%s'}" msgstr "" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3744 #, c-format msgid "%c%s requires a name" msgstr "" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3850 #, c-format msgid "Reached eof before matching @end %s" msgstr "" -#: makeinfo/multi.c:208 +#: makeinfo/makeinfo.c:4081 +#, c-format +msgid "`%.40s...' is too long for expansion; not expanded" +msgstr "" + +#: makeinfo/multi.c:226 msgid "Missing } in @multitable template" msgstr "" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:302 #, c-format msgid "ignoring stray text `%s' after @multitable" msgstr "" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:375 #, c-format msgid "Too many columns in multitable item (max %d)" msgstr "" -#: makeinfo/multi.c:401 +#: makeinfo/multi.c:426 #, c-format msgid "Cannot select column #%d in multitable" msgstr "" -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:529 msgid "ignoring @tab outside of multitable" msgstr "" -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:565 msgid "** Multicolumn output from last row:\n" msgstr "" -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:568 #, c-format msgid "* column #%d: output = %s\n" msgstr "" -#: makeinfo/node.c:250 +#: makeinfo/node.c:276 #, c-format msgid "Node `%s' previously defined at line %d" msgstr "" -#: makeinfo/node.c:514 +#: makeinfo/node.c:594 #, c-format msgid "Formatting node %s...\n" msgstr "" -#: makeinfo/node.c:559 +#: makeinfo/node.c:655 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" msgstr "" -#: makeinfo/node.c:719 +#: makeinfo/node.c:815 #, c-format msgid "No node name specified for `%c%s' command" msgstr "" -#: makeinfo/node.c:774 +#: makeinfo/node.c:856 makeinfo/node.c:1075 +#, c-format +msgid "Anchor `%s' and node `%s' map to the same file name" +msgstr "" + +#: makeinfo/node.c:859 +msgid "This @anchor command ignored; references to it will not work" +msgstr "" + +#: makeinfo/node.c:861 makeinfo/node.c:1078 +msgid "Rename this anchor or use the `--no-split' option" +msgstr "" + +#: makeinfo/node.c:891 +#, c-format +msgid "Unexpected string at end of split-HTML file `%s'" +msgstr "" + +#: makeinfo/node.c:920 msgid "Node:" msgstr "" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 +#: makeinfo/node.c:930 msgid "Next:" msgstr "" -#: makeinfo/node.c:793 +#: makeinfo/node.c:940 msgid "Previous:" msgstr "" -#: makeinfo/node.c:803 +#: makeinfo/node.c:950 msgid "Up:" msgstr "" -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1072 +#, c-format +msgid "Anchors `%s' and `%s' map to the same file name" +msgstr "" + +#: makeinfo/node.c:1077 +msgid "@anchor command ignored; references to it will not work" +msgstr "" + +#: makeinfo/node.c:1277 #, c-format msgid "%s reference to nonexistent node `%s'" msgstr "" -#: makeinfo/node.c:1029 +#: makeinfo/node.c:1294 msgid "Menu" msgstr "" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1296 msgid "Cross" msgstr "" -#: makeinfo/node.c:1115 +#: makeinfo/node.c:1380 #, c-format msgid "Next field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1383 #, c-format msgid "This node (%s) has the bad Prev" msgstr "" -#: makeinfo/node.c:1133 +#: makeinfo/node.c:1395 msgid "Prev" msgstr "" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1438 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1180 +#: makeinfo/node.c:1442 #, c-format msgid "This node (%s) has the bad Next" msgstr "" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1454 #, c-format msgid "`%s' has no Up field" msgstr "" -#: makeinfo/node.c:1197 +#: makeinfo/node.c:1457 msgid "Up" msgstr "" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1523 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" -#: makeinfo/node.c:1296 +#: makeinfo/node.c:1552 #, c-format msgid "node `%s' has been referenced %d times" msgstr "" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1566 #, c-format msgid "unreferenced node `%s'" msgstr "" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " msgstr "" -#. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" msgstr "" -#: makeinfo/sectioning.c:468 +#: makeinfo/sectioning.c:502 #, c-format msgid "%c%s is obsolete; use %c%s instead" msgstr "" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:518 #, c-format msgid "Node with %ctop as a section already exists" msgstr "" -#: makeinfo/sectioning.c:496 +#: makeinfo/sectioning.c:526 #, c-format msgid "Here is the %ctop node" msgstr "" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:543 #, c-format msgid "%ctop used before %cnode, defaulting to %s" msgstr "" -#. in case we are writing stdout -#: makeinfo/toc.c:212 makeinfo/toc.c:261 makeinfo/toc.c:262 +#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299 msgid "Table of Contents" msgstr "" -#. in case we are writing stdout -#: makeinfo/toc.c:292 makeinfo/toc.c:319 makeinfo/toc.c:320 +#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367 msgid "Short Contents" msgstr "" -#: makeinfo/toc.c:354 +#: makeinfo/toc.c:406 #, c-format msgid "%s: TOC should be here, but it was not found" msgstr "" +#: makeinfo/xml.c:1108 +#, c-format +msgid "@image file `%s' unreadable: %s" +msgstr "" + #: util/install-info.c:151 #, c-format msgid "%s: warning: " @@ -2153,12 +2520,9 @@ msgid "" " If you don't specify any sections, they are determined\n" " from information in the Info file itself.\n" " --version display version information and exit.\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" -#: util/install-info.c:442 +#: util/install-info.c:444 #, c-format msgid "" "This is the file .../info/dir, which contains the\n" @@ -2178,137 +2542,124 @@ msgid "" "* Menu:\n" msgstr "" -#: util/install-info.c:465 +#: util/install-info.c:467 #, c-format msgid "%s: could not read (%s) and could not create (%s)\n" msgstr "" -#: util/install-info.c:549 +#: util/install-info.c:551 #, c-format msgid "%s: empty file" msgstr "" -#: util/install-info.c:864 util/install-info.c:904 +#: util/install-info.c:866 util/install-info.c:906 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY" msgstr "" -#: util/install-info.c:899 +#: util/install-info.c:901 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY" msgstr "" -#: util/install-info.c:1147 util/install-info.c:1157 +#: util/install-info.c:1150 util/install-info.c:1160 #, c-format msgid "%s: Specify the Info directory only once.\n" msgstr "" -#: util/install-info.c:1192 +#: util/install-info.c:1195 #, c-format msgid "%s: Specify the Info file only once.\n" msgstr "" -#: util/install-info.c:1241 +#: util/install-info.c:1244 #, c-format msgid "excess command line argument `%s'" msgstr "" -#: util/install-info.c:1245 +#: util/install-info.c:1248 msgid "No input file specified; try --help for more information." msgstr "" -#: util/install-info.c:1247 +#: util/install-info.c:1251 msgid "No dir file specified; try --help for more information." msgstr "" -#. No need to abort here, the original info file may not -#. have the requisite Texinfo commands. This is not -#. something an installer should have to correct (it's a -#. problem for the maintainer), and there's no need to cause -#. subsequent parts of `make install' to fail. -#: util/install-info.c:1269 +#: util/install-info.c:1273 #, c-format msgid "no info dir entry in `%s'" msgstr "" -#: util/install-info.c:1384 +#: util/install-info.c:1388 #, c-format msgid "menu item `%s' already exists, for file `%s'" msgstr "" -#: util/install-info.c:1407 +#: util/install-info.c:1411 #, c-format msgid "no entries found for `%s'; nothing deleted" msgstr "" -#: util/texindex.c:244 +#: util/texindex.c:245 msgid "display this help and exit" msgstr "" -#: util/texindex.c:246 +#: util/texindex.c:247 msgid "keep temporary files around after processing" msgstr "" -#: util/texindex.c:248 +#: util/texindex.c:249 msgid "do not keep temporary files around after processing (default)" msgstr "" -#: util/texindex.c:250 +#: util/texindex.c:251 msgid "send output to FILE" msgstr "" -#: util/texindex.c:252 +#: util/texindex.c:253 msgid "display version information and exit" msgstr "" -#: util/texindex.c:263 +#: util/texindex.c:264 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" -#: util/texindex.c:264 +#: util/texindex.c:265 msgid "Generate a sorted index for each TeX output FILE.\n" msgstr "" -#: util/texindex.c:267 +#: util/texindex.c:268 #, c-format msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n" msgstr "" -#. avoid trigraph in cat-id-tbl.c -#: util/texindex.c:269 +#: util/texindex.c:270 msgid "" "\n" "Options:\n" msgstr "" -#: util/texindex.c:285 -msgid "" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" -msgstr "" - -#: util/texindex.c:885 util/texindex.c:919 util/texindex.c:995 -#: util/texindex.c:1023 +#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997 +#: util/texindex.c:1025 #, c-format msgid "%s: not a texinfo index file" msgstr "" -#: util/texindex.c:980 +#: util/texindex.c:982 #, c-format msgid "failure reopening %s" msgstr "" -#: util/texindex.c:1222 +#: util/texindex.c:1224 #, c-format msgid "No page number in %s" msgstr "" -#: util/texindex.c:1293 +#: util/texindex.c:1295 #, c-format msgid "entry %s follows an entry with a secondary name" msgstr "" -#: util/texindex.c:1631 +#: util/texindex.c:1633 #, c-format msgid "%s; for file `%s'.\n" msgstr "" diff --git a/gnu/usr.bin/texinfo/po/eo.gmo b/gnu/usr.bin/texinfo/po/eo.gmo Binary files differindex f3ab27d4318..98aadb593e2 100644 --- a/gnu/usr.bin/texinfo/po/eo.gmo +++ b/gnu/usr.bin/texinfo/po/eo.gmo diff --git a/gnu/usr.bin/texinfo/po/eo.po b/gnu/usr.bin/texinfo/po/eo.po index ec180d459f2..d09dfaf060a 100644 --- a/gnu/usr.bin/texinfo/po/eo.po +++ b/gnu/usr.bin/texinfo/po/eo.po @@ -1,48 +1,41 @@ -# Esperanto translations for GNU Texinfo-3.12. -# Copyright (C) 1999 Free Software Foundation, Inc. -# Sergio Pokrovskij <pok@iis.nsk.su>, 1999 +# Esperanto translations for GNU Texinfo-4.0. +# Copyright (C) 1999, 2002 Free Software Foundation, Inc. +# Sergio Pokrovskij <pok@iis.nsk.su>, 1999, 2002 # msgid "" msgstr "" -"Project-Id-Version: texinfo 3.12n\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" -"PO-Revision-Date: 1999-07-29 19:47+07:00\n" +"Project-Id-Version: texinfo 4.1a\n" +"POT-Creation-Date: 2002-04-01 06:10-0800\n" +"PO-Revision-Date: 2002-03-13 10:05+06:00\n" "Last-Translator: Sergio Pokrovskij <pok@iis.nsk.su>\n" -"Language-Team: Esperanto <eo@li.org>\n" +"Language-Team: Esperanto <translation-team-eo@lists.sourceforge.net>\n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-3\n" +"Content-Type: text/plain; charset=us-ascii\n" "Content-Transfer-Encoding: 8-bit\n" -#. **************************************************************** -#. -#. Echo Area Movement Commands -#. -#. **************************************************************** -#: info/echo-area.c:283 info/session.c:711 +#: info/echo-area.c:283 info/session.c:712 msgid "Move forward a character" -msgstr "Unu signon antaýen" +msgstr "Unu signon antauxen" -#. Move point backward in the node. -#: info/echo-area.c:295 info/session.c:727 +#: info/echo-area.c:295 info/session.c:728 msgid "Move backward a character" -msgstr "Unu signon malantaýen" +msgstr "Unu signon malantauxen" #: info/echo-area.c:307 msgid "Move to the start of this line" -msgstr "Al la komenco de æi tiu linio" +msgstr "Al la komenco de cxi tiu linio" #: info/echo-area.c:312 msgid "Move to the end of this line" -msgstr "Al la fino de æi tiu linio" +msgstr "Al la fino de cxi tiu linio" -#. Move forward a word in the input line. -#: info/echo-area.c:320 info/session.c:745 +#: info/echo-area.c:320 info/session.c:746 msgid "Move forward a word" -msgstr "Unu vorton antaýen" +msgstr "Unu vorton antauxen" -#: info/echo-area.c:360 info/session.c:794 +#: info/echo-area.c:360 info/session.c:795 msgid "Move backward a word" -msgstr "Unu vorton malantaýen" +msgstr "Unu vorton malantauxen" #: info/echo-area.c:400 msgid "Delete the character under the cursor" @@ -50,104 +43,94 @@ msgstr "Forigu la signon subkursoran" #: info/echo-area.c:430 msgid "Delete the character behind the cursor" -msgstr "Forigu la signon ¼us antaý la kursoro" +msgstr "Forigu la signon jxus antaux la kursoro" #: info/echo-area.c:451 msgid "Cancel or quit operation" -msgstr "Rezigno aý eliro" +msgstr "Rezigno aux eliro" #: info/echo-area.c:466 msgid "Accept (or force completion of) this line" -msgstr "Akceptu (aý kompletigu) æi tiun linion" +msgstr "Akceptu (aux kompletigu) cxi tiun linion" #: info/echo-area.c:471 msgid "Insert next character verbatim" -msgstr "Enþovu la tujan signon senþanøe" +msgstr "Ensxovu la tujan signon sensxangxe" #: info/echo-area.c:479 msgid "Insert this character" -msgstr "Enþovu tiun signon" +msgstr "Ensxovu tiun signon" #: info/echo-area.c:497 msgid "Insert a TAB character" -msgstr "Enþovu TAB-signon" +msgstr "Ensxovu TAB-signon" -#. Transpose the characters at point. If point is at the end of the line, -#. then transpose the characters before point. #: info/echo-area.c:504 msgid "Transpose characters at point" -msgstr "Permutu la signojn æe la kursoro" +msgstr "Permutu la signojn cxe la kursoro" #: info/echo-area.c:555 msgid "Yank back the contents of the last kill" -msgstr "Engluu la enhavon de la lasta forviþo" +msgstr "Engluu la enhavon de la lasta forvisxo" #: info/echo-area.c:562 msgid "Kill ring is empty" -msgstr "Viþringo malplenas" +msgstr "Visxringo malplenas" -#. If the last command was yank, or yank_pop, and the text just before -#. point is identical to the current kill item, then delete that text -#. from the line, rotate the index down, and yank back some other text. #: info/echo-area.c:575 msgid "Yank back a previous kill" -msgstr "Regluu antaýan forviþa¼on" +msgstr "Regluu antauxan forvisxajxon" -#. Delete the text from point to end of line. #: info/echo-area.c:608 msgid "Kill to the end of the line" -msgstr "Forviþu ekde la kursoro øis la fino de la linio" +msgstr "Forvisxu ekde la kursoro gxis la fino de la linio" #: info/echo-area.c:621 msgid "Kill to the beginning of the line" -msgstr "Forviþu ekde la kursoro øis la komenco de la linio" +msgstr "Forvisxu ekde la kursoro gxis la komenco de la linio" -#. Delete from point to the end of the current word. #: info/echo-area.c:633 msgid "Kill the word following the cursor" -msgstr "Forviþu la vorton tuj post la kursoro" +msgstr "Forvisxu la vorton tuj post la kursoro" #: info/echo-area.c:652 msgid "Kill the word preceding the cursor" -msgstr "Forviþu la vorton ¼us antaý la kursoro" +msgstr "Forvisxu la vorton jxus antaux la kursoro" -#: info/echo-area.c:871 +#: info/echo-area.c:872 info/echo-area.c:932 +msgid "No completions" +msgstr "Kompletigo malestas" + +#: info/echo-area.c:874 msgid "Not complete" msgstr "Nekompleta" -#: info/echo-area.c:916 +#: info/echo-area.c:919 msgid "List possible completions" msgstr "Eligu la eblajn kompletigojn" -#: info/echo-area.c:929 -msgid "No completions" -msgstr "Kompletigo malestas" - -#: info/echo-area.c:933 +#: info/echo-area.c:936 msgid "Sole completion" msgstr "Sola kompletigo" -#: info/echo-area.c:942 +#: info/echo-area.c:945 msgid "One completion:\n" msgstr "Unu kompletigo:\n" -#: info/echo-area.c:943 +#: info/echo-area.c:946 #, c-format msgid "%d completions:\n" msgstr "%d kompletigoj:\n" -#: info/echo-area.c:1089 +#: info/echo-area.c:1092 msgid "Insert completion" -msgstr "Enþovu la kompletigon" +msgstr "Ensxovu la kompletigon" -#: info/echo-area.c:1222 +#: info/echo-area.c:1225 msgid "Building completions..." -msgstr "Kompletigoj estas seræataj ..." +msgstr "Kompletigoj estas sercxataj ..." -#. Scroll the "other" window. If there is a window showing completions, scroll -#. that one, otherwise scroll the window which was active on entering the read -#. function. -#: info/echo-area.c:1320 +#: info/echo-area.c:1342 msgid "Scroll the completions window" msgstr "Rulumu la fenestron de kompletigoj" @@ -157,15 +140,19 @@ msgstr "La piednotoj ne eligeblas" #: info/footnotes.c:238 msgid "Show the footnotes associated with this node in another window" -msgstr "Montru la piednotojn el æi tiu nodo en alia fenestro" +msgstr "Montru la piednotojn el cxi tiu nodo en alia fenestro" + +#: info/footnotes.h:26 +msgid "---------- Footnotes ----------" +msgstr "---------- Piednotoj ----------" #: info/indices.c:175 msgid "Look up a string in the index for this file" -msgstr "Seræu æenon en la indekso por æi tiu dosiero" +msgstr "Sercxu cxenon en la indekso por cxi tiu dosiero" #: info/indices.c:205 msgid "Finding index entries..." -msgstr "Estas seræataj indeksaj artikoloj ..." +msgstr "Estas sercxataj indeksaj artikoloj ..." #: info/indices.c:212 msgid "No indices found." @@ -183,7 +170,7 @@ msgstr "" #: info/indices.c:342 msgid "No previous index search string." -msgstr "Malestas antaýa æeno por seræo en indekso." +msgstr "Malestas antauxa cxeno por sercxo en indekso." #: info/indices.c:349 msgid "No index entries." @@ -200,26 +187,30 @@ msgstr "pli da " #: info/indices.c:393 msgid "CAN'T SEE THIS" -msgstr "MALEBLAS VIDI ÆI TION" +msgstr "MALEBLAS VIDI CxI TION" #: info/indices.c:429 #, c-format msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)" -msgstr "Trovita \"%s\" en %s. (\"\\[next-index-match]\" seræos la sekvan.)" +msgstr "Trovita \"%s\" en %s. (\"\\[next-index-match]\" sercxos la sekvan.)" #: info/indices.c:549 #, c-format msgid "Scanning indices of \"%s\"..." -msgstr "Seræo en la indeksoj de \"%s\"..." +msgstr "Sercxo en la indeksoj de \"%s\"..." + +#: info/indices.c:603 +#, c-format +msgid "No available info files have \"%s\" in their indices." +msgstr "\"%s\" malestas en la indeksoj de la disponeblaj Info-dosieroj" #: info/indices.c:632 msgid "Grovel all known info file's indices for a string and build a menu" -msgstr "" -"Seræu æenon en æiuj konataj indeksoj de la Info-dosiero kaj faru menuon" +msgstr "Sercxu cxenon en cxiuj konataj indeksoj Info-dosieraj kaj faru menuon" #: info/indices.c:636 msgid "Index apropos: " -msgstr "Seræu en indekso informon pri: " +msgstr "Sercxu en indekso informon pri: " #: info/indices.c:666 #, c-format @@ -230,12 +221,12 @@ msgstr "" "\n" "* Menu: Nodoj kies indices entenas \"%s\":\n" -#: info/info.c:248 +#: info/info.c:260 info/infokey.c:884 msgid "Try --help for more information.\n" msgstr "Por ricevi pli da informoj uzu la opcion \"--help\".\n" -#: info/info.c:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 -#: util/texindex.c:336 +#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689 +#: util/install-info.c:1224 util/texindex.c:338 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -244,36 +235,42 @@ msgid "" "For more information about these matters, see the files named COPYING.\n" msgstr "" "Copyright (c) %s Free Software Foundation, Inc.\n" -"NENIU garantio estas donita. Vi povas pludoni ekzemplerojn de tiu\n" -"programo laý la kondiæoj de la Øenerala Publika GNU-Rajtigilo.\n" -"Pluaj informoj troveblas en la dosiero COPYING.\n" +"NENIA garantio estas donita. Vi rajtas pludoni ekzemplerojn de cxi tiu\n" +"programo laux la kondicxoj de la GNUa Gxenerala Publika Permesilo. Pluaj\n" +"informoj troveblas en la dosieroj COPYING.\n" -#: info/info.c:461 +#: info/info.c:462 #, c-format msgid "no index entries found for `%s'\n" -msgstr "por \"%s\" ne troviøis indeksa artikolo\n" +msgstr "por \"%s\" ne trovigxis indeksa artikolo\n" + +#: info/info.c:555 +msgid " -b, --speech-friendly be friendly to speech synthesizers.\n" +msgstr " -b, --speech-friendly estu afabla al la parolsinteziloj.\n" -#: info/info.c:530 -#, fuzzy, c-format +#: info/info.c:562 +#, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" "\n" "Read documentation in Info format.\n" "\n" "Options:\n" -" --apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n" -" --directory=DIR add DIR to INFOPATH.\n" -" --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" --file=FILENAME specify Info file to visit.\n" -" --help display this help and exit.\n" -" --index-search=STRING go to node pointed by index entry STRING.\n" -" --node=NODENAME specify nodes in first visited Info file.\n" -" --output=FILENAME output selected nodes to FILENAME.\n" -" --restore=FILENAME read initial keystrokes from FILENAME.\n" -" --show-options, --usage go to command-line options node.\n" -" --subnodes recursively output menu items.\n" -"%s --vi-keys use vi-like and less-like key bindings.\n" -" --version display version information and exit.\n" +" --apropos=STRING look up STRING in all indices of all " +"manuals.\n" +" -d, --directory=DIR add DIR to INFOPATH.\n" +" --dribble=FILENAME remember user keystrokes in FILENAME.\n" +" -f, --file=FILENAME specify Info file to visit.\n" +" -h, --help display this help and exit.\n" +" --index-search=STRING go to node pointed by index entry STRING.\n" +" -n, --node=NODENAME specify nodes in first visited Info file.\n" +" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -R, --raw-escapes don't remove ANSI escapes from man pages.\n" +" --restore=FILENAME read initial keystrokes from FILENAME.\n" +" -O, --show-options, --usage go to command-line options node.\n" +"%s --subnodes recursively output menu items.\n" +" --vi-keys use vi-like and less-like key bindings.\n" +" --version display version information and exit.\n" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" @@ -287,35 +284,35 @@ msgid "" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" " info -f ./foo.info show file ./foo.info, not searching dir\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" -"Sintakso: %s [OPCIO]... [INFO-DOSIERO [MENUERO...]]\n" +"Sintakso: %s [OPCIO]... [MENUERO...]\n" "\n" "Ebligas legi dokumentaron prezentitan en Info.\n" "\n" "Opcioj:\n" -" --directory=UJO Aldonu la dosierUJOn al INFOPATH.\n" -" --dribble=DOSIERO Notu la klavofrapojn de la uzanto en DOSIERO.\n" -" --file=DOSIERO Vizitu la Info-DOSIEROn.\n" -" --help Eligu æi tiun helpeton kaj finu.\n" -" --index-search=ÆENO Vizitu nodon referencatan per indeksa artikolo " -"ÆENO.\n" -" --node=NODO Komencu per NODO.\n" -" --output=DOSIERO Eligu la elektitajn nodojn en DOSIEROn.\n" -" --restore=DOSIERO Legu la klavofrapojn el DOSIERO.\n" -" --show-options, --usage Montru la nodon pri komandliniaj opcioj.\n" -" --subnodes Rekursie eligu la menuerojn.\n" -"%s --vi-keys usu vi-eskan kaj less-eskan klavararanøon\n" -" --version Eligu la version de la programo kaj finu.\n" +" --apropos=TEMO Sercxu TEMOn en cxiuj indeksoj de cxiuj " +"dokumentoj.\n" +"-d, --directory=UJO Aldonu la dosierUJOn al INFOPATH.\n" +" --dribble=DOSIERO Notu la klavofrapojn de la uzanto en DOSIERO.\n" +"-f, --file=DOSIERO Vizitu la Info-DOSIEROn.\n" +"-h, --help Eligu cxi tiun helpeton kaj finu.\n" +" --index-search=CxENO Vizitu nodon referencatan per indeksartikolo " +"CxENO.\n" +"-n, --node=NODO Komencu per NODO.\n" +"-o, --output=DOSIERO Eligu la elektitajn nodojn en DOSIEROn.\n" +"-R, --raw-escapes Ne forigu ANSI-eskapilojn el man-pagxoj\n" +" --restore=DOSIERO Legu la klavofrapojn el DOSIERO.\n" +"-O, --show-options, --usage Montru la nodon pri komandliniaj opcioj.\n" +"%s --subnodes Rekursie eligu la menuerojn.\n" +" --vi-keys Uzu vi-eskan kaj less-eskan klavararangxon\n" +" --version Eligu la version de la programo kaj finu.\n" "\n" -"La unua neopcia argumento, se donita, estas la nomo de vizitenda\n" -"Info-dosiero, seræota en æiuj \"dir\"-dosieroj troveblaj per INFOPATH.\n" -"Se øi mankas, Info kunfandas æiujn \"dir\"-dosierojn kaj eligas la " +"La unua neopcia argumento, se donita, estas la nomo de unue vizitenda\n" +"menuero, sercxota en cxiuj \"dir\"-dosieroj troveblaj per INFOPATH.\n" +"Se gxi mankas, Info kunfandas cxiujn \"dir\"-dosierojn kaj eligas la " "rezulton.\n" -"La ceteraj argumentoj estas la nomoj de menueroj de la unue vizitenda\n" -"nodo.\n" +"La ceteraj argumentoj estas la nomoj de menueroj relative al la unue\n" +"vizitenda nodo.\n" "\n" "Ekzemploj:\n" " info eligu la menuon de la kataloga nodo\n" @@ -325,273 +322,429 @@ msgstr "" "manlibro\n" " info --show-options emacs komencu per la Emaksaj komandliniaj opcioj\n" " info -f ./um.info eligu la dosieron ./um.info sen atenti \"dir\"\n" + +#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474 +#: util/install-info.c:421 util/texindex.c:286 +msgid "" +"\n" +"Email bug reports to bug-texinfo@gnu.org,\n" +"general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" +msgstr "" "\n" -"Erarraportojn sendu al <bug-texinfo@gnu.org>; øeneralajn demandojn kaj\n" -"opiniojn al <help-texinfo@gnu.org>. Por la diskutoj pri esperantigo\n" -"uzu la dissendoliston <eo@li.org>.\n" +"Erarraportojn sendu al <bug-texinfo@nu.org>; gxeneralajn\n" +"demandojn kaj opiniojn al <help-texinfo@gnu.org>.\n" +"La hejmpagxo de Texinfo: <http://www.gnu.org/software/texinfo/>.\n" +"Por la diskutoj pri Esperanto-traduko uzu la dissendoliston\n" +"<translation-team-eo@lists.sourceforge.net>." -#: info/info.c:604 -#, fuzzy, c-format +#: info/info.c:632 +#, c-format msgid "Cannot find node `%s'." -msgstr "Maleblas forigi la nodon \"%s\"" +msgstr "La nodo \"%s\" ne troveblas." -#: info/info.c:605 -#, fuzzy, c-format +#: info/info.c:633 +#, c-format msgid "Cannot find node `(%s)%s'." -msgstr "Maleblas forigi la nodon \"%s\"" +msgstr "La nodo \"(%s)%s\" ne troveblas." -#: info/info.c:606 -#, fuzzy +#: info/info.c:634 msgid "Cannot find a window!" -msgstr "Maleblas forigi fenestron permanentan" +msgstr "Maleblas trovi fenestron!" -#: info/info.c:607 +#: info/info.c:635 msgid "Point doesn't appear within this window's node!" -msgstr "" +msgstr "La muskursoro ne estas en cxi-fenestra nodo!" -#: info/info.c:608 -#, fuzzy +#: info/info.c:636 msgid "Cannot delete the last window." -msgstr "Maleblas forigi fenestron permanentan" +msgstr "Maleblas forigi la lastan fenestron" -#: info/info.c:609 -#, fuzzy +#: info/info.c:637 msgid "No menu in this node." -msgstr "En la nodo \"%s\" malestas menuo." +msgstr "En cxi tiu nodo malestas menuo." -#: info/info.c:610 -#, fuzzy +#: info/info.c:638 msgid "No footnotes in this node." -msgstr "Neniu referenco en æi tiu nodo." +msgstr "Ne estas piednotoj en cxi tiu nodo." -#: info/info.c:611 +#: info/info.c:639 msgid "No cross references in this node." -msgstr "Neniu referenco en æi tiu nodo." +msgstr "Neniu referenco en cxi tiu nodo." -#: info/info.c:612 -#, fuzzy, c-format +#: info/info.c:640 +#, c-format msgid "No `%s' pointer for this node." -msgstr "Mankas ligilo \"Next\" por æi tiu nodo." +msgstr "Mankas ligilo \"%s\" por cxi tiu nodo." -#: info/info.c:613 +#: info/info.c:641 #, c-format msgid "Unknown Info command `%c'; try `?' for help." -msgstr "" +msgstr "Nekonata Info-komando \"%c\"; tajpu \"?\" por helpo." -#: info/info.c:614 +#: info/info.c:642 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." -msgstr "" +msgstr "La terminaloj de tipo \"%s\" ne estas suficxe inteligentaj por Info." -#: info/info.c:615 -#, fuzzy +#: info/info.c:643 msgid "You are already at the last page of this node." -msgstr "Iru al la komenco de æi tiu nodo" +msgstr "Tiu pagxo jam estas la lasta en cxi tiu nodo" -#: info/info.c:616 -#, fuzzy +#: info/info.c:644 msgid "You are already at the first page of this node." -msgstr "Iru al la komenco de æi tiu nodo" +msgstr "Tio jam estas la unua pagxo de cxi tiu nodo" -#: info/info.c:617 +#: info/info.c:645 msgid "Only one window." -msgstr "" +msgstr "Nur unu fenestro." -#: info/info.c:618 +#: info/info.c:646 msgid "Resulting window would be too small." -msgstr "" +msgstr "La fenestro rezultos tro malgranda." -#: info/info.c:619 +#: info/info.c:647 msgid "Not enough room for a help window, please delete a window." -msgstr "" - -#: info/infodoc.c:45 -msgid "Basic Commands in Info Windows\n" -msgstr "Æefaj komandoj en la Info-fenestroj\n" +msgstr "Mankas spaco por helpa fenestro, bv forigi iun fenestron." -#: info/infodoc.c:46 -msgid "******************************\n" -msgstr "******************************\n" +#: info/infodoc.c:45 info/infodoc.c:94 +msgid "" +"Basic Commands in Info Windows\n" +"******************************\n" +msgstr "" +"La cxefaj komandoj info-fenestraj\n" +"*********************************\n" #: info/infodoc.c:48 -#, c-format -msgid " %-10s Quit this help.\n" -msgstr " %-10s Forlasu æi tiun helpon.\n" +msgid "\\%-10[quit-help] Quit this help.\n" +msgstr "\\%-10[quit-help] Forlasu cxi tiun helpon.\n" #: info/infodoc.c:49 -#, c-format -msgid " %-10s Quit Info altogether.\n" -msgstr " %-10s Forlasu la tutan Info.\n" +msgid "\\%-10[quit] Quit Info altogether.\n" +msgstr "\\%-10[quit-help] Forlasu la tutan Info.\n" #: info/infodoc.c:50 -#, c-format -msgid " %-10s Invoke the Info tutorial.\n" -msgstr " %-10s Voku la lernilon pri Info.\n" - -#: info/infodoc.c:52 -msgid "Moving within a node:\n" -msgstr "Por movi ene de nodo:\n" +msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" +msgstr "\\%-10[get-info-help-node] Voku la lernilon pri Info.\n" -#: info/infodoc.c:53 -msgid "---------------------\n" -msgstr "---------------------\n" +#: info/infodoc.c:52 info/infodoc.c:101 +msgid "" +"Selecting other nodes:\n" +"----------------------\n" +msgstr "" +"Por elekti aliajn nodojn:\n" +"-------------------------\n" #: info/infodoc.c:54 -#, c-format -msgid " %-10s Scroll forward a page.\n" -msgstr " %-10s Unu paøon antaýen.\n" +msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" +msgstr "" +"\\%-10[next-node] Iru al la tujsekva (\"Next\") nodo de cxi tiu nodo.\n" #: info/infodoc.c:55 -#, c-format -msgid " %-10s Scroll backward a page.\n" -msgstr " %-10s Unu paøon malantaýen.\n" +msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" +msgstr "" +"\\%-10[prev-node] Iru al la jxusantauxa (\"Previous\") nodo de cxi tiu " +"nodo.\n" #: info/infodoc.c:56 -#, c-format -msgid " %-10s Go to the beginning of this node.\n" -msgstr " %-10s Iru al la komenco de æi tiu nodo.\n" +msgid "\\%-10[up-node] Move \"up\" from this node.\n" +msgstr "\\%-10[up-node] Iru al la tujsupra (\"Up\") nodo de cxi tiu nodo.\n" #: info/infodoc.c:57 -#, c-format -msgid " %-10s Go to the end of this node.\n" -msgstr " %-10s Iru al la fino de æi tiu nodo.\n" - -#: info/infodoc.c:58 -#, c-format -msgid " %-10s Scroll forward 1 line.\n" -msgstr " %-10s Unu paøon antaýen.\n" +msgid "" +"\\%-10[menu-item] Pick menu item specified by name.\n" +" Picking a menu item causes another node to be selected.\n" +msgstr "" +"\\%-10[menu-item] Elektu menueron indikitan per nomo.\n" +" Elekto de menuero kauxzas transiron en alian nodon.\n" #: info/infodoc.c:59 -#, c-format -msgid " %-10s Scroll backward 1 line.\n" -msgstr " %-10s Unu paøon malantaýen.\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:60 +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 cxi tiu fenestro.\n" #: info/infodoc.c:61 -msgid "Selecting other nodes:\n" -msgstr "Por elekti aliajn nodojn:\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 cxi " +"tiu nodo.\n" #: info/infodoc.c:62 -msgid "----------------------\n" -msgstr "----------------------\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 cxi " +"tiu nodo.\n" #: info/infodoc.c:63 -#, fuzzy, c-format -msgid " %-10s Move to the `next' node of this node.\n" -msgstr " %-10s Iru al la tujsekva (\"Next\") nodo de æi tiu nodo.\n" +msgid "" +"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" +msgstr "" +"\\%-10[select-reference-this-line] Iru laux la subkursora hiperteksta " +"ligo.\n" #: info/infodoc.c:64 -#, fuzzy, c-format -msgid " %-10s Move to the `previous' node of this node.\n" -msgstr " %-10s Iru al la ¼usantaýa (\"Previous\") nodo de æi tiu nodo.\n" +msgid "" +"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" +"node] (DIR)'.\n" +msgstr "" +"\\%-10[dir-node] Iru al la cxefkataloga nodo. Ekvivalentas al \"g (DIR)" +"\".\n" #: info/infodoc.c:65 -#, fuzzy, c-format +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:67 info/infodoc.c:115 +msgid "" +"Moving within a node:\n" +"---------------------\n" +msgstr "" +"Por movigxi ene de nodo:\n" +"------------------------\n" + +#: info/infodoc.c:69 +msgid "\\%-10[scroll-forward] Scroll forward a page.\n" +msgstr "\\%-10[scroll-forward] Unu pagxon antauxen.\n" + +#: info/infodoc.c:70 +msgid "\\%-10[scroll-backward] Scroll backward a page.\n" +msgstr "\\%-10[scroll-backward] Unu pagxon malantauxen.\n" + +#: info/infodoc.c:71 +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" +msgstr "\\%-10[beginning-of-node] Iru al la komenco de cxi tiu nodo.\n" + +#: info/infodoc.c:72 +msgid "\\%-10[end-of-node] Go to the end of this node.\n" +msgstr "\\%-10[end-of-node] Iru al la fino de cxi tiu nodo.\n" + +#: info/infodoc.c:73 +msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" +msgstr "\\%-10[scroll-forward] Unu pagxon antauxen.\n" + +#: info/infodoc.c:74 +msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" +msgstr "\\%-10[scroll-backward] Unu pagxon malantauxen.\n" + +#: info/infodoc.c:76 info/infodoc.c:124 +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "" +"Ceteraj komandoj:\n" +"-----------------\n" + +#: info/infodoc.c:78 +msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" +msgstr "" +"\\%-10[menu-digit] Elektu resp. la unuan ... la nauxan eron el cxi-noda " +"menuo.\n" + +#: info/infodoc.c:79 +msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" +msgstr "\\%-10[last-menu-item] Elektu la lastan eron de cxi-noda menuo.\n" + +#: info/infodoc.c:80 +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] Sercxu aperon de donita signocxeno en la " +"indeksartikoloj de cxi\n" +" tiu info-dosiero kaj elektu la nodon referencatan de la unua trovita " +"artikolo.\n" + +#: info/infodoc.c:82 +msgid "" +"\\%-10[goto-node] Move to node specified by name.\n" +" You may include a filename as well, as in (FILENAME)NODENAME.\n" +msgstr "" +"\\%-10[goto-node] Iru al nodo indikita per nomo.\n" +" Ankaux la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n" + +#: info/infodoc.c:84 +msgid "" +"\\%-10[search] Search forward for a specified string\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" +"\\%-10[search] Sercxu sube aperon de donita signocxeno kaj\n" +" vizitu la nodon en kiu trovigxos la sekva apero.\n" + +#: info/infodoc.c:86 +msgid "" +"\\%-10[search-backward] Search backward for a specified string\n" +" and select the node in which the previous occurrence is " +"found.\n" +msgstr "" +"\\%-10[search-backward] Sercxu supre aperon de donita signocxeno kaj\n" +" vizitu la nodon en kiu trovigxos la jxusantauxa apero.\n" + +#: info/infodoc.c:97 +#, c-format +msgid " %-10s Quit this help.\n" +msgstr " %-10s Forlasu cxi tiun helpon.\n" + +#: info/infodoc.c:98 +#, c-format +msgid " %-10s Quit Info altogether.\n" +msgstr " %-10s Forlasu la tutan Info.\n" + +#: info/infodoc.c:99 +#, c-format +msgid " %-10s Invoke the Info tutorial.\n" +msgstr " %-10s Voku la lernilon pri Info.\n" + +#: info/infodoc.c:103 +#, c-format +msgid " %-10s Move to the `next' node of this node.\n" +msgstr " %-10s Iru al la tujsekva (\"Next\") nodo de cxi tiu nodo.\n" + +#: info/infodoc.c:104 +#, c-format +msgid " %-10s Move to the `previous' node of this node.\n" +msgstr " %-10s Iru al la jxusantauxa (\"Previous\") nodo de cxi tiu nodo.\n" + +#: info/infodoc.c:105 +#, c-format msgid " %-10s Move `up' from this node.\n" -msgstr " %-10s Iru al la tujsupra (\"Up\") nodo de æi tiu nodo.\n" +msgstr " %-10s Iru al la tujsupra (\"Up\") nodo de cxi tiu nodo.\n" -#: info/infodoc.c:66 +#: info/infodoc.c:106 #, c-format msgid " %-10s Pick menu item specified by name.\n" msgstr " %-10s Iru al la tajpota menuero.\n" -#: info/infodoc.c:67 +#: info/infodoc.c:107 msgid " Picking a menu item causes another node to be selected.\n" -msgstr " Elekto de menuero kaýzas transiron en alian nodon.\n" +msgstr " Elekto de menuero kauxzas transiron en alian nodon.\n" -#: info/infodoc.c:68 +#: info/infodoc.c:108 #, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" msgstr " %-10s Sekvu reFerencon (legante la nomon de la referenco).\n" -#: info/infodoc.c:69 +#: info/infodoc.c:109 #, c-format msgid " %-10s Move to the last node seen in this window.\n" -msgstr " %-10s Revenu al la Lasta nodo vizitita en æi tiu fenestro.\n" +msgstr " %-10s Revenu al la Lasta nodo vizitita en cxi tiu fenestro.\n" -#: info/infodoc.c:70 +#: info/infodoc.c:110 #, c-format msgid " %-10s Skip to next hypertext link within this node.\n" -msgstr " %-10s Saltu sur la sekvan hipertekstan ligilon en æi tiu nodo.\n" +msgstr " %-10s Saltu sur la sekvan hipertekstan ligilon en cxi tiu nodo.\n" -#: info/infodoc.c:71 +#: info/infodoc.c:111 #, c-format msgid " %-10s Follow the hypertext link under cursor.\n" -msgstr " %-10s Iru laý la subkursora hiperteksta ligo.\n" +msgstr " %-10s Iru laux la subkursora hiperteksta ligo.\n" -#: info/infodoc.c:72 +#: info/infodoc.c:112 #, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" -msgstr " %-10s Iru al la æefkataloga nodo. Ekvivalentas al \"g (DIR)\".\n" +msgstr " %-10s Iru al la cxefkataloga nodo. Ekvivalentas al \"g (DIR)\".\n" -#: info/infodoc.c:73 +#: info/infodoc.c:113 #, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" msgstr " %-10s Iru al la radika nodo. Ekvivalentas al \"g Top\".\n" -#: info/infodoc.c:75 -msgid "Other commands:\n" -msgstr "Aliaj komandoj:\n" +#: info/infodoc.c:117 +#, c-format +msgid " %-10s Scroll forward a page.\n" +msgstr " %-10s Unu pagxon antauxen.\n" + +#: info/infodoc.c:118 +#, c-format +msgid " %-10s Scroll backward a page.\n" +msgstr " %-10s Unu pagxon malantauxen.\n" + +#: info/infodoc.c:119 +#, c-format +msgid " %-10s Go to the beginning of this node.\n" +msgstr " %-10s Iru al la komenco de cxi tiu nodo.\n" + +#: info/infodoc.c:120 +#, c-format +msgid " %-10s Go to the end of this node.\n" +msgstr " %-10s Iru al la fino de cxi tiu nodo.\n" + +#: info/infodoc.c:121 +#, c-format +msgid " %-10s Scroll forward 1 line.\n" +msgstr " %-10s Unu pagxon antauxen.\n" -#: info/infodoc.c:76 -msgid "---------------\n" -msgstr "---------------\n" +#: info/infodoc.c:122 +#, c-format +msgid " %-10s Scroll backward 1 line.\n" +msgstr " %-10s Unu pagxon malantauxen.\n" -#: info/infodoc.c:77 +#: info/infodoc.c:126 #, c-format msgid " %-10s Pick first ... ninth item in node's menu.\n" -msgstr " %-10s Elektu resp. la unuan ... la naýan eron de æi-noda menuo.\n" +msgstr " %-10s Elektu resp. la unuan ... la nauxan eron de cxi-noda menuo.\n" -#: info/infodoc.c:78 +#: info/infodoc.c:127 #, c-format msgid " %-10s Pick last item in node's menu.\n" -msgstr " %-10s Elektu la lastan eron de æi-noda menuo.\n" +msgstr " %-10s Elektu la lastan eron de cxi-noda menuo.\n" -#: info/infodoc.c:79 +#: info/infodoc.c:128 #, 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 " +" %-10s Sercxu indikotan signocxenon en la indeksaj artikoloj de cxi tiu " "Info-\n" -#: info/infodoc.c:80 +#: info/infodoc.c:129 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:81 +#: info/infodoc.c:130 #, c-format msgid " %-10s Move to node specified by name.\n" msgstr " %-10s Vizitu nodon indikotan per la nomo.\n" -#: info/infodoc.c:82 +#: info/infodoc.c:131 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" +msgstr " Ankaux la dosiernomon vi povas inkludi, kiel en (DOSIERO)NODO.\n" -#: info/infodoc.c:83 +#: info/infodoc.c:132 #, c-format -msgid "" -" %-10s Search forward through this Info file for a specified string,\n" -msgstr " %-10s Seræu indikotan signoæenon tra æi tiu Info-dosiero, kaj\n" +msgid " %-10s Search forward for a specified string,\n" +msgstr " %-10s Sercxu sube indikotan signocxenon,\n" -#: info/infodoc.c:84 info/infodoc.c:86 +#: info/infodoc.c:133 info/infodoc.c:135 msgid "" " and select the node in which the next occurrence is found.\n" -msgstr " vizitu la nodon en kiu troviøos la sekva apero.\n" +msgstr " kaj vizitu la nodon en kiu trovigxos la sekva apero.\n" -#: info/infodoc.c:85 +#: info/infodoc.c:134 #, c-format -msgid " %-10s Search backward in this Info file for a specified string,\n" -msgstr " %-10s Seræu indikotan signoæenon tra æi tiu Info-dosiero, kaj\n" +msgid " %-10s Search backward for a specified string\n" +msgstr " %-10s Sercxu indikotan signocxenon supre en la dosiero,\n" -#: info/infodoc.c:258 +#: info/infodoc.c:313 msgid "The current search path is:\n" -msgstr "La kuranta serævojo estas:\n" +msgstr "La kuranta sercxvojo estas:\n" -#: info/infodoc.c:261 +#: info/infodoc.c:316 msgid "" "Commands available in Info windows:\n" "\n" @@ -599,123 +752,283 @@ msgstr "" "Komandoj disponeblaj en Info-fenestroj:\n" "\n" -#: info/infodoc.c:264 +#: info/infodoc.c:319 msgid "" "Commands available in the echo area:\n" "\n" msgstr "" -"Komandoj disponeblaj en la e¶ozono:\n" +"Komandoj disponeblaj en la ehxozono:\n" "\n" -#: info/infodoc.c:280 +#: info/infodoc.c:340 +#, c-format msgid "" -"The following commands can only be invoked via M-x:\n" +"The following commands can only be invoked via %s:\n" "\n" msgstr "" -"La sekvaj komandoj vokeblas nur per M-x:\n" +"La sekvaj komandoj vokeblas nur per %s:\n" "\n" -#: info/infodoc.c:301 +#: info/infodoc.c:343 +msgid "" +"The following commands cannot be invoked at all:\n" +"\n" +msgstr "" +"La sekvaj komandoj neniel vokeblas:\n" +"\n" + +#: info/infodoc.c:367 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" -msgstr "--- Uzu \"\\[history-node]\" aý \"\\[kill-node]\" por eliri ---\n" +msgstr "--- Uzu \"\\[history-node]\" aux \"\\[kill-node]\" por eliri ---\n" -#. Create or move to the help window. -#: info/infodoc.c:411 +#: info/infodoc.c:477 msgid "Display help message" -msgstr "Eligu helpomesaøon" +msgstr "Eligu helpomesagxon" -#. Show the Info help node. This means that the "info" file is installed -#. where it can easily be found on your system. -#: info/infodoc.c:429 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" msgstr "Vizitu la Info-nodon \"(info)Help\"" -#: info/infodoc.c:555 +#: info/infodoc.c:638 msgid "Print documentation for KEY" msgstr "Eligu la informon pri KLAVO" -#: info/infodoc.c:568 +#: info/infodoc.c:650 #, c-format msgid "Describe key: %s" msgstr "Priskribu klavon: %s" -#: info/infodoc.c:577 +#: info/infodoc.c:660 #, c-format msgid "ESC %s is undefined." msgstr "ESC %s estas nedifinita." -#: info/infodoc.c:594 +#: info/infodoc.c:676 info/infodoc.c:703 #, c-format msgid "%s is undefined." msgstr "%s estas nedifinita." -#: info/infodoc.c:620 +#: info/infodoc.c:724 #, c-format msgid "%s is defined to %s." msgstr "%s estas ligita al %s." -#: info/infodoc.c:812 +#: info/infodoc.c:1151 msgid "Show what to type to execute a given command" msgstr "Montru, kion tajpi por plenumi koncernan komandon" -#: info/infodoc.c:816 +#: info/infodoc.c:1155 msgid "Where is command: " msgstr "Kie estas la komando: " -#: info/infodoc.c:838 +#: info/infodoc.c:1177 #, c-format msgid "`%s' is not on any keys" msgstr "neniu klavo trovita por la komando \"%s\"" -#: info/infodoc.c:844 +#: info/infodoc.c:1183 #, c-format msgid "%s can only be invoked via %s." msgstr "%s vokeblas nur per %s." -#: info/infodoc.c:847 +#: info/infodoc.c:1186 #, c-format msgid "%s can be invoked via %s." msgstr "%s vokeblas per %s." -#: info/infodoc.c:851 +#: info/infodoc.c:1190 #, c-format msgid "There is no function named `%s'" msgstr "Malestas funkcio nomata \"%s\"" -#: info/m-x.c:69 +#: info/infokey.c:164 +msgid "incorrect number of arguments" +msgstr "Malgxusta nombro da argumentoj" + +#: info/infokey.c:194 +#, c-format +msgid "cannot open input file `%s'" +msgstr "ne malfermigxis eniga dosiero \"%s\"" + +#: info/infokey.c:207 +#, c-format +msgid "cannot create output file `%s'" +msgstr "maleblas krei eligan dosieron \"%s\"" + +#: info/infokey.c:217 +#, c-format +msgid "error writing to `%s'" +msgstr "eraro dum skribo en \"%s\"" + +#: info/infokey.c:222 +#, c-format +msgid "error closing output file `%s'" +msgstr "eraro dum fermo de eliga dosiero \"%s\"" + +#: info/infokey.c:443 +msgid "key sequence too long" +msgstr "tro longa klavosekvenco" + +#: info/infokey.c:521 +msgid "missing key sequence" +msgstr "mankanta klavosekvenco" + +#: info/infokey.c:600 +msgid "NUL character (\\000) not permitted" +msgstr "NUL-signo (\\000) malpermesitas" + +#: info/infokey.c:629 +#, c-format +msgid "NUL character (^%c) not permitted" +msgstr "NUL-signo (^%c) malpermesitas" + +#: info/infokey.c:652 +msgid "missing action name" +msgstr "mankas agonomo" + +#: info/infokey.c:667 info/infokey.c:733 +msgid "section too long" +msgstr "tro longa sekcio" + +#: info/infokey.c:673 +#, c-format +msgid "unknown action `%s'" +msgstr "nekonata ago \"%s\"." + +#: info/infokey.c:682 +msgid "action name too long" +msgstr "tro longa agonomo" + +#: info/infokey.c:694 +#, c-format +msgid "extra characters following action `%s'" +msgstr "kromaj signoj post la ago \"%s\"" + +#: info/infokey.c:704 +msgid "missing variable name" +msgstr "mankas nomo de variablo" + +#: info/infokey.c:712 +msgid "missing `=' immediately after variable name" +msgstr "mankas \"=\" tuj post variablonomo" + +#: info/infokey.c:719 +msgid "variable name too long" +msgstr "tro longa variablonomo" + +#: info/infokey.c:741 +msgid "value too long" +msgstr "tro longa valoro" + +#: info/infokey.c:875 +#, c-format +msgid "\"%s\", line %u: " +msgstr "\"%s\", linio %u: " + +#: info/infokey.c:891 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT-FILE]\n" +"\n" +"Compile infokey source file to infokey file. Reads INPUT-FILE (default\n" +"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n" +"\n" +"Options:\n" +" --output FILE output to FILE instead of $HOME/.info\n" +" --help display this help and exit.\n" +" --version display version information and exit.\n" +msgstr "" +"Sintakso: %s [OPCIO]... [ENIG-DOSIERO]\n" +"\n" +"Opcioj:\n" +" --output=DOSIERO Eligu en DOSIEROn (anatataux $HOME/.info).\n" +" --help Eligu cxi tiun helpeton kaj finu.\n" +" --version Eligu la version de la programo kaj finu.\n" + +#: info/infomap.c:1397 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too small" +msgstr "La misa infoklava dosiero \"%s\" ignorita (tro mallonga)" + +#: info/infomap.c:1400 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too big" +msgstr "La misa infoklava dosiero \"%s\" ignorita (tro longa)" + +#: info/infomap.c:1413 +#, c-format +msgid "Error reading infokey file `%s' - short read" +msgstr "Eraro dum lego de infoklava dosiero \"%s\" (tro frue elcxerpita)" + +#: info/infomap.c:1431 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" +msgstr "" +"Misa infoklava dosiero \"%s\" (magiaj nombroj); aktualigu gxin per infokey" + +#: info/infomap.c:1437 +#, c-format +msgid "Your infokey file `%s' is out of date -- run infokey to update it" +msgstr "Via infoklava dosiero \"%s\" malaktualas; aktualigu gxin per infokey" + +#: info/infomap.c:1450 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" +msgstr "" +"Misa infoklava dosiero \"%s\" (misa sekcilongo) -- aktualigu gxin per infokey" + +#: info/infomap.c:1470 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section code) -- run infokey to update it" +msgstr "" +"Misa infoklava dosiero \"%s\" (misa sekcikodo); aktualigu gxin per infokey" + +#: info/infomap.c:1608 +msgid "Bad data in infokey file -- some key bindings ignored" +msgstr "Misaj datumoj en infoklava dosiero -- iuj klavasociajxoj ne validos" + +#: info/infomap.c:1659 +msgid "Bad data in infokey file -- some var settings ignored" +msgstr "" +"Misaj datumoj en infoklava dosiero -- iuj valorizoj de variabloj ne validos" + +#: info/m-x.c:70 msgid "Read the name of an Info command and describe it" -msgstr "Legu la nomon de Info-komando kaj priskribu øin" +msgstr "Legu la nomon de Info-komando kaj priskribu gxin" -#: info/m-x.c:73 +#: info/m-x.c:74 msgid "Describe command: " msgstr "Priskribu komandon: " -#: info/m-x.c:96 +#: info/m-x.c:97 msgid "Read a command name in the echo area and execute it" -msgstr "Legu en la e¶ozono nomon de komando kaj øin plenumu" +msgstr "Legu en la ehxozono nomon de komando kaj gxin plenumu" -#: info/m-x.c:134 +#: info/m-x.c:141 msgid "Cannot execute an `echo-area' command here." -msgstr "Maleblas plenumi e¶ozonan (\"echo-area-\") komandon æi tie." +msgstr "Maleblas plenumi ehxozonan (\"echo-area-\") komandon cxi tie." -#: info/m-x.c:150 +#: info/m-x.c:157 msgid "Set the height of the displayed window" msgstr "Fiksu la alton de la prezentata fenestro" -#: info/m-x.c:163 +#: info/m-x.c:170 #, c-format msgid "Set screen height to (%d): " msgstr "Alto de la ekrano estu (%d): " -#: info/makedoc.c:132 +#: info/makedoc.c:161 info/makedoc.c:169 msgid "" " Source files groveled to make this file include:\n" "\n" msgstr "" -" La fontodosieroj tralaboritaj por fari æi tiun dosieron:\n" +" La fontodosieroj tralaboritaj por fari cxi tiun dosieron:\n" "\n" -#: info/makedoc.c:465 +#: info/makedoc.c:553 #, c-format msgid "Couldn't manipulate the file %s.\n" msgstr "Maleblas prilabori la dosieron %s.\n" @@ -738,11 +1051,11 @@ msgid "" "Select one from this menu, or use `\\[history-node]' in another window.\n" msgstr "" "Jen la menuo de nodoj kiujn vi lastatempe vizitis.\n" -"Elektu iun el la menuo, aý uzu \"\\[history-node]\" en alia fenestro.\n" +"Elektu iun el la menuo, aux uzu \"\\[history-node]\" en alia fenestro.\n" #: info/nodemenu.c:219 msgid "Make a window containing a menu of all of the currently visited nodes" -msgstr "Faru fenestron entenantan menuon de æiuj nune vizititaj nodoj" +msgstr "Faru fenestron entenantan menuon de cxiuj nune vizititaj nodoj" #: info/nodemenu.c:299 msgid "Select a node which has been previously visited in a visible window" @@ -752,1476 +1065,1621 @@ msgstr "Elektu nodon jam vizititan en videbla fenestro" msgid "Select visited node: " msgstr "Elektu vizititan nodon: " -#: info/nodemenu.c:331 info/session.c:2146 +#: info/nodemenu.c:331 info/session.c:2235 #, c-format msgid "The reference disappeared! (%s)." msgstr "La referenco malaperis! (%s)." -#: info/session.c:169 -#, fuzzy, c-format +#: info/session.c:170 +#, 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. \"\\[get-help-window]\" por helpo, " -"\"\\[menu-item]\" por menuero." +"Bonvenon al Info, versio %s. Tajpu \\[get-help-window] por helpo, \\[menu-" +"item] por menuero." -#. Move WINDOW's point down to the next line if possible. -#: info/session.c:642 +#: info/session.c:643 msgid "Move down to the next line" -msgstr "Malleviøu al la sekva linio" +msgstr "Mallevigxu al la sekva linio" -#. Move WINDOW's point up to the previous line if possible. -#: info/session.c:657 +#: info/session.c:658 msgid "Move up to the previous line" -msgstr "Leviøu al la antaýa linio" +msgstr "Levigxu al la antauxa linio" -#. Move WINDOW's point to the end of the true line. -#: info/session.c:672 +#: info/session.c:673 msgid "Move to the end of the line" msgstr "Iru al la fino de la linio" -#. Move WINDOW's point to the beginning of the true line. -#: info/session.c:692 +#: info/session.c:693 msgid "Move to the start of the line" msgstr "Iru al la komenco de la linio" -#: info/session.c:884 makeinfo/node.c:1092 +#: info/session.c:885 makeinfo/node.c:1357 msgid "Next" msgstr "Sekva" -#: info/session.c:887 +#: info/session.c:888 msgid "Following Next node..." msgstr "Estas legata la nodo \"Next\" ..." -#: info/session.c:904 +#: info/session.c:905 msgid "Selecting first menu item..." msgstr "La unua menuero estas elektata ..." -#: info/session.c:915 +#: info/session.c:916 msgid "Selecting Next node..." msgstr "La nodo \"Next\" estas elektata ..." -#: info/session.c:985 +#: info/session.c:986 #, c-format msgid "Moving Up %d time(s), then Next." msgstr "%d-foje supren, poste al la sekva (\"Next\")." -#: info/session.c:1009 +#: info/session.c:1010 msgid "No more nodes within this document." msgstr "Malestas pluaj referencoj en la dokumento." -#: info/session.c:1033 -#, fuzzy +#: info/session.c:1034 msgid "No `Prev' for this node." -msgstr "Mankas ligilo \"Prev\" por tiu nodo." +msgstr "Mankas ligilo \"Prev\" por cxi tiu nodo." -#. Move to the previous node. If this node now contains a menu, -#. and we have not inhibited movement to it, move to the node -#. corresponding to the last menu item. -#: info/session.c:1036 info/session.c:1091 +#: info/session.c:1037 info/session.c:1092 msgid "Moving Prev in this window." -msgstr "Iro al la antaýa nodo \"Prev\" en æi tiu fenestro." +msgstr "Iro al la antauxa nodo \"Prev\" en cxi tiu fenestro." -#: info/session.c:1050 -#, fuzzy +#: info/session.c:1051 msgid "No `Prev' or `Up' for this node within this document." -msgstr "En la dokumento mankas ligilo(j) \"Prev\" aý \"Up\" por tiu nodo." +msgstr "En la dokumento mankas ligilo(j) \"Prev\" aux \"Up\" por tiu nodo." -#: info/session.c:1053 +#: info/session.c:1054 msgid "Moving Up in this window." -msgstr "Leviøo al la nodo \"Up\" en æi tiu fenestro." +msgstr "Levigxo al la nodo \"Up\" en cxi tiu fenestro." -#: info/session.c:1101 -#, fuzzy +#: info/session.c:1102 msgid "Moving to `Prev's last menu item." msgstr "Iro al la lasta menuero de la nodo \"Prev\"." -#: info/session.c:1112 +#: info/session.c:1113 msgid "Move forwards or down through node structure" -msgstr "Movu antaýen aý malsupren en la strukturo de nodoj" +msgstr "Movu antauxen aux malsupren en la strukturo de nodoj" -#: info/session.c:1128 +#: info/session.c:1129 msgid "Move backwards or up through node structure" -msgstr "Movu malantaýen aý supren en la strukturo de nodoj" +msgstr "Movu malantauxen aux supren en la strukturo de nodoj" -#. Show the next screen of WINDOW's node. -#: info/session.c:1143 +#: info/session.c:1229 msgid "Scroll forward in this window" -msgstr "Rulumu antaýen en æi tiu fenestro" +msgstr "Rulumu antauxen en cxi tiu fenestro" -#: info/session.c:1192 +#: info/session.c:1237 msgid "Scroll forward in this window and set default window size" -msgstr "Rulumu antaýen en æi tiu fenestro kaj fiksu defaýltan fenestrograndon" +msgstr "" +"Rulumu antauxen en cxi tiu fenestro kaj fiksu defauxltan fenestrograndon" + +#: info/session.c:1245 +msgid "Scroll forward in this window staying within node" +msgstr "Rulumu antauxen en cxi tiu fenestro sed restu en la nodo" + +#: info/session.c:1253 +msgid "" +"Scroll forward in this window staying within node and set default window size" +msgstr "" +"Rulumu antauxen en cxi tiu fenestro restante en la nodo kaj\n" +"fiksu defauxltan fenestrograndon" -#. Show the previous screen of WINDOW's node. -#: info/session.c:1200 +#: info/session.c:1261 msgid "Scroll backward in this window" -msgstr "Rulumu malantaýen en æi tiu fenestro" +msgstr "Rulumu malantauxen en cxi tiu fenestro" -#: info/session.c:1244 +#: info/session.c:1269 msgid "Scroll backward in this window and set default window size" msgstr "" -"Rulumu malantaýen en æi tiu fenestro kaj fiksu defaýltan fenestrograndon" +"Rulumu malantauxen en cxi tiu fenestro kaj fiksu defauxltan fenestrograndon" -#. Move to the beginning of the node. -#: info/session.c:1252 +#: info/session.c:1278 +msgid "Scroll backward in this window staying within node" +msgstr "Rulumu malantauxen en cxi tiu fenestro sed restu en la nodo" + +#: info/session.c:1286 +msgid "" +"Scroll backward in this window staying within node and set default window " +"size" +msgstr "" +"Rulumu malantauxen en cxi tiu fenestro restante en la nodo kaj\n" +" fiksu defauxltan fenestrograndon" + +#: info/session.c:1294 msgid "Move to the start of this node" -msgstr "Iru al la komenco de æi tiu nodo" +msgstr "Iru al la komenco de cxi tiu nodo" -#. Move to the end of the node. -#: info/session.c:1259 +#: info/session.c:1301 msgid "Move to the end of this node" -msgstr "Iru al la fino de æi tiu nodo" +msgstr "Iru al la fino de cxi tiu nodo" -#. Scroll the window forward by N lines. -#: info/session.c:1266 +#: info/session.c:1308 msgid "Scroll down by lines" msgstr "Linie rulumu suben" -#. Scroll the window backward by N lines. -#: info/session.c:1283 +#: info/session.c:1325 msgid "Scroll up by lines" msgstr "Linie rulumu supren" -#: info/session.c:1301 +#: info/session.c:1343 msgid "Scroll down by half screen size" msgstr "Duonekrane rulumu suben" -#: info/session.c:1327 +#: info/session.c:1369 msgid "Scroll up by half screen size" msgstr "Duonekrane rulumu supren" -#. **************************************************************** -#. -#. Commands for Manipulating Windows -#. -#. **************************************************************** -#. Make the next window in the chain be the active window. -#: info/session.c:1356 +#: info/session.c:1398 msgid "Select the next window" msgstr "Elektu la sekvan fenestron" -#. Make the previous window in the chain be the active window. -#: info/session.c:1395 +#: info/session.c:1437 msgid "Select the previous window" -msgstr "Elektu la antaýan fenestron" +msgstr "Elektu la antauxan fenestron" -#. Split WINDOW into two windows, both showing the same node. If we -#. are automatically tiling windows, re-tile after the split. -#: info/session.c:1446 +#: info/session.c:1488 msgid "Split the current window" msgstr "Disfendu la kurantan fenestron" -#. Delete WINDOW, forgetting the list of last visited nodes. If we are -#. automatically displaying footnotes, show or remove the footnotes -#. window. If we are automatically tiling windows, re-tile after the -#. deletion. -#: info/session.c:1527 +#: info/session.c:1569 msgid "Delete the current window" msgstr "Forigu la kurantan fenestron" -#: info/session.c:1535 +#: info/session.c:1577 msgid "Cannot delete a permanent window" msgstr "Maleblas forigi fenestron permanentan" -#. Just keep WINDOW, deleting all others. -#: info/session.c:1568 +#: info/session.c:1610 msgid "Delete all other windows" -msgstr "Forigu æiujn ceterajn fenestrojn" +msgstr "Forigu cxiujn ceterajn fenestrojn" -#. Scroll the "other" window of WINDOW. -#: info/session.c:1614 +#: info/session.c:1656 msgid "Scroll the other window" msgstr "Rulumu la alian fenestron" -#: info/session.c:1635 +#: info/session.c:1677 msgid "Scroll the other window backward" -msgstr "Rulumu la alian fenestron malantaýen" +msgstr "Rulumu la alian fenestron malantauxen" -#. Change the size of WINDOW by AMOUNT. -#: info/session.c:1641 +#: info/session.c:1683 msgid "Grow (or shrink) this window" -msgstr "(Mal)pligrandigu æi tiun fenestron" +msgstr "(Mal)pligrandigu cxi tiun fenestron" -#: info/session.c:1652 +#: info/session.c:1694 msgid "Divide the available screen space among the visible windows" msgstr "Dispartigu la disponeblan ekranspacon inter la videblaj fenestroj" -#: info/session.c:1659 +#: info/session.c:1701 msgid "Toggle the state of line wrapping in the current window" -msgstr "Baskulþaltu la reøimon de linifaldo en la kuranta fenestro" +msgstr "Baskulsxaltu la regximon de linifaldo en la kuranta fenestro" -#. Make WINDOW display the "Next:" node of the node currently being -#. displayed. -#: info/session.c:1838 +#: info/session.c:1880 msgid "Select the Next node" msgstr "Elektu la nodon sekvan (\"Next\")" -#. Make WINDOW display the "Prev:" node of the node currently being -#. displayed. -#: info/session.c:1846 +#: info/session.c:1888 msgid "Select the Prev node" -msgstr "Elektu la nodon antaýan (\"Prev\")" +msgstr "Elektu la nodon antauxan (\"Prev\")" -#. Make WINDOW display the "Up:" node of the node currently being -#. displayed. -#: info/session.c:1854 +#: info/session.c:1896 msgid "Select the Up node" msgstr "Elektu la nodon supran (\"Up\")" -#. Make WINDOW display the last node of this info file. -#: info/session.c:1861 +#: info/session.c:1903 msgid "Select the last node in this file" -msgstr "Elektu la lastan nodon en æi tiu dosiero" +msgstr "Elektu la lastan nodon en cxi tiu dosiero" -#: info/session.c:1888 info/session.c:1921 +#: info/session.c:1930 info/session.c:1963 msgid "This window has no additional nodes" -msgstr "Æi tiu fenestro ne havas pluajn nodojn" +msgstr "Cxi tiu fenestro ne havas pluajn nodojn" -#. Make WINDOW display the first node of this info file. -#: info/session.c:1894 +#: info/session.c:1936 msgid "Select the first node in this file" -msgstr "Elektu la unuan nodon en æi tiu dosiero" +msgstr "Elektu la unuan nodon en cxi tiu dosiero" -#: info/session.c:1928 +#: info/session.c:1970 msgid "Select the last item in this node's menu" -msgstr "Elektu la lastan eron en la menuo de æi tiu nodo" +msgstr "Elektu la lastan eron en la menuo de cxi tiu nodo" -#. Use KEY (a digit) to select the Nth menu item in WINDOW->node. -#: info/session.c:1934 +#: info/session.c:1976 msgid "Select this menu item" -msgstr "Elektu æi tiun menueron" +msgstr "Elektu cxi tiun menueron" -#: info/session.c:1963 +#: info/session.c:2005 #, c-format msgid "There aren't %d items in this menu." -msgstr "Æi tiu menuo ne havas %d erojn." +msgstr "Cxi tiu menuo ne havas %d erojn." -#: info/session.c:2094 +#: info/session.c:2148 #, c-format msgid "Menu item (%s): " msgstr "Menuero (%s): " -#: info/session.c:2096 +#: info/session.c:2150 msgid "Menu item: " msgstr "Menuero: " -#: info/session.c:2101 +#: info/session.c:2155 #, c-format msgid "Follow xref (%s): " msgstr "Sekvu referencon (%s): " -#: info/session.c:2103 +#: info/session.c:2157 msgid "Follow xref: " msgstr "Sekvu referencon: " -#. Read a line (with completion) which is the name of a menu item, -#. and select that item. -#: info/session.c:2191 +#: info/session.c:2280 msgid "Read a menu item and select its node" -msgstr "Legu menueron kaj elektu øian nodon" +msgstr "Legu menueron kaj elektu gxian nodon" -#: info/session.c:2199 +#: info/session.c:2288 msgid "Read a footnote or cross reference and select its node" -msgstr "Legu piednoton aý referencon kaj elektu øian nodon" +msgstr "Legu piednoton aux referencon kaj elektu gxian nodon" -#. Position the cursor at the start of this node's menu. -#: info/session.c:2205 +#: info/session.c:2294 msgid "Move to the start of this node's menu" -msgstr "Iru al la komenco de la menuo de æi tiu nodo" +msgstr "Iru al la komenco de la menuo de cxi tiu nodo" -#: info/session.c:2229 +#: info/session.c:2318 msgid "Visit as many menu items at once as possible" msgstr "" -"Vizitu samtempe kiom eble plej multe da menueroj (æiun en aparta fenestro)" +"Vizitu samtempe kiom eble plej multe da menueroj (cxiun en aparta fenestro)" -#. Read a line of input which is a node name, and go to that node. -#: info/session.c:2257 +#: info/session.c:2346 msgid "Read a node name and select it" msgstr "Legu nodnomon kaj elektu la nodon" -#: info/session.c:2312 info/session.c:2316 +#: info/session.c:2401 info/session.c:2405 msgid "Goto node: " msgstr "Iru al la nodo: " -#: info/session.c:2382 -#, fuzzy, c-format +#: info/session.c:2471 +#, c-format msgid "No menu in node `%s'." msgstr "En la nodo \"%s\" malestas menuo." -#: info/session.c:2422 -#, fuzzy, c-format +#: info/session.c:2516 +#, c-format msgid "No menu item `%s' in node `%s'." msgstr "Menuero \"%s\" malestas en la nodo \"%s\"." -#: info/session.c:2452 -#, fuzzy, c-format +#: info/session.c:2546 +#, c-format msgid "Unable to find node referenced by `%s' in `%s'." msgstr "Maleblas trovi nodon referencatan per \"%s\" en \"%s\"." -#: info/session.c:2503 +#: info/session.c:2597 msgid "Read a list of menus starting from dir and follow them" msgstr "Legu liston da menuoj, komencante per dir kaj sekvante ilin" -#: info/session.c:2505 +#: info/session.c:2599 msgid "Follow menus: " msgstr "Sekvu menuojn: " -#: info/session.c:2703 +#: info/session.c:2797 msgid "Find the node describing program invocation" msgstr "Trovu la nodon priskribantan programvokon" -#: info/session.c:2705 +#: info/session.c:2799 #, c-format msgid "Find Invocation node of [%s]: " msgstr "Trovu la voknodon de [%s]: " -#: info/session.c:2743 +#: info/session.c:2837 msgid "Read a manpage reference and select it" -msgstr "Legu referencon al manlibra paøo kaj øin elektu" +msgstr "Legu referencon al manlibra pagxo kaj gxin elektu" -#: info/session.c:2747 +#: info/session.c:2841 msgid "Get Manpage: " -msgstr "Manlibran paøon: " +msgstr "Manlibran pagxon: " -#. Move to the "Top" node in this file. -#: info/session.c:2777 +#: info/session.c:2871 msgid "Select the node `Top' in this file" -msgstr "Elektu la nodon \"Top\" en æi tiu dosiero" +msgstr "Elektu la nodon \"Top\" en cxi tiu dosiero" -#. Move to the node "(dir)Top". -#: info/session.c:2783 +#: info/session.c:2877 msgid "Select the node `(dir)'" msgstr "Elektu la nodon \"(dir)\"" -#: info/session.c:2803 +#: info/session.c:2897 #, c-format msgid "Kill node (%s): " -msgstr "Forviþu la nodon (%s): " +msgstr "Forvisxu la nodon (%s): " -#: info/session.c:2857 +#: info/session.c:2951 #, c-format msgid "Cannot kill node `%s'" msgstr "Maleblas forigi la nodon \"%s\"" -#: info/session.c:2867 +#: info/session.c:2961 msgid "Cannot kill the last node" msgstr "Maleblas forigi la lastan nodon" -#: info/session.c:2953 +#: info/session.c:3047 msgid "Select the most recently selected node" -msgstr "Elektu nodon plej ¼use elektitan" +msgstr "Elektu nodon plej jxuse elektitan" -#. Kill named node. -#: info/session.c:2959 +#: info/session.c:3053 msgid "Kill this node" -msgstr "Forviþu æi tiun nodon" +msgstr "Forvisxu cxi tiun nodon" -#. Read the name of a file and select the entire file. -#: info/session.c:2967 +#: info/session.c:3061 msgid "Read the name of a file and select it" -msgstr "Legu la dosiernomon kaj øin elektu" +msgstr "Legu la dosiernomon kaj gxin elektu" -#: info/session.c:2971 +#: info/session.c:3065 msgid "Find file: " msgstr "Trovu la dosieron: " -#: info/session.c:2988 -#, fuzzy, c-format +#: info/session.c:3082 +#, c-format msgid "Cannot find `%s'." msgstr "Maleblas trovi \"%s\"." -#: info/session.c:3033 info/session.c:3154 -#, fuzzy, c-format +#: info/session.c:3127 info/session.c:3248 +#, c-format msgid "Could not create output file `%s'." msgstr "Maleblas krei eligan dosieron \"%s\"." -#: info/session.c:3046 info/session.c:3171 info/session.c:3232 +#: info/session.c:3140 info/session.c:3265 info/session.c:3326 msgid "Done." msgstr "Prete." -#. Maybe we should print some information about the node being output. -#: info/session.c:3102 -#, fuzzy, c-format +#: info/session.c:3196 +#, c-format msgid "Writing node %s..." msgstr "Estas skribata la nodo \"%s\" ..." -#: info/session.c:3180 +#: info/session.c:3274 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" -msgstr "La enhavon de æi tiu nodo metu en la dukton per INFO_PRINT_COMMAND" +msgstr "La enhavon de cxi tiu nodo metu en la dukton per INFO_PRINT_COMMAND" -#: info/session.c:3216 -#, fuzzy, c-format +#: info/session.c:3310 +#, c-format msgid "Cannot open pipe to `%s'." -msgstr "Maleblas malfermi dukton al \"%s\"." +msgstr "Ne malfermigxis dukto al \"%s\"." -#. Maybe we should print some information about the node being output. -#: info/session.c:3222 -#, fuzzy, c-format +#: info/session.c:3316 +#, c-format msgid "Printing node %s..." msgstr "Estas printata la nodo \"%s\" ..." -#: info/session.c:3464 -#, fuzzy, c-format +#: info/session.c:3558 +#, c-format msgid "Searching subfile %s ..." -msgstr "Estas seræata la subdosiero \"%s\" ..." +msgstr "Estas sercxata la subdosiero \"%s\" ..." -#: info/session.c:3516 +#: info/session.c:3610 msgid "Read a string and search for it case-sensitively" -msgstr "Legu æenon kaj seræu øin usklecodistinge" +msgstr "Legu cxenon kaj sercxu gxin usklecodistinge" -#: info/session.c:3523 +#: info/session.c:3617 msgid "Read a string and search for it" -msgstr "Legu æenon kaj øin seræu" +msgstr "Legu cxenon kaj gxin sercxu" -#: info/session.c:3531 +#: info/session.c:3625 msgid "Read a string and search backward for it" -msgstr "Legu æenon kaj øin seræu malantaýen" +msgstr "Legu cxenon kaj gxin sercxu malantauxen" -#: info/session.c:3573 +#: info/session.c:3667 #, c-format msgid "%s%sfor string [%s]: " -msgstr "%s%spor signoæeno [%s]: " +msgstr "%s%spor signocxeno [%s]: " -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search backward" -msgstr "Seræu malantaýen" +msgstr "Sercxu malantauxen" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search" -msgstr "Seræu" +msgstr "Sercxu" -#: info/session.c:3575 +#: info/session.c:3669 msgid " case-sensitively " msgstr " usklecodistinge" -#: info/session.c:3575 +#: info/session.c:3669 msgid " " msgstr " " -#: info/session.c:3615 +#: info/session.c:3709 msgid "Search failed." -msgstr "Seræo fiaskis." +msgstr "Sercxo fiaskis." -#: info/session.c:3633 +#: info/session.c:3727 msgid "Repeat last search in the same direction" -msgstr "Ripetu la ¼usan seræon samdirekte" +msgstr "Ripetu la jxusan sercxon samdirekte" -#: info/session.c:3636 info/session.c:3646 +#: info/session.c:3730 info/session.c:3740 msgid "No previous search string" -msgstr "Malestas pli frua seræoæeno." +msgstr "Malestas pli frua sercxocxeno." -#: info/session.c:3643 +#: info/session.c:3737 msgid "Repeat last search in the reverse direction" -msgstr "Ripetu la ¼usan seræon alidirekte" +msgstr "Ripetu la jxusan sercxon alidirekte" -#: info/session.c:3661 info/session.c:3667 +#: info/session.c:3755 info/session.c:3761 msgid "Search interactively for a string as you type it" -msgstr "Interaktive seræu æenon tajpatan" +msgstr "Interaktive sercxu cxenon tajpatan" -#: info/session.c:3761 +#: info/session.c:3855 msgid "I-search backward: " -msgstr "Interaktiva seræo malantaýen: " +msgstr "Interaktiva sercxo malantauxen: " -#: info/session.c:3763 +#: info/session.c:3857 msgid "I-search: " -msgstr "Interaktiva seræo: " +msgstr "Interaktiva sercxo: " -#: info/session.c:3788 +#: info/session.c:3882 msgid "Failing " msgstr "Fiasko " -#: info/session.c:4244 +#: info/session.c:4340 msgid "Move to the previous cross reference" -msgstr "Iru al la antaýa referenco" +msgstr "Iru al la antauxa referenco" -#: info/session.c:4253 +#: info/session.c:4349 msgid "Move to the next cross reference" msgstr "Iru al la sekva referenco" -#: info/session.c:4263 +#: info/session.c:4359 msgid "Select reference or menu item appearing on this line" -msgstr "Elektu la referencon aý la menueron de æi tiu linio" - -#. **************************************************************** -#. -#. Miscellaneous Info Commands -#. -#. **************************************************************** -#. What to do when C-g is pressed in a window. -#: info/session.c:4285 +msgstr "Elektu la referencon aux la menueron de cxi tiu linio" + +#: info/session.c:4381 msgid "Cancel current operation" -msgstr "Æesigu la kurantan operacion" +msgstr "Cxesigu la kurantan operacion" -#: info/session.c:4292 +#: info/session.c:4388 msgid "Quit" msgstr "Finu" -#: info/session.c:4301 +#: info/session.c:4397 msgid "Move the cursor to a specific line of the window" msgstr "Movu la kursoron sur indikitan linion de la fenestro" -#. Clear the screen and redraw its contents. Given a numeric argument, -#. move the line the cursor is on to the COUNT'th line of the window. -#: info/session.c:4333 +#: info/session.c:4429 msgid "Redraw the display" -msgstr "Refreþigi la ekranon" +msgstr "Refresxigi la ekranon" -#. This command does nothing. It is the fact that a key is bound to it -#. that has meaning. See the code at the top of info_session (). -#: info/session.c:4370 +#: info/session.c:4466 msgid "Quit using Info" msgstr "Eliru el Info" -#: info/session.c:4393 +#: info/session.c:4479 +msgid "Run command bound to this key's lowercase variant" +msgstr "Plenumi komandon asociitan kun cxi tiu klavo minuskligita" + +#: info/session.c:4491 #, c-format msgid "Unknown command (%s)." msgstr "Komando nekonata (%s)." -#: info/session.c:4396 +#: info/session.c:4494 msgid "\"\" is invalid" msgstr "\"\" ne validas" -#: info/session.c:4397 +#: info/session.c:4495 #, c-format msgid "\"%s\" is invalid" msgstr "\"%s\" ne validas" -#: info/session.c:4620 +#: info/session.c:4713 msgid "Add this digit to the current numeric argument" msgstr "Aldonu tiun ciferon al la kuranta argumento nombra" -#: info/session.c:4629 +#: info/session.c:4722 msgid "Start (or multiply by 4) the current numeric argument" -msgstr "Komencu (aý 4-obligu) la kurantan argumenton nombran" +msgstr "Komencu (aux 4-obligu) la kurantan argumenton nombran" -#: info/session.c:4644 +#: info/session.c:4737 msgid "Internally used by \\[universal-argument]" msgstr "Uzata interne de \\[universal-argument]" #: info/tilde.c:344 msgid "readline: Out of virtual memory!\n" -msgstr "readline: Virtuala memoro elæerpita!\n" +msgstr "readline: Virtuala memoro elcxerpita!\n" -#: info/variables.c:40 +#: info/variables.c:37 msgid "When \"On\", footnotes appear and disappear automatically" -msgstr "Æe \"On\", la piednotoj aperas kaj malaperas aýtomate" +msgstr "Cxe \"On\", la piednotoj aperas kaj malaperas auxtomate" -#: info/variables.c:44 +#: info/variables.c:41 msgid "When \"On\", creating or deleting a window resizes other windows" -msgstr "Æe \"On\", kreo aý forigo de fenestro kaýzas rearanøon de la ceteraj" +msgstr "" +"Cxe \"On\", kreo aux forigo de fenestro kauxzas rearangxon de la ceteraj" -#: info/variables.c:48 +#: info/variables.c:45 msgid "When \"On\", flash the screen instead of ringing the bell" -msgstr "Æe \"On\", anstataý bleki fulmetu la ekranon" +msgstr "Cxe \"On\", anstataux bleki fulmetu la ekranon" -#: info/variables.c:52 +#: info/variables.c:49 msgid "When \"On\", errors cause the bell to ring" -msgstr "Æe \"On\", signalu pri eraro per bleko" +msgstr "Cxe \"On\", signalu pri eraro per bleko" -#: info/variables.c:56 +#: info/variables.c:53 msgid "When \"On\", Info garbage collects files which had to be uncompressed" msgstr "" -"Æe \"On\", Info traktas makulaturon post malpako de kunpremitaj dosieroj" +"Cxe \"On\", Info traktas makulaturon post malpako de kunpremitaj dosieroj" -#: info/variables.c:59 +#: info/variables.c:56 msgid "When \"On\", the portion of the matched search string is highlighted" -msgstr "Æe \"On\", la peco kongrua al la seræoæeno emfaziøas" +msgstr "Cxe \"On\", la peco kongrua al la sercxocxeno emfazigxas" -#: info/variables.c:63 +#: info/variables.c:60 msgid "Controls what happens when scrolling is requested at the end of a node" msgstr "Determinas la konduton de rulumo fine de nodo" -#: info/variables.c:67 +#: 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" +"La nombro de linioj rulumataj kiam la kursoro movigxas ekster la fenestron" -#: info/variables.c:71 +#: info/variables.c:68 msgid "When \"On\", Info accepts and displays ISO Latin characters" -msgstr "Æe \"On\", Info akceptas kaj surekranigas la okbitajn signojn" +msgstr "Cxe \"On\", Info akceptas kaj surekranigas la okbitajn signojn" -#: info/variables.c:77 +#: info/variables.c:74 msgid "Explain the use of a variable" msgstr "Klarigu la uzon de variablo" -#. Get the variable's name. -#: info/variables.c:83 +#: info/variables.c:80 msgid "Describe variable: " msgstr "Priskribu variablon: " -#: info/variables.c:102 +#: info/variables.c:99 msgid "Set the value of an Info variable" msgstr "Valorizu Info-variablon" -#. Get the variable's name and value. -#: info/variables.c:108 +#: info/variables.c:105 msgid "Set variable: " msgstr "Valorizu variablon: " -#: info/variables.c:126 +#: info/variables.c:123 #, c-format msgid "Set %s to value (%d): " msgstr "Variablo %s ricevu la valoron (%d): " -#: info/variables.c:167 +#: info/variables.c:164 #, c-format msgid "Set %s to value (%s): " msgstr "%s ricevu la valoron (%s): " -#: info/window.c:1101 +#: info/window.c:1164 msgid "--*** Tags out of Date ***" -msgstr "--*** Etikedoj malaktualiøis ***" +msgstr "--*** Etikedoj malaktualigxis ***" -#. strlen (location_indicator). -#. 10 for the decimal representation of the number of lines in this -#. node, and the remainder of the text that can appear in the line. -#: info/window.c:1112 +#: info/window.c:1175 msgid "-----Info: (), lines ----, " msgstr "-----Info: (), linioj ----, " -#: info/window.c:1119 +#: info/window.c:1182 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "-%s---Info: %s, %d linioj --%s--" -#: info/window.c:1123 +#: info/window.c:1186 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "-%s%s-Info: (%s)%s, %d linioj --%s--" -#: info/window.c:1130 +#: info/window.c:1193 #, c-format msgid " Subfile: %s" msgstr " Subdosiero: %s" -#: lib/getopt.c:680 +#: lib/getopt.c:675 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: opcio \"%s\" estas ambigua\n" -#: lib/getopt.c:704 +#: lib/getopt.c:700 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: opcio \"--%s\" ne toleras argumenton\n" -#: lib/getopt.c:709 +#: lib/getopt.c:705 #, 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:726 lib/getopt.c:899 +#: lib/getopt.c:723 lib/getopt.c:896 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: opcio \"%s\" bezonas argumenton\n" -#. --option -#: lib/getopt.c:755 +#: lib/getopt.c:752 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: nekonata opcio \"--%s\"\n" -#. +option or -option -#: lib/getopt.c:759 +#: lib/getopt.c:756 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: nekonata opcio \"%c%s\"\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:785 +#: lib/getopt.c:782 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: misa opcio -- %c\n" -#: lib/getopt.c:788 +#: lib/getopt.c:785 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: nevalida opcio -- %c\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:818 lib/getopt.c:948 +#: lib/getopt.c:815 lib/getopt.c:945 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: opcio bezonas argumenton -- %c\n" -#: lib/getopt.c:865 +#: lib/getopt.c:862 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: opcio \"-W %s\" estas ambigua\n" -#: lib/getopt.c:883 +#: lib/getopt.c:880 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: opcio \"-W %s\" ne toleras argumenton\n" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "January" msgstr "januaro" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "February" msgstr "februaro" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "March" msgstr "marto" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "April" msgstr "aprilo" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "May" msgstr "majo" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "June" msgstr "junio" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "July" msgstr "julio" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "August" -msgstr "aýgusto" +msgstr "auxgusto" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "September" msgstr "septembro" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "October" msgstr "oktobro" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "November" msgstr "novembro" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "December" msgstr "decembro" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:658 #, c-format msgid "unlikely character %c in @var" msgstr "dubinda signo \"%c\" en @var" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:701 msgid "@sc argument all uppercase, thus no effect" -msgstr "argumento de @sc tuta majuskla, do neniel þanøiøita" +msgstr "argumento de @sc tuta majuskla, do neniel sxangxita" + +#: makeinfo/cmds.c:759 +#, c-format +msgid "`{' expected, but saw `%c'" +msgstr "\"{\" atendata, sed \"%c\" ricevita" + +#: makeinfo/cmds.c:789 +msgid "end of file inside verb block" +msgstr "dosierfino ene de pretarangxita bloko (verb block)" + +#: makeinfo/cmds.c:797 +#, c-format +msgid "`}' expected, but saw `%c'" +msgstr "\"}\" atendata, sed \"%c\" ricevita" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:942 #, c-format msgid "%c%s is obsolete" -msgstr "%c%s arkaikiøis" +msgstr "%c%s arkaikigxis" -#: makeinfo/cmds.c:814 +#: makeinfo/cmds.c:1014 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp bezonas ne \"%s\" sed pozitivan argumenton nombran" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "Misa argumento por %c%s" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142 msgid "none" msgstr "none" -#: makeinfo/defun.c:83 +#: makeinfo/defun.c:85 msgid "Missing `}' in @def arg" msgstr "Mankas \"}\" en la argumento de @def" -#: makeinfo/defun.c:358 +#: makeinfo/defun.c:363 msgid "Function" msgstr "Funkcio" -#: makeinfo/defun.c:361 +#: makeinfo/defun.c:366 msgid "Macro" msgstr "Makroo" -#: makeinfo/defun.c:364 +#: makeinfo/defun.c:369 msgid "Special Form" msgstr "Speciala Formo" -#: makeinfo/defun.c:368 +#: makeinfo/defun.c:373 msgid "Variable" msgstr "Variablo" -#: makeinfo/defun.c:371 +#: makeinfo/defun.c:376 msgid "User Option" msgstr "Uzula opcio" -#: makeinfo/defun.c:375 +#: makeinfo/defun.c:380 msgid "Instance Variable" msgstr "Ekzemplera variablo" -#: makeinfo/defun.c:379 +#: makeinfo/defun.c:384 msgid "Method" msgstr "Metodo" -#: makeinfo/defun.c:450 makeinfo/defun.c:454 makeinfo/defun.c:556 -#: makeinfo/defun.c:570 makeinfo/defun.c:610 +#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615 +#: makeinfo/defun.c:631 makeinfo/defun.c:671 msgid "of" msgstr "de" -#: makeinfo/defun.c:458 makeinfo/defun.c:462 makeinfo/defun.c:466 -#: makeinfo/defun.c:564 makeinfo/defun.c:615 +#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482 +#: makeinfo/defun.c:624 makeinfo/defun.c:676 msgid "on" msgstr "sur" -#: makeinfo/defun.c:656 +#: makeinfo/defun.c:717 #, c-format msgid "Must be in `%s' insertion to use `%sx'" -msgstr "Nur en \"%s\"-enþovo uzeblas \"%s\"x." +msgstr "Nur en \"%s\"-ensxovo uzeblas \"%sx\"." -#: makeinfo/files.c:460 +#: makeinfo/files.c:448 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" msgstr "\"%c%s\" bezonas argumenton \"{...}\", ne nuran \"%s\"" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" msgstr "Mankas \"}\" por la piednoto \"%s\"" -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" msgstr "Piednoto difinita sen patra nodo" -#: makeinfo/footnote.c:278 +#: makeinfo/footnote.c:210 +msgid "Footnotes inside footnotes are not allowed" +msgstr "Maleblas fari piednoton al piednoto" + +#: makeinfo/footnote.c:298 msgid "Footnotes" msgstr "Piednotoj" -#. The <title> should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:42 msgid "Untitled" msgstr "Sen titolo" -#: makeinfo/index.c:212 +#: makeinfo/html.c:298 +#, c-format +msgid "Invalid node name: `%s'" +msgstr "Misa nodnomo: \"%s\"" + +#: makeinfo/index.c:213 #, c-format msgid "Unknown index `%s'" msgstr "Nekonata indekso \"%s\"" -#: makeinfo/index.c:382 +#: makeinfo/index.c:238 +#, c-format +msgid "Info cannot handle `:' in index entry `%s'" +msgstr "Info ne povas trakti \":\" en indeksa artikolo \"%s\"" + +#: makeinfo/index.c:396 #, c-format msgid "Index `%s' already exists" msgstr "Jam estas indekso \"%s\"" -#: makeinfo/index.c:425 +#: makeinfo/index.c:439 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" -msgstr "Nekonata indekso \"%s\" kajaý \"%s\" en @synindex" +msgstr "Nekonata indekso \"%s\" kajaux \"%s\" en @synindex" -#: makeinfo/index.c:642 +#: makeinfo/index.c:666 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Nekonata indekso \"%s\" en @printindex" -#: makeinfo/index.c:680 +#: makeinfo/index.c:709 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "Artikolo por indekso \"%s\" estas ekster iu ajn nodo" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:712 makeinfo/index.c:751 msgid "(outside of any node)" msgstr "(ekster iu ajn nodo)" -#: makeinfo/insertion.c:192 +#: makeinfo/insertion.c:198 msgid "Broken-Type in insertion_type_pname" msgstr "Misa tipo en la funkcio insertion_type_pname" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:271 msgid "Enumeration stack overflow" msgstr "Troo en la stako de enumeracioj" -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:303 #, c-format msgid "lettering overflow, restarting at %c" msgstr "mankas sekva enumeracia litero, rekomencite ekde %c" -#: makeinfo/insertion.c:481 +#: makeinfo/insertion.c:538 #, c-format msgid "%s requires an argument: the formatter for %citem" -msgstr "%s bezonas argumenton: la aranøilon por %citem" +msgstr "%s bezonas argumenton: la arangxilon por %citem" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:693 #, c-format msgid "`@end' expected `%s', but saw `%s'" msgstr "\"@end\" atendis \"%s\", sed renkontis \"%s\"" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:931 #, c-format msgid "No matching `%cend %s'" msgstr "Mankas para \"%cend %s\"" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:1084 #, c-format msgid "%s requires letter or digit" -msgstr "%s bezonas literon aý ciferon" +msgstr "%s bezonas literon aux ciferon" -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1158 +msgid "end of file inside verbatim block" +msgstr "dosierfino ene de pretarangxita bloko" + +#: makeinfo/insertion.c:1318 msgid "@menu seen before first @node, creating `Top' node" -msgstr "@menu jam antaý la unua @nodo; nodo \"Top\" kreitas" +msgstr "@menu jam antaux la unua @nodo; nodo \"Top\" kreitas" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1319 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" -msgstr "eble via @top-nodo staru sub @ifnottex anstataý sub @ifinfo?" +msgstr "eble via @top-nodo staru sub @ifnottex anstataux sub @ifinfo?" -#. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1331 msgid "@detailmenu seen before first node, creating `Top' node" -msgstr "@detailmenu renkontita jam antaý la unua nodo; nodo \"Top\" kreitas" +msgstr "@detailmenu renkontita jam antaux la unua nodo; nodo \"Top\" kreitas" -#: makeinfo/insertion.c:1074 +#: makeinfo/insertion.c:1346 #, c-format msgid "Unmatched `%c%s'" msgstr "Mankas para \"%c%s\"" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1353 #, c-format msgid "`%c%s' needs something after it" msgstr "\"%c%s\" bezonas post si ion" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1359 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" msgstr "Misa argumento por \"%s\", \"%s\", uzanta \"%s\"" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1453 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s estas sensenca ene de bloko \"@%s\"" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1462 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx estas sensenca ene de bloko \"%s\"" -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1646 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s renkontita ekster \"insertion block\"" -#: makeinfo/lang.c:199 +#: makeinfo/lang.c:331 #, c-format msgid "%s is not a valid ISO 639 language code" -msgstr "%s ne estas valida lingvokodo laý ISO 639" +msgstr "%s ne estas valida lingvokodo laux ISO 639" + +#: makeinfo/lang.c:384 +#, c-format +msgid "unrecogized encoding name `%s'" +msgstr "nekonata nomo de kodosistemo: %s\"" + +#: makeinfo/lang.c:387 +#, c-format +msgid "sorry, encoding `%s' not supported" +msgstr "Pardonon, la kodo \"%s\" ne estas disponebla" + +#: makeinfo/lang.c:414 +#, c-format +msgid "invalid encoded character `%s'" +msgstr "misa kodoprezento: \"%s\"" + +#: makeinfo/lang.c:502 +#, c-format +msgid "%s is an invalid ISO code, using %c" +msgstr "\"%s\" ne estas valida ISO-kodo; estos \"%c\" anstatauxe" -#. This error message isn't perfect if the argument is multiple -#. characters, but it doesn't seem worth getting right. -#: makeinfo/lang.c:406 +#: makeinfo/lang.c:687 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" -msgstr "%c%s atendas argumenton \"i\" aý \"j\", ne \"%c\"" +msgstr "%c%s atendas argumenton \"i\" aux \"j\", ne \"%c\"" -#: makeinfo/lang.c:410 +#: makeinfo/lang.c:691 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" -msgstr "%c%s akceptas nur solsignan argumenton \"i\" aý \"j\"" +msgstr "%c%s akceptas nur solsignan argumenton \"i\" aux \"j\"" #: makeinfo/macro.c:134 #, c-format msgid "macro `%s' previously defined" -msgstr "makroo \"%s\" jam difinita antaýe" +msgstr "makroo \"%s\" jam difinita antauxe" #: makeinfo/macro.c:138 #, c-format msgid "here is the previous definition of `%s'" -msgstr "æi tie estas la antaýa difino de \"%s\"" +msgstr "cxi tie estas la antauxa difino de \"%s\"" #: makeinfo/macro.c:355 #, c-format msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name" -msgstr "en makroo, \\ sekvata de \"%s\" (anstataý de \\ aý nomo de parametro)" +msgstr "" +"en makroo, \\ sekvata de \"%s\" (anstataux de \\ aux nomo de parametro)" #: makeinfo/macro.c:403 #, c-format msgid "Macro `%s' called on line %d with too many args" msgstr "Makroo \"%s\" en la linio %d havas troan argumenton" -#: makeinfo/macro.c:595 +#: makeinfo/macro.c:594 #, c-format msgid "%cend macro not found" -msgstr "makroo %cend ne troviøis" +msgstr "makroo %cend ne trovigxis" -#: makeinfo/macro.c:634 +#: makeinfo/macro.c:632 msgid "@quote-arg only useful for single-argument macros" msgstr "@quote-arg utilas nur en sol-argumentaj makrooj" -#: makeinfo/macro.c:670 +#: makeinfo/macro.c:668 #, c-format msgid "mismatched @end %s with @%s" msgstr "misa @end %s por @%s" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:316 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: averto: " -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:339 msgid "Too many errors! Gave up.\n" msgstr "Tro multe da eraroj! Halt'.\n" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026 #, c-format msgid "Misplaced %c" msgstr "Misloka %c" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:370 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Por pluaj detaloj tajpu \"%s --help\".\n" -#: makeinfo/makeinfo.c:365 +#: makeinfo/makeinfo.c:373 #, c-format +msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" +msgstr "Uzmaniero: %s [OPCIO]... TEXINFO-DOSIERO...\n" + +#: makeinfo/makeinfo.c:376 msgid "" -"Usage: %s [OPTION]... TEXINFO-FILE...\n" -"\n" -"Translate Texinfo source documentation to various other formats:\n" -"Info files suitable for reading online with Emacs or standalone GNU Info\n" -"(by default); plain text (with --no-headers); or HTML (with --html).\n" -"\n" -"Options:\n" -" --commands-in-node-names allow @ commands in node names.\n" -" -D VAR define a variable, as with @set.\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" --error-limit=NUM quit after NUM errors (default %d).\n" -" --fill-column=NUM break Info lines at NUM characters (default %d).\n" -" --footnote-style=STYLE output footnotes according to STYLE:\n" -" `separate' to place footnotes in their own " -"node,\n" -" `end' to place the footnotes at the end of the\n" -" node in which they are defined (the default).\n" -" --force preserve output even if errors.\n" -" --help display this help and exit.\n" -" --html output HTML rather than Info format;\n" -" -I DIR append DIR to the @include search path.\n" -" --ifhtml process @ifhtml and @html text even when not\n" -" generating HTML.\n" -" --ifinfo process @ifinfo text even when generating HTML.\n" -" --iftex process @iftex and @tex text.\n" -" implies --no-split.\n" -msgstr "" - -#: makeinfo/makeinfo.c:391 -#, fuzzy, c-format +"Translate Texinfo source documentation to various other formats, by default\n" +"Info files suitable for reading online with Emacs or standalone GNU Info.\n" +msgstr "" +"Tradukas fontan Texinfo-dokumenton en diversajn aliajn formojn, defauxlte " +"en\n" +"Info-dosierojn tauxgajn por dialoga legado per Emakso aux per auxtonoma GNU-" +"Info.\n" + +#: makeinfo/makeinfo.c:380 +#, c-format msgid "" -" --no-headers suppress Info node separators and Node: lines " -"and\n" -" write to standard output without --output.\n" -" --no-ifhtml do not process @ifhtml and @html text.\n" -" --no-ifinfo do not process @ifinfo text.\n" -" --no-iftex do not process @iftex and @tex text.\n" -" --no-split suppress splitting of large Info output files or\n" -" generation of one HTML file per node.\n" -" --no-validate suppress node cross-reference validation.\n" -" --no-warn suppress warnings (but not errors).\n" -" --number-sections include chapter, section, etc. numbers in " -"output.\n" -" -o, --output=FILE output to FILE, ignoring any @setfilename.\n" -" -P DIR prepend DIR to the @include search path.\n" -" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " +"General options:\n" +" --error-limit=NUM quit after NUM errors (default %d).\n" +" --force preserve output even if errors.\n" +" --help display this help and exit.\n" +" --no-validate suppress node cross-reference validation.\n" +" --no-warn suppress warnings (but not errors).\n" +" --reference-limit=NUM warn about at most NUM references (default %" +"d).\n" +" -v, --verbose explain what is being done.\n" +" --version display version information and exit.\n" +msgstr "" +"Gxeneralaj opcioj:\n" +" --error-limit=NOM Cxesu post NOM eraroj (defauxlte %d).\n" +" --force Retenu eligajxon ecx post eraroj.\n" +" --help Eligu cxi tiun helpon kaj finu.\n" +" --no-validate Ne kontrolu la internodajn referencojn.\n" +" --no-warn Ne eligu avertojn (ne koncernas " +"erarmesagxojn).\n" +" --reference-limit=NUM Avertu pri ne pli ol N referencoj (defauxlte " "%d).\n" -" if VAL is `none', do not indent;\n" -" if VAL is `asis', preserve existing " -"indentation.\n" -" --reference-limit=NUM warn about at most NUM references (default %d).\n" -" -U VAR undefine a variable, as with @clear.\n" -" -v, --verbose explain what is being done.\n" -" --version display version information and exit.\n" -msgstr "" -" --ifhtml Traktu @ifhtml kaj @html, eæ se HTML ne estas " -"celformo\n" -" --ifinfo Traktu @ifinfo, eæ tradukante al HTML\n" -" --iftex Traktu la pecojn en @iftex kaj @tex\n" -" --macro-expand, -E DRO Metu en eligdosieron DRO la Texinfo-tekston " -"ricevitan\n" -" per makrotraktado\n" -" --no-headers Ne dispartigu en la nodojn, ne faru la liniojn\n" -" \"Node:\"; eligu en la æefeligujon eæ sen " -"--output\n" -" --no-ifhtml Preterigu la tekston sub @ifhtml kaj @html\n" -" --no-ifinfo Preterigu la tekston sub @ifinfo\n" -" --no-iftex Preterigu la tekston sub @iftex kaj @tex\n" -" --no-split Ne disfendu grandan Info-dosieron, nek apartigu\n" -" æiun nodon en apartan HTML-dosieron\n" -" --no-validate Abolu la kontrolon de la internodaj referencoj\n" -" --no-warn Ne eligu la avertojn (ne koncernas la erarmesaøojn)\n" -" --number-sections Generu kun la numeroj de æapitroj, sekcioj ktp \n" -" -o, --output=DOSIERO Skribu en DOSIEROn, malatentante @setfilename\n" -" --paragraph-indent=VAL Alinea enþovo estu VAL spacetoj (defaýlte %d);\n" -" se VAL estas \"none\", ne enþovu;\n" -" se VAL estas \"asis\", obeu ekzistantan enþovon\n" -" --reference-limit N Avertu post pli ol N referencoj (defaýlte %d)\n" -" -v, --verbose Rakontu kio estas farata\n" -" --version Eligu la nomon, la version de la programo kaj eliru\n" +" -v, --verbose Rakontu kio estas farata.\n" +" --version Eligu la nomon, la version de la programo kaj " +"eliru.\n" + +#: makeinfo/makeinfo.c:394 +#, fuzzy, no-wrap +msgid "" +"Output format selection (default is to produce Info):\n" +" --docbook output DocBook rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output XML (TexinfoML) rather than Info.\n" +msgstr "" +"Por elekti celformon (defauxlte, Info):\n" +" --docbook Generu en DocBook anstataux en Info.\n" +" --html Generu en HTML anstataux en Info.\n" +" --no-headers Generu platan tekston, sen dispartigi en nodojn,\n" +" sen fari la liniojn \"Node:\";\n" +" eligu en la cxefeligujon manke de --output.\n" +" --xml Generu en XML (TexinfoML) anstataux en Info.\n" + +#: makeinfo/makeinfo.c:401 +#, 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" +msgstr "" +"Gxeneralaj opcioj generadaj:\n" +" -E, --macro-expand DOSIER Konservu makrotraktitan fontajxon en DOSIERo,\n" +" sen atenti cxiajn @setfilename.\n" +" --no-split Ne disfendu grandan Info- aux HTML-dosieron,\n" +" faru unu solan rezultan dosieron.\n" +" --number-sections Generu kun la numeroj de cxapitroj, sekcioj " +"ktp.\n" +" -o, --output=DOSIER Skribu en DOSIERon (DOSIERujon, por fenda " +"HTML).\n" #: makeinfo/makeinfo.c:415 +#, 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" +" --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" +" If VAL is `none', do not indent; if VAL is\n" +" `asis', preserve existing indentation.\n" +" --split-size=NUM split Info files at size NUM (default %d).\n" +msgstr "" +"Opcioj por Info kaj plata teksto:\n" +" --enable-encoding Eligu diakritajxojn kaj specialajn signojn\n" +" laux @documentencoding.\n" +" --fill-column=N Rompu Info-liniojn post N signoj (defauxlte %" +"d)\n" +" --footnote-style=STILO Arangxu la piednotojn laux STILO:\n" +" \"separate\" -- loku piednotojn en apartan " +"nodon;\n" +" \"end\" -- loku ilin fine de la nodo en " +"kiu\n" +" ili estas difinitaj (la defauxlto).\n" +" --paragraph-indent=VAL Alinea ensxovo estu VAL spacetoj (defauxlte %" +"d);\n" +" se VAL estas \"none\", ne ensxovu;\n" +" se VAL estas \"asis\", obeu la fontan " +"ensxovon.\n" +" --split-size=N Fendu en dosierojn po N (defauxlte %d).\n" + +#: makeinfo/makeinfo.c:433 +msgid "" +"Input file options:\n" +" --commands-in-node-names allow @ commands in node names.\n" +" -D VAR define the variable VAR, as with @set.\n" +" -I DIR append DIR to the @include search path.\n" +" -P DIR prepend DIR to the @include search path.\n" +" -U VAR undefine the variable VAR, as with @clear.\n" +msgstr "" +"Opcioj pri la fontodosieroj:\n" +" --commands-in-node-names Permesu @-komandojn en nodnomoj.\n" +" -D VAR Difinu la variablon VAR, kiel per @set.\n" +" -I UJO Alkrocxu dosierUJOn al la sercxvojo de " +"@include.\n" +" -P UJO Antauxmetu dosierUJOn al la sercxvojo de " +"@include.\n" +" -U VAR Maldifinu la variablon VAR, kiel per " +"@clear.\n" + +#: makeinfo/makeinfo.c:442 +#, fuzzy +msgid "" +"Conditional processing in input:\n" +" --ifhtml process @ifhtml and @html even if not generating HTML.\n" +" --ifinfo process @ifinfo even if not generating Info.\n" +" --ifplaintext process @ifplaintext even if not generating plain text.\n" +" --iftex process @iftex and @tex; implies --no-split.\n" +" --no-ifhtml do not process @ifhtml and @html text.\n" +" --no-ifinfo do not process @ifinfo text.\n" +" --no-ifplaintext do not process @ifplaintext text.\n" +" --no-iftex do not process @iftex and @tex text.\n" +msgstr "" +"Kondicxa traktado cxe enigo:\n" +" --ifhtml Traktu la pecojn sub @ifhtml kaj @html ecx se\n" +" HTML ne estas generata\n" +" --ifinfo Traktu la pecojn sub @ifinfo ecx generante HTML\n" +" --iftex Traktu la pecojn sub @iftex kaj @tex; implicas --no-split.\n" +" --no-ifhtml Ne traktu la pecojn sub @ifhtml kaj @html.\n" +" --no-ifinfo Ne traktu la pecojn sub @ifinfo.\n" +" --no-iftex Ne traktu la pecojn sub @iftex and @tex.\n" + +#: makeinfo/makeinfo.c:454 +#, fuzzy +msgid "" +" The defaults for the @if... conditionals depend on the output format:\n" +" if generating HTML, --ifhtml is on and the others are off;\n" +" if generating Info, --ifinfo is on and the others are off;\n" +" if generating plain text, --ifplaintext is on and the others are off;\n" +msgstr "" +"La defauxlta konduto de la @if...-frazoj dependas je la celata formo:\n" +"se HTML estas generata, --ifhtml sxaltigxas kaj la ceteraj, malsxaltigxas;\n" +"se Info aux plata teksto estas generata, --ifinfo sxaltigxas kaj la\n" +"ceteraj, malsxaltigxas.\n" + +#: makeinfo/makeinfo.c:461 +#, fuzzy msgid "" -"\n" -"The defaults for the @if... conditionals depend on the output format:\n" -"if generating HTML, --ifhtml is on and the others are off;\n" -"if generating Info or plain text, --ifinfo is on and the others are off.\n" -"\n" "Examples:\n" -" makeinfo foo.texi write Info to foo's @setfilename\n" -" makeinfo --html foo.texi write HTML to foo's @setfilename\n" -" makeinfo --no-headers -o - foo.texi write plain text to standard output\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 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" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org." +" 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 "" -"\n" -"La defaýlta konduto de la @if...-frazoj dependas je la celata formo:\n" -"se HTML estas generata, --ifhtml þaltiøas kaj la ceteraj, malþaltiøas;\n" -"se Info aý plata teksto estas generata, --ifinfo þaltiøas kaj la\n" -"ceteraj, malþaltiøas.\n" "Ekzemploj:\n" -" makeinfo UM.texi konservu Info laý @setfilename de UM\n" -" makeinfo --html UM.texi konservu HTML laý @setfilename de UM\n" -" makeinfo --no-headers -o - UM.texi sendu platan tekston en æefeligujon\n" +" makeinfo UM.texi konservu Info laux @setfilename de UM\n" +" makeinfo --html UM.texi konservu HTML laux @setfilename de UM\n" +" makeinfo --no-headers -o - UM.texi sendu platan tekston en cxefeligujon\n" " makeinfo --number-sections UM.texi konservu Info kun la sekcinumeroj\n" " makeinfo --no-split UM.texi faru unu Info-dosieron, kiom ajn " "grandan\n" -"\n" -"Erarraportojn sendu al <bug-texinfo@gnu.org>; øeneralajn demandojn kaj\n" -"opiniojn al <help-texinfo@gnu.org>. Por la diskutoj pri esperantigo\n" -"uzu la dissendoliston <eo@li.org>." -#: makeinfo/makeinfo.c:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655 +#: makeinfo/makeinfo.c:676 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: la argumento %s devas esti nombra, ne \"%s\".\n" -#: makeinfo/makeinfo.c:521 +#: makeinfo/makeinfo.c:583 #, c-format msgid "Couldn't open macro expansion output `%s'" msgstr "Fiaskis malfermo de makrotraktada eligdosiero \"%s\"" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:586 msgid "Cannot specify more than one macro expansion output" msgstr "Ne povas esti pli ol unu makrotraktada eligdosiero" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:624 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" -"%s: argumento de la opcio --paragraph-indent estu nombra, \"none\" aý\n" +"%s: argumento de la opcio --paragraph-indent estu nombra, \"none\" aux\n" "\"asis\", ne \"%s\".\n" -#: makeinfo/makeinfo.c:602 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" -"%s: argumento de la opcio --footnote-style estu \"separate\" aý\n" +"%s: argumento de la opcio --footnote-style estu \"separate\" aux\n" "\"end\", ne \"%s\".\n" -#: makeinfo/makeinfo.c:647 +#: makeinfo/makeinfo.c:723 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: mankas dosiera argumento.\n" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:898 #, c-format msgid "Expected `%s'" msgstr "\"%s\" atendatas" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1365 +msgid "File exists, but is not a directory" +msgstr "" + +#: makeinfo/makeinfo.c:1366 +#, c-format +msgid "Can't create directory `%s': %s" +msgstr "Provo krei dosierujon \"%s\" malsukcesis: %s" + +#: makeinfo/makeinfo.c:1414 #, c-format msgid "No `%s' found in `%s'" msgstr "Neniu \"%s\" trovita en \"%s\"" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1496 #, 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" +msgstr "" +"%s: Makrotraktitajxo ne trafos en la cxefeligujon cxar Info iras tien.\n" -#: makeinfo/makeinfo.c:1327 +#: makeinfo/makeinfo.c:1526 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "%s-dosiero \"%s\" estas generata el \"%s\".\n" -#: makeinfo/makeinfo.c:1358 +#: makeinfo/makeinfo.c:1561 #, 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" +msgstr "Cxi tiun dosieron %s generis Makeinfo-%s el %s.\n" -#: makeinfo/makeinfo.c:1377 +#: makeinfo/makeinfo.c:1583 #, c-format 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" +"%s: La eligdosiero \"%s\" por makrotraktitajxo forigitas cxar estis eraroj;\n" +"uzu la opcion --force por gxin reteni.\n" -#. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1627 #, 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" +"%s: La eligdosiero \"%s\" forigitas cxar estis eraroj;\n" +"uzu la opcion --force por gxin reteni.\n" -#: makeinfo/makeinfo.c:1635 +#: makeinfo/makeinfo.c:1853 #, c-format msgid "Unknown command `%s'" msgstr "Nekonata komando \"%s\"." -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1875 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "Uzu vinkulojn por pasigi al \"@%s\" komandan argumenton" -#: makeinfo/makeinfo.c:1838 +#: makeinfo/makeinfo.c:2068 #, c-format msgid "%c%s expected `{...}'" msgstr "%c%s postulas vinkulojn \"{...}\"" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:2098 msgid "Unmatched }" msgstr "Senpara \"}\"" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:2148 msgid "NO_NAME!" msgstr "SEN_NOMO!" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:2169 #, c-format msgid "%c%s missing close brace" msgstr "%c%s sen \"}\"" -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 +#: makeinfo/makeinfo.c:2958 +msgid "First argument to cross-reference may not be empty" +msgstr "La unua argumento de internoda referenco ne vaku" + +#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340 msgid "see " msgstr "vidu " -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:3018 msgid "See " msgstr "Vidu " -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:3164 #, c-format msgid "`.' or `,' must follow cross reference, not %c" -msgstr "Referencon devas sekvi punkto aý komo, ne %c" +msgstr "Referencon devas sekvi punkto aux komo, ne %c" + +#: makeinfo/makeinfo.c:3212 +msgid "First argument to @inforef may not be empty" +msgstr "La unua argumento de @inforef ne vaku" -#: makeinfo/makeinfo.c:3026 +#: makeinfo/makeinfo.c:3427 #, c-format -msgid "No .png or .jpg for `%s'" -msgstr "Mankas .png or .jpg por \"%s\"" +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:3063 +#: makeinfo/makeinfo.c:3440 #, c-format -msgid "@image file `%s' unreadable: %s" -msgstr "dosiero \"%s\" en la komando @image estas nelegebla: %s" +msgid "No `%s.png' or `.jpg', and no extension supplied" +msgstr "Troveblas nek \"%s.png\" nek \".jpg\", kaj sufikso mankas" + +#: makeinfo/makeinfo.c:3490 +#, c-format +msgid "@image file `%s' (for text) unreadable: %s" +msgstr "bilddosiero \"%s\" (por teksto) estas nelegebla: %s" -#: makeinfo/makeinfo.c:3070 +#: makeinfo/makeinfo.c:3497 msgid "@image missing filename argument" msgstr "mankas dosiera argumento en la komando @image" -#: makeinfo/makeinfo.c:3259 +#: makeinfo/makeinfo.c:3690 #, c-format msgid "{No value for `%s'}" msgstr "{Mankas Valoro Por \"%s\"}" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3744 #, c-format msgid "%c%s requires a name" msgstr "%c%s bezonas nomon" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3850 #, c-format msgid "Reached eof before matching @end %s" -msgstr "Pli frue ol la para @end %s renkontiøis dosierfino" +msgstr "Pli frue ol la para @end %s renkontigxis dosierfino" -#: makeinfo/multi.c:208 +#: makeinfo/makeinfo.c:4081 +#, c-format +msgid "`%.40s...' is too long for expansion; not expanded" +msgstr "" + +#: makeinfo/multi.c:226 msgid "Missing } in @multitable template" -msgstr "Mankas \"}\" en la þablono de @multitable" +msgstr "Mankas \"}\" en la sxablono de @multitable" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:302 #, c-format msgid "ignoring stray text `%s' after @multitable" msgstr "la misa teksto \"%s\" post @multitable estas ignorita" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:375 #, c-format msgid "Too many columns in multitable item (max %d)" msgstr "Tro da kolumnoj en elemento de \"multitable\" (%d maksimume)" -#: makeinfo/multi.c:401 +#: makeinfo/multi.c:426 #, c-format msgid "Cannot select column #%d in multitable" msgstr "Maleblas elekti %d-an kolumnon en \"multitable\"." -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:529 msgid "ignoring @tab outside of multitable" msgstr "komando @tab ekster \"multitable\"; ignorita" -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:565 msgid "** Multicolumn output from last row:\n" msgstr "** Multekolumna eligo el la lasta linio:\n" -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:568 #, c-format msgid "* column #%d: output = %s\n" -msgstr "* kolumno %d-a: eliga¼o = %s\n" +msgstr "* kolumno %d-a: eligajxo = %s\n" -#: makeinfo/node.c:250 +#: makeinfo/node.c:276 #, c-format msgid "Node `%s' previously defined at line %d" msgstr "Nodo \"%s\" jam difinita en la linio %d" -#: makeinfo/node.c:514 +#: makeinfo/node.c:594 #, c-format msgid "Formatting node %s...\n" -msgstr "Estas aranøata la nodo \"%s\" ...\n" +msgstr "Estas arangxata la nodo \"%s\" ...\n" -#: makeinfo/node.c:559 +#: makeinfo/node.c:655 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" msgstr "Nodo \"%s\" bezonas subdividan komandon (e.g. %c%s)" -#: makeinfo/node.c:719 +#: makeinfo/node.c:815 #, c-format msgid "No node name specified for `%c%s' command" msgstr "Mankas nodnomo por la komando \"%c%s\"" -#: makeinfo/node.c:774 +#: makeinfo/node.c:856 makeinfo/node.c:1075 +#, 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:859 +msgid "This @anchor command ignored; references to it will not work" +msgstr "" +"Cxi tiu @anchor-komando estas ignorita; la referencoj al gxi ne funkcios" + +#: makeinfo/node.c:861 makeinfo/node.c:1078 +msgid "Rename this anchor or use the `--no-split' option" +msgstr "Alinomu la ankron aux uzu la opcion \"--no-split\"" + +#: makeinfo/node.c:891 +#, c-format +msgid "Unexpected string at end of split-HTML file `%s'" +msgstr "Nekonvena signocxeno fine de disfendita HTML-dosiero \"%s\"" + +#: makeinfo/node.c:920 msgid "Node:" msgstr "Nodo:" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 +#: makeinfo/node.c:930 msgid "Next:" msgstr "Sekva:" -#: makeinfo/node.c:793 +#: makeinfo/node.c:940 msgid "Previous:" -msgstr "Antaýa:" +msgstr "Antauxa:" -#: makeinfo/node.c:803 +#: makeinfo/node.c:950 msgid "Up:" msgstr "Supre:" -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1072 +#, 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:1077 +msgid "@anchor command ignored; references to it will not work" +msgstr "Ignorita @anchor-komando; la referencoj al gxi ne funkcios" + +#: makeinfo/node.c:1277 #, c-format msgid "%s reference to nonexistent node `%s'" msgstr "%s referencas neekzistantan nodon \"%s\"" -#: makeinfo/node.c:1029 +#: makeinfo/node.c:1294 msgid "Menu" msgstr "Menuo" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1296 msgid "Cross" msgstr "Referenco" -#: makeinfo/node.c:1115 +#: makeinfo/node.c:1380 #, c-format msgid "Next field of node `%s' not pointed to" msgstr "La kampo \"Next\" de la nodo \"%s\" ne estas reciprokita" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1383 #, c-format msgid "This node (%s) has the bad Prev" -msgstr "Æi tiu nodo (\"%s\") havas eraran kampon \"Prev\"" +msgstr "Cxi tiu nodo (\"%s\") havas eraran kampon \"Prev\"" -#: makeinfo/node.c:1133 +#: makeinfo/node.c:1395 msgid "Prev" -msgstr "Antaýa" +msgstr "Antauxa" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1438 #, 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:1180 +#: makeinfo/node.c:1442 #, c-format msgid "This node (%s) has the bad Next" -msgstr "Æi tiu nodo (\"%s\") havas eraran kampon \"Next\"" +msgstr "Cxi tiu nodo (\"%s\") havas eraran kampon \"Next\"" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1454 #, c-format msgid "`%s' has no Up field" msgstr "La nodo \"%s\" malhavas kampon \"Up\"" -#: makeinfo/node.c:1197 +#: makeinfo/node.c:1457 msgid "Up" msgstr "Supre" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1523 #, 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\"\"" +msgstr "En \"%s\" mankas menuero por \"%s\", malgraux ties ligilo \"Up\"\"" -#: makeinfo/node.c:1296 +#: makeinfo/node.c:1552 #, c-format msgid "node `%s' has been referenced %d times" msgstr "la nodo \"%s\" estis referencita %d fojojn" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1566 #, c-format msgid "unreferenced node `%s'" msgstr "la nodo \"%s\" ne estas referencita" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " msgstr "Aldono %c" -#. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" msgstr "Interna eraro (search_sectioning) \"%s\"!" -#: makeinfo/sectioning.c:468 +#: makeinfo/sectioning.c:502 #, c-format msgid "%c%s is obsolete; use %c%s instead" -msgstr "%c%s arkaikiøis; uzu %c%s anstataýe" +msgstr "%c%s arkaikigxis; uzu %c%s anstatauxe" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:518 #, c-format msgid "Node with %ctop as a section already exists" msgstr "Jam estas nodo kun sekcio %ctop" -#: makeinfo/sectioning.c:496 +#: makeinfo/sectioning.c:526 #, c-format msgid "Here is the %ctop node" msgstr "Jen estas la nodo %ctop" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:543 #, c-format msgid "%ctop used before %cnode, defaulting to %s" -msgstr "%ctop aperis pli frue ol %cnode; la defaýlto uzota estas %s" +msgstr "%ctop aperis pli frue ol %cnode; la defauxlto uzota estas %s" -#. in case we are writing stdout -#: makeinfo/toc.c:212 makeinfo/toc.c:261 makeinfo/toc.c:262 +#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299 msgid "Table of Contents" msgstr "Enhavtabelo" -#. in case we are writing stdout -#: makeinfo/toc.c:292 makeinfo/toc.c:319 makeinfo/toc.c:320 +#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367 msgid "Short Contents" msgstr "Maldetala enhavtabelo" -#: makeinfo/toc.c:354 +#: makeinfo/toc.c:406 #, c-format msgid "%s: TOC should be here, but it was not found" -msgstr "%s: æi tie mankas enhavtabelo" +msgstr "%s: cxi tie mankas enhavtabelo" + +#: makeinfo/xml.c:1108 +#, c-format +msgid "@image file `%s' unreadable: %s" +msgstr "dosiero \"%s\" en la komando @image estas nelegebla: %s" #: util/install-info.c:151 #, c-format @@ -2230,7 +2688,7 @@ msgstr "%s: averto: " #: util/install-info.c:176 util/install-info.c:189 msgid "virtual memory exhausted" -msgstr "virtuala memoro elæerpitas" +msgstr "virtuala memoro elcxerpitas" #: util/install-info.c:232 #, c-format @@ -2277,48 +2735,42 @@ msgid "" " If you don't specify any sections, they are determined\n" " from information in the Info file itself.\n" " --version display version information and exit.\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" "Sintakso: %s [OPCIO]... [INFO-DOSIERO [DIR-DOSIERO]]\n" "\n" -"Instalu aý forigu \"dir\"-a¼ojn el INFO-DOSIERO en la Info-katalogo\n" +"Instalu aux forigu \"dir\"-ajxojn el INFO-DOSIERO en la Info-katalogo\n" " DIR-DOSIERO.\n" "\n" "Opcioj:\n" -"--delete Forigu la ekzistantajn \"dir\"-a¼ojn pri INFO-DOSIERO;\n" -" ne enþovu iun ajn novan \"dir\"-a¼on.\n" +"--delete Forigu la ekzistantajn \"dir\"-ajxojn pri INFO-DOSIERO;\n" +" ne ensxovu iun ajn novan \"dir\"-ajxon.\n" "--dir-file=NOMO Indiku la dosieran NOMOn de Info-katalogo.\n" " Samkiel uzi la argumenton DIR-DOSIERO.\n" -"--entry=TEKSTO Enþovu TEKSTOn kiel\"dir\"-a¼ojn por Info-katalogo.\n" -" TEKSTO havu la formon de menuera linio plus nul aý\n" +"--entry=TEKSTO Ensxovu TEKSTOn kiel \"dir\"-ajxojn por Info-katalogo.\n" +" TEKSTO havu la formon de menuera linio plus nul aux\n" " pluraj linioj kromaj, komencantaj per blanka spaco.\n" -" Se estas pli ol unu \"dir\"-a¼o, ili æiuj aldoniøos.\n" -" Se estas nenia \"dir\"-a¼o, aldoniøos \"dir\"-a¼oj\n" +" Se estas pli ol unu \"dir\"-ajxo, ili cxiuj aldonigxos.\n" +" Se estas nenia \"dir\"-ajxo, aldonigxos \"dir\"-ajxoj\n" " determinitaj el la informoj de la Info-dosiero.\n" "--help Eligu la helpon.\n" "--info-file=DOSIERO Indiku Info-DOSIEROn instalendan en la Info-katalogo.\n" " Samkiel uzi la argumenton INFO-DOSIERO.\n" "--info-dir=UJO Sinonimo por --dir-file=UJO/dir.\n" "--item=TEKSTO Sinonimo por --entry=TEKSTO\n" -" Æiu \"dir\"-a¼o fakte estas menuero.\n" +" Cxiu \"dir\"-ajxo fakte estas menuero.\n" "--quiet Ne eligu avertojn.\n" "--remove Sinonimo por --delete.\n" -"--section=SEKC Metu la \"dir\"-a¼ojn en sekcion SEKC de la " -"Info-katalogo.\n" -" Se pli ol unu sekcio estas indikitaj, æiuj \"dir\"-a¼oj\n" -" aldoniøas en ilin æiujn. Se neniu sekcio estas " +"--section=SEKC Metu la \"dir\"-ajxojn en sekcion SEKC de la Info-" +"katalogo.\n" +" Se pli ol unu sekcio estas indikitaj, cxiuj \"dir\"-" +"ajxoj\n" +" aldonigxas en ilin cxiujn. Se neniu sekcio estas " "indikita,\n" -" ili determiniøos el la informoj de la Info-dosiero.\n" +" ili determinigxos el la informoj de la Info-dosiero.\n" "--version Eligu la nomon, la version de la programo kaj eliru.\n" -"\n" -"Erarraportojn sendu al <bug-texinfo@gnu.org>; øeneralajn demandojn kaj\n" -"opiniojn al <help-texinfo@gnu.org>. Por la diskutoj pri esperantigo uzu\n" -"dissendoliston <eo@li.org>.\n" -#: util/install-info.c:442 -#, fuzzy, c-format +#: util/install-info.c:444 +#, c-format msgid "" "This is the file .../info/dir, which contains the\n" "topmost node of the Info hierarchy, called (dir)Top.\n" @@ -2336,119 +2788,113 @@ msgid "" "\n" "* Menu:\n" msgstr "" -"Æi tio estas la dosiero .../info/dir, entenanta la pinton de la \n" -"la hierarkio Info -- la æefkatalogan nodon nomatan (dir)Top.\n" -"Unuafoje lanæinte la programon Info, vi trafas en tiun nodon.\n" +"Cxi tio estas la dosiero .../info/dir, entenanta la pinton de la \n" +"la hierarkio Info -- la cxefkatalogan nodon nomatan (dir)Top.\n" +"Unuafoje lancxinte la programon Info, vi trafas en tiun nodon.\n" " \n" -"File: dir,\tNode: Top,\tLa pinto de la INFO-hierarkio\n" +"%s\\tLa pinto de la INFO-hierarkio\n" "\n" -" Æi tie (en la Info-katalogo) estas menuo de la æefaj temoj.\n" -" Tajpu \"q\" por eliri; \"?\" por eligi æiujn komandojn de Info;\n" -" \"d\" por reveni æi tien; \"h\" vokas lernilon por komencantoj;\n" +" Cxi tie (en la Info-katalogo) estas menuo de la cxefaj temoj.\n" +" Tajpu \"q\" por eliri; \"?\" por eligi cxiujn komandojn de Info;\n" +" \"d\" por reveni cxi tien; \"h\" vokas lernilon por komencantoj;\n" " \"mEmacs<Return>\" disponigas la manlibron pri Emakso; ktp.\n" "\n" -" Se vi legas per Emakso, alklaku menueron aý referencon per la 2-a\n" +" Se vi legas per Emakso, alklaku menueron aux referencon per la 2-a\n" " musbutono por elekti la temon.\n" "\n" "* Menu:\n" -#: util/install-info.c:465 +#: util/install-info.c:467 #, 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:549 +#: util/install-info.c:551 #, c-format msgid "%s: empty file" msgstr "%s: malplena dosiero" -#: util/install-info.c:864 util/install-info.c:904 +#: util/install-info.c:866 util/install-info.c:906 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:899 +#: util/install-info.c:901 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:1147 util/install-info.c:1157 +#: util/install-info.c:1150 util/install-info.c:1160 #, c-format msgid "%s: Specify the Info directory only once.\n" msgstr "%s: Indiku la Info-katalogon solfoje.\n" -#: util/install-info.c:1192 +#: util/install-info.c:1195 #, c-format msgid "%s: Specify the Info file only once.\n" msgstr "%s: Indiku la Info-dosieron solfoje.\n" -#: util/install-info.c:1241 +#: util/install-info.c:1244 #, c-format msgid "excess command line argument `%s'" msgstr "troa argumento komandlinia: \"%s\"" -#: util/install-info.c:1245 +#: util/install-info.c:1248 msgid "No input file specified; try --help for more information." msgstr "Mankas enigdosiero; provu --help por pluaj informoj." -#: util/install-info.c:1247 +#: util/install-info.c:1251 msgid "No dir file specified; try --help for more information." msgstr "Mankas dosiero Info-katalogo (dir); provu --help por pluaj informoj." -#. No need to abort here, the original info file may not -#. have the requisite Texinfo commands. This is not -#. something an installer should have to correct (it's a -#. problem for the maintainer), and there's no need to cause -#. subsequent parts of `make install' to fail. -#: util/install-info.c:1269 +#: util/install-info.c:1273 #, c-format msgid "no info dir entry in `%s'" -msgstr "Nenia informo por Info-katalogo troviøis en \"%s\"" +msgstr "Nenia informo por Info-katalogo trovigxis en \"%s\"" -#: util/install-info.c:1384 +#: util/install-info.c:1388 #, c-format msgid "menu item `%s' already exists, for file `%s'" msgstr "menuero \"%s\" jam ekzistas (por la dosiero \"%s\")" -#: util/install-info.c:1407 +#: util/install-info.c:1411 #, c-format msgid "no entries found for `%s'; nothing deleted" -msgstr "Troviøis nenia informo Info-kataloga pri \"%s\"; nenio iøis forigita" +msgstr "Trovigxis nenia informo Info-kataloga pri \"%s\"; nenio igxis forigita" -#: util/texindex.c:244 +#: util/texindex.c:245 msgid "display this help and exit" -msgstr "eligu æi tiun helpon kaj eliru" +msgstr "eligu cxi tiun helpon kaj eliru" -#: util/texindex.c:246 +#: util/texindex.c:247 msgid "keep temporary files around after processing" msgstr "konservu la labordosierojn post la traktado" -#: util/texindex.c:248 +#: util/texindex.c:249 msgid "do not keep temporary files around after processing (default)" -msgstr "ne konservu la labordosierojn post la traktado (defaýlto)" +msgstr "ne konservu la labordosierojn post la traktado (defauxlto)" -#: util/texindex.c:250 +#: util/texindex.c:251 msgid "send output to FILE" -msgstr "sendu la eliga¼on en DOSIEROn" +msgstr "sendu la eligajxon en DOSIEROn" -#: util/texindex.c:252 +#: util/texindex.c:253 msgid "display version information and exit" msgstr "eligu la uzatan version kaj eliru" -#: util/texindex.c:263 +#: util/texindex.c:264 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Uzmaniero: %s [OPCIO]... DOSIERO...\n" -#: util/texindex.c:264 +#: util/texindex.c:265 msgid "Generate a sorted index for each TeX output FILE.\n" -msgstr "Generu ordigitan indekson por æiu TeX-a elig-DOSIERO.\n" +msgstr "Generu ordigitan indekson por cxiu TeX-a elig-DOSIERO.\n" -#: util/texindex.c:267 +#: util/texindex.c:268 #, 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" -#. avoid trigraph in cat-id-tbl.c -#: util/texindex.c:269 +#: util/texindex.c:270 msgid "" "\n" "Options:\n" @@ -2456,97 +2902,28 @@ msgstr "" "\n" "Opcioj:\n" -#: util/texindex.c:285 -msgid "" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" -msgstr "" -"\n" -"Erarraportojn sendu al <bug-texinfo@prep.ai.mit.edu>; øeneralajn\n" -"demandojn kaj opiniojn al <help-texinfo@gnu.org>. Por la diskutoj\n" -"pri Esperanto-traduko uzu la dissendoliston <eo@li.org>.\n" - -#: util/texindex.c:885 util/texindex.c:919 util/texindex.c:995 -#: util/texindex.c:1023 +#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997 +#: util/texindex.c:1025 #, c-format msgid "%s: not a texinfo index file" -msgstr "%s: ne indeksa dosiero laý Texinfo" +msgstr "%s: ne indeksa dosiero laux Texinfo" -#: util/texindex.c:980 +#: util/texindex.c:982 #, c-format msgid "failure reopening %s" -msgstr "fiasko æe remalfermo de %s" +msgstr "fiasko cxe remalfermo de %s" -#: util/texindex.c:1222 +#: util/texindex.c:1224 #, c-format msgid "No page number in %s" -msgstr "Mankas paønumero en %s" +msgstr "Mankas pagxnumero en %s" -#: util/texindex.c:1293 +#: util/texindex.c:1295 #, c-format msgid "entry %s follows an entry with a secondary name" msgstr "la artikolo %s sekvas artikolon kun kromnomo" -#: util/texindex.c:1631 +#: util/texindex.c:1633 #, c-format msgid "%s; for file `%s'.\n" msgstr "%s; por la dosiero \"%s\".\n" - -#~ msgid "" -#~ "---------- Footnotes ----------\n" -#~ "\n" -#~ msgstr "" -#~ "---------- Piednotoj ----------\n" -#~ "\n" - -#~ msgid "" -#~ "Usage: %s [OPTION]... TEXINFO-FILE...\n" -#~ "\n" -#~ "Translate Texinfo source documentation to various other formats:\n" -#~ "Info files suitable for reading online with Emacs or standalone GNU Info\n" -#~ "(by default); plain text (with --no-headers); or HTML (with --html).\n" -#~ "\n" -#~ "Options:\n" -#~ " -D VAR define a variable, as with @set.\n" -#~ " -I DIR append DIR to the @include search path.\n" -#~ " -P DIR prepend DIR to the @include search path.\n" -#~ " -U VAR undefine a variable, as with @clear.\n" -#~ " --commands-in-node-names allow @ commands in node names.\n" -#~ " --error-limit=NUM quit after NUM errors (default %d).\n" -#~ " --fill-column=NUM break Info lines at NUM characters (default %d).\n" -#~ " --footnote-style=STYLE output footnotes according to STYLE:\n" -#~ " `separate' to place footnotes in their own " -#~ "node,\n" -#~ " `end' to place the footnotes at the end of the\n" -#~ " node in which they are defined (the default).\n" -#~ " --force preserve output even if errors.\n" -#~ " --help display this help and exit.\n" -#~ " --html output HTML rather than Info format;\n" -#~ " implies --no-split.\n" -#~ msgstr "" -#~ "Sintakso: %s [OPTION]... TEXINFO-FILE...\n" -#~ "\n" -#~ "Tradukas fontan Texinfo dokumenton en diversajn aliajn formojn:\n" -#~ "Info-dosierojn legeblajn interaktive per Emakso aý per aýtonoma GNU Info\n" -#~ "(la defaýlto); plata teksto (se --no-headers); aý HTML (se --html).\n" -#~ "\n" -#~ "Opcioj:\n" -#~ " -D VAR Difinu variablon, kiel per @set\n" -#~ " -I DIR Alkroæu DIR al la fino de la serævojo por " -#~ "@include\n" -#~ " -P DIR Alkroæu DIR komence de la serævojo por @include\n" -#~ " -U VAR Maldifinu variablon, kiel per @clear\n" -#~ " --commands-in-node-names Permesu @-komandojn en nomoj de nodoj\n" -#~ " --error-limit=N Haltu post N eraroj (defaýlte %d)\n" -#~ " --fill-column=N Aranøu Info-liniojn N signojn longaj (defaýlte " -#~ "%d)\n" -#~ " --footnote-style=STILO Aranøu la piednotojn laý la STILO:\n" -#~ " \"separate\" por loki la notojn en apartan " -#~ "nodon,\n" -#~ " \"end\" por loki ilin fine de la nodo en kiu\n" -#~ " ili estas difinitaj (la defaýlto)\n" -#~ " --force Konservu la eliga¼on eæ post eraroj\n" -#~ " --help Eligu la helpon kaj eliru\n" -#~ " --html Generu en HTML anstataý en Info; implicas " -#~ "--no-split\n" diff --git a/gnu/usr.bin/texinfo/po/nl.gmo b/gnu/usr.bin/texinfo/po/nl.gmo Binary files differindex 3bca9c1ad9d..0bf4b9e3b0f 100644 --- a/gnu/usr.bin/texinfo/po/nl.gmo +++ b/gnu/usr.bin/texinfo/po/nl.gmo diff --git a/gnu/usr.bin/texinfo/po/nl.po b/gnu/usr.bin/texinfo/po/nl.po index ad8acd03480..04cde1b3817 100644 --- a/gnu/usr.bin/texinfo/po/nl.po +++ b/gnu/usr.bin/texinfo/po/nl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: texinfo 3.12\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" +"POT-Creation-Date: 2002-04-01 06:10-0800\n" "PO-Revision-Date: 1998-04-16 22:35+02:00\n" "Last-Translator: Ivo Timmermans <zarq@iname.com>\n" "Language-Team: Dutch <nl@li.org>\n" @@ -13,17 +13,11 @@ msgstr "" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#. **************************************************************** -#. -#. Echo Area Movement Commands -#. -#. **************************************************************** -#: info/echo-area.c:283 info/session.c:711 +#: info/echo-area.c:283 info/session.c:712 msgid "Move forward a character" msgstr "Beweeg een teken naar voren" -#. Move point backward in the node. -#: info/echo-area.c:295 info/session.c:727 +#: info/echo-area.c:295 info/session.c:728 msgid "Move backward a character" msgstr "Beweeg een teken naar achteren" @@ -35,12 +29,11 @@ msgstr "Ga naar het begin van deze regel" msgid "Move to the end of this line" msgstr "Ga naar het einde van deze regel" -#. Move forward a word in the input line. -#: info/echo-area.c:320 info/session.c:745 +#: info/echo-area.c:320 info/session.c:746 msgid "Move forward a word" msgstr "Beweeg een woord naar voren" -#: info/echo-area.c:360 info/session.c:794 +#: info/echo-area.c:360 info/session.c:795 msgid "Move backward a word" msgstr "Beweeg een woord naar achteren" @@ -73,8 +66,6 @@ msgstr "Voeg dit teken in" msgid "Insert a TAB character" msgstr "Voeg een TAB code in" -#. Transpose the characters at point. If point is at the end of the line, -#. then transpose the characters before point. #: info/echo-area.c:504 msgid "Transpose characters at point" msgstr "Transponeer karakters op een punt" @@ -89,15 +80,11 @@ msgid "Kill ring is empty" msgstr "Kill ring is leeg" # kill? -#. If the last command was yank, or yank_pop, and the text just before -#. point is identical to the current kill item, then delete that text -#. from the line, rotate the index down, and yank back some other text. #: info/echo-area.c:575 msgid "Yank back a previous kill" msgstr "Zet een eerdere kill terug" # kill? -#. Delete the text from point to end of line. #: info/echo-area.c:608 msgid "Kill to the end of the line" msgstr "Verwijder tot aan het einde van de regel" @@ -108,7 +95,6 @@ msgid "Kill to the beginning of the line" msgstr "Verwijder tot aan het begin van de regel" # kill? -#. Delete from point to the end of the current word. #: info/echo-area.c:633 msgid "Kill the word following the cursor" msgstr "Verwijder het woord na de cursor" @@ -118,43 +104,40 @@ msgstr "Verwijder het woord na de cursor" msgid "Kill the word preceding the cursor" msgstr "Verwijder het woord voor de cursor" -#: info/echo-area.c:871 +#: info/echo-area.c:872 info/echo-area.c:932 +msgid "No completions" +msgstr "Geen voltooiïngen" + +#: info/echo-area.c:874 msgid "Not complete" msgstr "Niet compleet" -#: info/echo-area.c:916 +#: info/echo-area.c:919 msgid "List possible completions" msgstr "Geef een lijst van mogelijke voltooiïngen" -#: info/echo-area.c:929 -msgid "No completions" -msgstr "Geen voltooiïngen" - -#: info/echo-area.c:933 +#: info/echo-area.c:936 msgid "Sole completion" msgstr "Enige voltooiïng" -#: info/echo-area.c:942 +#: info/echo-area.c:945 msgid "One completion:\n" msgstr "Een voltooiïng:\n" -#: info/echo-area.c:943 +#: info/echo-area.c:946 #, c-format msgid "%d completions:\n" msgstr "%d voltooiïngen:\n" -#: info/echo-area.c:1089 +#: info/echo-area.c:1092 msgid "Insert completion" msgstr "Voeg voltooiïng in" -#: info/echo-area.c:1222 +#: info/echo-area.c:1225 msgid "Building completions..." msgstr "Voltooiïngen aan het bouwen..." -#. Scroll the "other" window. If there is a window showing completions, scroll -#. that one, otherwise scroll the window which was active on entering the read -#. function. -#: info/echo-area.c:1320 +#: info/echo-area.c:1342 msgid "Scroll the completions window" msgstr "Verschuif het voltooiïngsvenster" @@ -168,6 +151,13 @@ msgstr "" "Laat de voetnoten zien die met deze pagina verbonden zijn in een ander " "venster" +#: info/footnotes.h:26 +#, fuzzy +msgid "---------- Footnotes ----------" +msgstr "" +"---------- Voetnoten ----------\n" +"\n" + #: info/indices.c:175 msgid "Look up a string in the index for this file" msgstr "Zoek een string op in de index voor dit bestand" @@ -188,8 +178,8 @@ msgstr "Index ingang: " msgid "" "Go to the next matching index item from the last `\\[index-search]' command" msgstr "" -"Ga naar de volgende overeenkomende index-ingang van het laatste " -"`\\[index-search]' commando" +"Ga naar de volgende overeenkomende index-ingang van het laatste `\\[index-" +"search]' commando" #: info/indices.c:342 msgid "No previous index search string." @@ -224,6 +214,11 @@ msgstr "" msgid "Scanning indices of \"%s\"..." msgstr "Zoeken in indices van \"%s\"..." +#: info/indices.c:603 +#, c-format +msgid "No available info files have \"%s\" in their indices." +msgstr "" + #: info/indices.c:632 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "" @@ -243,13 +238,13 @@ msgstr "" "\n" "* Menu: Pagina's waarvan de indices \"%s\" bevatten:\n" -#: info/info.c:248 +#: info/info.c:260 info/infokey.c:884 #, fuzzy msgid "Try --help for more information.\n" msgstr "Probeer --help voor meer informatie." -#: info/info.c:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 -#: util/texindex.c:336 +#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689 +#: util/install-info.c:1224 util/texindex.c:338 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -262,12 +257,16 @@ msgstr "" "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:461 +#: info/info.c:462 #, fuzzy, c-format msgid "no index entries found for `%s'\n" msgstr "geen ingangen gevonden\n" -#: info/info.c:530 +#: info/info.c:555 +msgid " -b, --speech-friendly be friendly to speech synthesizers.\n" +msgstr "" + +#: info/info.c:562 #, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" @@ -275,19 +274,21 @@ msgid "" "Read documentation in Info format.\n" "\n" "Options:\n" -" --apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n" -" --directory=DIR add DIR to INFOPATH.\n" -" --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" --file=FILENAME specify Info file to visit.\n" -" --help display this help and exit.\n" -" --index-search=STRING go to node pointed by index entry STRING.\n" -" --node=NODENAME specify nodes in first visited Info file.\n" -" --output=FILENAME output selected nodes to FILENAME.\n" -" --restore=FILENAME read initial keystrokes from FILENAME.\n" -" --show-options, --usage go to command-line options node.\n" -" --subnodes recursively output menu items.\n" -"%s --vi-keys use vi-like and less-like key bindings.\n" -" --version display version information and exit.\n" +" --apropos=STRING look up STRING in all indices of all " +"manuals.\n" +" -d, --directory=DIR add DIR to INFOPATH.\n" +" --dribble=FILENAME remember user keystrokes in FILENAME.\n" +" -f, --file=FILENAME specify Info file to visit.\n" +" -h, --help display this help and exit.\n" +" --index-search=STRING go to node pointed by index entry STRING.\n" +" -n, --node=NODENAME specify nodes in first visited Info file.\n" +" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -R, --raw-escapes don't remove ANSI escapes from man pages.\n" +" --restore=FILENAME read initial keystrokes from FILENAME.\n" +" -O, --show-options, --usage go to command-line options node.\n" +"%s --subnodes recursively output menu items.\n" +" --vi-keys use vi-like and less-like key bindings.\n" +" --version display version information and exit.\n" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" @@ -301,9 +302,6 @@ msgid "" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" " info -f ./foo.info show file ./foo.info, not searching dir\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" "Aanroep: %s [OPTIE]... [INFO-BESTAND [MENU-ITEM...]]]\n" "\n" @@ -334,392 +332,677 @@ msgstr "" "Meld fouten in het programma aan bug-texinfo@gnu.org;\n" "meld onjuistheden in de vertaling aan nl@li.org." -#: info/info.c:604 +#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474 +#: util/install-info.c:421 util/texindex.c:286 +msgid "" +"\n" +"Email bug reports to bug-texinfo@gnu.org,\n" +"general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" +msgstr "" + +#: info/info.c:632 #, fuzzy, c-format msgid "Cannot find node `%s'." msgstr "Kan pagina `%s' niet verwijderen" -#: info/info.c:605 +#: info/info.c:633 #, fuzzy, c-format msgid "Cannot find node `(%s)%s'." msgstr "Kan pagina `%s' niet verwijderen" -#: info/info.c:606 +#: info/info.c:634 #, fuzzy msgid "Cannot find a window!" msgstr "Kan een permanent venster niet verwijderen" -#: info/info.c:607 +#: info/info.c:635 msgid "Point doesn't appear within this window's node!" msgstr "" -#: info/info.c:608 +#: info/info.c:636 #, fuzzy msgid "Cannot delete the last window." msgstr "Kan een permanent venster niet verwijderen" -#: info/info.c:609 +#: info/info.c:637 #, fuzzy msgid "No menu in this node." msgstr "Er is geen menu op deze pagina." -#: info/info.c:610 +#: info/info.c:638 #, fuzzy msgid "No footnotes in this node." msgstr "Geen verwijzingen in deze pagina." -#: info/info.c:611 +#: info/info.c:639 msgid "No cross references in this node." msgstr "Geen verwijzingen in deze pagina." -#: info/info.c:612 +#: info/info.c:640 #, fuzzy, c-format msgid "No `%s' pointer for this node." msgstr "Geen \"Volgende\" wijzer voor deze pagina." -#: info/info.c:613 +#: info/info.c:641 #, c-format msgid "Unknown Info command `%c'; try `?' for help." msgstr "" -#: info/info.c:614 +#: info/info.c:642 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." msgstr "" -#: info/info.c:615 +#: info/info.c:643 #, fuzzy msgid "You are already at the last page of this node." msgstr "Ga naar het begin van deze pagina" -#: info/info.c:616 +#: info/info.c:644 #, fuzzy msgid "You are already at the first page of this node." msgstr "Ga naar het begin van deze pagina" -#: info/info.c:617 +#: info/info.c:645 msgid "Only one window." msgstr "" -#: info/info.c:618 +#: info/info.c:646 msgid "Resulting window would be too small." msgstr "" -#: info/info.c:619 +#: info/info.c:647 msgid "Not enough room for a help window, please delete a window." msgstr "" -#: info/infodoc.c:45 +#: info/infodoc.c:45 info/infodoc.c:94 #, fuzzy -msgid "Basic Commands in Info Windows\n" +msgid "" +"Basic Commands in Info Windows\n" +"******************************\n" msgstr "Basiscommando's in Info Vensters" -#: info/infodoc.c:46 -msgid "******************************\n" -msgstr "" - #: info/infodoc.c:48 -#, fuzzy, c-format -msgid " %-10s Quit this help.\n" +#, fuzzy +msgid "\\%-10[quit-help] Quit this help.\n" msgstr "Geen \"Vorige\" voor deze pagina." #: info/infodoc.c:49 -#, c-format -msgid " %-10s Quit Info altogether.\n" +msgid "\\%-10[quit] Quit Info altogether.\n" msgstr "" #: info/infodoc.c:50 -#, c-format -msgid " %-10s Invoke the Info tutorial.\n" +msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" +msgstr "" + +#: info/infodoc.c:52 info/infodoc.c:101 +#, fuzzy +msgid "" +"Selecting other nodes:\n" +"----------------------\n" +msgstr "Selecteer de `Vorige' pagina" + +#: info/infodoc.c:54 +#, fuzzy +msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" +msgstr "Ga naar het einde van deze pagina" + +#: info/infodoc.c:55 +#, fuzzy +msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" +msgstr "Ga naar het einde van deze pagina" + +#: info/infodoc.c:56 +#, fuzzy +msgid "\\%-10[up-node] Move \"up\" from this node.\n" +msgstr "Geen \"Vorige\" voor deze pagina." + +#: info/infodoc.c:57 +msgid "" +"\\%-10[menu-item] Pick menu item specified by name.\n" +" Picking a menu item causes another node to be selected.\n" +msgstr "" + +#: info/infodoc.c:59 +msgid "" +"\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n" +msgstr "" + +#: info/infodoc.c:60 +#, fuzzy +msgid "\\%-10[history-node] Move to the last node seen in this window.\n" +msgstr "Selecteer de laatste pagina in dit bestand" + +#: info/infodoc.c:61 +msgid "" +"\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n" +msgstr "" + +#: info/infodoc.c:62 +msgid "" +"\\%-10[move-to-prev-xref] Skip to previous hypertext link within this " +"node.\n" +msgstr "" + +#: info/infodoc.c:63 +msgid "" +"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" +msgstr "" + +#: info/infodoc.c:64 +msgid "" +"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" +"node] (DIR)'.\n" msgstr "" -#: info/infodoc.c:52 -msgid "Moving within a node:\n" +#: info/infodoc.c:65 +msgid "" +"\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node] Top'.\n" msgstr "" -#: info/infodoc.c:53 +#: info/infodoc.c:67 info/infodoc.c:115 #, fuzzy -msgid "---------------------\n" +msgid "" +"Moving within a node:\n" +"---------------------\n" msgstr "" "---------- Voetnoten ----------\n" "\n" -#: info/infodoc.c:54 -#, c-format -msgid " %-10s Scroll forward a page.\n" +#: info/infodoc.c:69 +msgid "\\%-10[scroll-forward] Scroll forward a page.\n" msgstr "" -#: info/infodoc.c:55 -#, c-format -msgid " %-10s Scroll backward a page.\n" -msgstr "" +#: info/infodoc.c:70 +#, fuzzy +msgid "\\%-10[scroll-backward] Scroll backward a page.\n" +msgstr "Schuif terug in dit venster" # kill? -#: info/infodoc.c:56 -#, fuzzy, c-format -msgid " %-10s Go to the beginning of this node.\n" +#: info/infodoc.c:71 +#, fuzzy +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" msgstr "Verwijder tot aan het begin van de regel" -#: info/infodoc.c:57 -#, fuzzy, c-format -msgid " %-10s Go to the end of this node.\n" +#: info/infodoc.c:72 +#, fuzzy +msgid "\\%-10[end-of-node] Go to the end of this node.\n" msgstr "Ga naar het einde van deze pagina" -#: info/infodoc.c:58 -#, c-format -msgid " %-10s Scroll forward 1 line.\n" -msgstr "" +#: info/infodoc.c:73 +#, fuzzy +msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" +msgstr "Schuif terug in dit venster" -#: info/infodoc.c:59 -#, fuzzy, c-format -msgid " %-10s Scroll backward 1 line.\n" +#: info/infodoc.c:74 +#, fuzzy +msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" msgstr "Schuif terug in dit venster" -#: info/infodoc.c:61 +#: info/infodoc.c:76 info/infodoc.c:124 #, fuzzy -msgid "Selecting other nodes:\n" -msgstr "Selecteer de `Vorige' pagina" +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "Waar is het commando: " -#: info/infodoc.c:62 +#: info/infodoc.c:78 #, fuzzy -msgid "----------------------\n" +msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" +msgstr "Selecteer de laatste keuze in het menu van deze pagina" + +#: info/infodoc.c:79 +#, fuzzy +msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" +msgstr "Selecteer de laatste keuze in het menu van deze pagina" + +#: info/infodoc.c:80 +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 "" -"---------- Voetnoten ----------\n" -"\n" -#: info/infodoc.c:63 +#: info/infodoc.c:82 +msgid "" +"\\%-10[goto-node] Move to node specified by name.\n" +" You may include a filename as well, as in (FILENAME)NODENAME.\n" +msgstr "" + +#: info/infodoc.c:84 +msgid "" +"\\%-10[search] Search forward for a specified string\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" + +#: info/infodoc.c:86 +msgid "" +"\\%-10[search-backward] Search backward for a specified string\n" +" and select the node in which the previous occurrence is " +"found.\n" +msgstr "" + +#: info/infodoc.c:97 +#, fuzzy, c-format +msgid " %-10s Quit this help.\n" +msgstr "Geen \"Vorige\" voor deze pagina." + +#: info/infodoc.c:98 +#, c-format +msgid " %-10s Quit Info altogether.\n" +msgstr "" + +#: info/infodoc.c:99 +#, c-format +msgid " %-10s Invoke the Info tutorial.\n" +msgstr "" + +#: info/infodoc.c:103 #, fuzzy, c-format msgid " %-10s Move to the `next' node of this node.\n" msgstr "Ga naar het einde van deze pagina" -#: info/infodoc.c:64 +#: info/infodoc.c:104 #, fuzzy, c-format msgid " %-10s Move to the `previous' node of this node.\n" msgstr "Ga naar het einde van deze pagina" -#: info/infodoc.c:65 +#: info/infodoc.c:105 #, fuzzy, c-format msgid " %-10s Move `up' from this node.\n" msgstr "Geen \"Vorige\" voor deze pagina." -#: info/infodoc.c:66 +#: info/infodoc.c:106 #, c-format msgid " %-10s Pick menu item specified by name.\n" msgstr "" -#: info/infodoc.c:67 +#: info/infodoc.c:107 msgid " Picking a menu item causes another node to be selected.\n" msgstr "" -#: info/infodoc.c:68 +#: info/infodoc.c:108 #, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" msgstr "" -#: info/infodoc.c:69 +#: info/infodoc.c:109 #, fuzzy, c-format msgid " %-10s Move to the last node seen in this window.\n" msgstr "Selecteer de laatste pagina in dit bestand" -#: info/infodoc.c:70 +#: info/infodoc.c:110 #, c-format msgid " %-10s Skip to next hypertext link within this node.\n" msgstr "" -#: info/infodoc.c:71 +#: info/infodoc.c:111 #, c-format msgid " %-10s Follow the hypertext link under cursor.\n" msgstr "" -#: info/infodoc.c:72 +#: info/infodoc.c:112 #, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" msgstr "" -#: info/infodoc.c:73 +#: info/infodoc.c:113 #, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" msgstr "" -#: info/infodoc.c:75 -#, fuzzy -msgid "Other commands:\n" -msgstr "Waar is het commando: " +#: info/infodoc.c:117 +#, c-format +msgid " %-10s Scroll forward a page.\n" +msgstr "" -#: info/infodoc.c:76 -#, fuzzy -msgid "---------------\n" +#: info/infodoc.c:118 +#, c-format +msgid " %-10s Scroll backward a page.\n" msgstr "" -"---------- Voetnoten ----------\n" -"\n" -#: info/infodoc.c:77 +# kill? +#: info/infodoc.c:119 +#, fuzzy, c-format +msgid " %-10s Go to the beginning of this node.\n" +msgstr "Verwijder tot aan het begin van de regel" + +#: info/infodoc.c:120 +#, fuzzy, c-format +msgid " %-10s Go to the end of this node.\n" +msgstr "Ga naar het einde van deze pagina" + +#: info/infodoc.c:121 +#, c-format +msgid " %-10s Scroll forward 1 line.\n" +msgstr "" + +#: info/infodoc.c:122 +#, fuzzy, c-format +msgid " %-10s Scroll backward 1 line.\n" +msgstr "Schuif terug in dit venster" + +#: info/infodoc.c:126 #, fuzzy, c-format msgid " %-10s Pick first ... ninth item in node's menu.\n" msgstr "Selecteer de laatste keuze in het menu van deze pagina" -#: info/infodoc.c:78 +#: info/infodoc.c:127 #, fuzzy, c-format msgid " %-10s Pick last item in node's menu.\n" msgstr "Selecteer de laatste keuze in het menu van deze pagina" -#: info/infodoc.c:79 +#: info/infodoc.c:128 #, c-format msgid "" " %-10s Search for a specified string in the index entries of this Info\n" msgstr "" -#: info/infodoc.c:80 +#: info/infodoc.c:129 msgid "" " file, and select the node referenced by the first entry " "found.\n" msgstr "" -#: info/infodoc.c:81 +#: info/infodoc.c:130 #, c-format msgid " %-10s Move to node specified by name.\n" msgstr "" -#: info/infodoc.c:82 +#: info/infodoc.c:131 msgid "" " You may include a filename as well, as in (FILENAME)NODENAME.\n" msgstr "" -#: info/infodoc.c:83 +#: info/infodoc.c:132 #, c-format -msgid "" -" %-10s Search forward through this Info file for a specified string,\n" +msgid " %-10s Search forward for a specified string,\n" msgstr "" -#: info/infodoc.c:84 info/infodoc.c:86 +#: info/infodoc.c:133 info/infodoc.c:135 msgid "" " and select the node in which the next occurrence is found.\n" msgstr "" -#: info/infodoc.c:85 -#, c-format -msgid " %-10s Search backward in this Info file for a specified string,\n" -msgstr "" +#: info/infodoc.c:134 +#, fuzzy, c-format +msgid " %-10s Search backward for a specified string\n" +msgstr "Schuif terug in dit venster" -#: info/infodoc.c:258 +#: info/infodoc.c:313 msgid "The current search path is:\n" msgstr "" -#: info/infodoc.c:261 +#: info/infodoc.c:316 #, fuzzy msgid "" "Commands available in Info windows:\n" "\n" msgstr "Basiscommando's in Info Vensters" -#: info/infodoc.c:264 +#: info/infodoc.c:319 msgid "" "Commands available in the echo area:\n" "\n" msgstr "" -#: info/infodoc.c:280 +#: info/infodoc.c:340 +#, fuzzy, c-format msgid "" -"The following commands can only be invoked via M-x:\n" +"The following commands can only be invoked via %s:\n" "\n" msgstr "" "De volgende commando's kunnen alleen aangeroepen worden via M-x:\n" "\n" -#: info/infodoc.c:301 +#: info/infodoc.c:343 +#, fuzzy +msgid "" +"The following commands cannot be invoked at all:\n" +"\n" +msgstr "" +"De volgende commando's kunnen alleen aangeroepen worden via M-x:\n" +"\n" + +#: info/infodoc.c:367 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" msgstr "" "--- Gebruik `\\[history-node]' of `\\[kill-node]' om te beëindigen ---\n" -#. Create or move to the help window. -#: info/infodoc.c:411 +#: info/infodoc.c:477 msgid "Display help message" msgstr "Geef een help boodschap" -#. Show the Info help node. This means that the "info" file is installed -#. where it can easily be found on your system. -#: info/infodoc.c:429 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" msgstr "Ga naar Info pagina `(info)Help'" -#: info/infodoc.c:555 +#: info/infodoc.c:638 msgid "Print documentation for KEY" msgstr "Geef uitleg over KEY" -#: info/infodoc.c:568 +#: info/infodoc.c:650 #, c-format msgid "Describe key: %s" msgstr "Omschrijf toets: %s" -#: info/infodoc.c:577 +#: info/infodoc.c:660 #, c-format msgid "ESC %s is undefined." msgstr "ESC %s is niet gedefinieerd." -#: info/infodoc.c:594 +#: info/infodoc.c:676 info/infodoc.c:703 #, c-format msgid "%s is undefined." msgstr "%s is niet gedefinieerd." -#: info/infodoc.c:620 +#: info/infodoc.c:724 #, c-format msgid "%s is defined to %s." msgstr "%s is gedefinieerd als %s." -#: info/infodoc.c:812 +#: info/infodoc.c:1151 msgid "Show what to type to execute a given command" msgstr "" -#: info/infodoc.c:816 +#: info/infodoc.c:1155 msgid "Where is command: " msgstr "Waar is het commando: " -#: info/infodoc.c:838 +#: info/infodoc.c:1177 #, c-format msgid "`%s' is not on any keys" msgstr "`%s' is niet toegekend aan een toets" -#: info/infodoc.c:844 +#: info/infodoc.c:1183 #, c-format msgid "%s can only be invoked via %s." msgstr "%s kan alleen aangeroepen worden via %s." -#: info/infodoc.c:847 +#: info/infodoc.c:1186 #, c-format msgid "%s can be invoked via %s." msgstr "%s kan aangeroepen worden via %s." -#: info/infodoc.c:851 +#: info/infodoc.c:1190 #, c-format msgid "There is no function named `%s'" msgstr "Er is geen functie met de naam `%s'" -#: info/m-x.c:69 +#: info/infokey.c:164 +msgid "incorrect number of arguments" +msgstr "" + +#: info/infokey.c:194 +#, fuzzy, c-format +msgid "cannot open input file `%s'" +msgstr "Kan pijp naar \"%s\" niet openen." + +#: info/infokey.c:207 +#, fuzzy, c-format +msgid "cannot create output file `%s'" +msgstr "Kan uitvoerbestand \"%s\" niet vinden." + +#: info/infokey.c:217 +#, c-format +msgid "error writing to `%s'" +msgstr "" + +#: info/infokey.c:222 +#, fuzzy, c-format +msgid "error closing output file `%s'" +msgstr "Kan uitvoerbestand \"%s\" niet vinden." + +#: info/infokey.c:443 +msgid "key sequence too long" +msgstr "" + +#: info/infokey.c:521 +msgid "missing key sequence" +msgstr "" + +#: info/infokey.c:600 +msgid "NUL character (\\000) not permitted" +msgstr "" + +#: info/infokey.c:629 +#, c-format +msgid "NUL character (^%c) not permitted" +msgstr "" + +#: info/infokey.c:652 +#, fuzzy +msgid "missing action name" +msgstr "%c%s ontbrekende afsluitende accolade" + +#: info/infokey.c:667 info/infokey.c:733 +msgid "section too long" +msgstr "" + +#: info/infokey.c:673 +#, fuzzy, c-format +msgid "unknown action `%s'" +msgstr "Onbekend commando `%s'" + +#: info/infokey.c:682 +msgid "action name too long" +msgstr "" + +#: info/infokey.c:694 +#, c-format +msgid "extra characters following action `%s'" +msgstr "" + +#: info/infokey.c:704 +#, fuzzy +msgid "missing variable name" +msgstr "%s: ontbrekend bestandsargument\n" + +#: info/infokey.c:712 +msgid "missing `=' immediately after variable name" +msgstr "" + +#: info/infokey.c:719 +msgid "variable name too long" +msgstr "" + +#: info/infokey.c:741 +msgid "value too long" +msgstr "" + +#: info/infokey.c:875 +#, c-format +msgid "\"%s\", line %u: " +msgstr "" + +#: info/infokey.c:891 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT-FILE]\n" +"\n" +"Compile infokey source file to infokey file. Reads INPUT-FILE (default\n" +"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n" +"\n" +"Options:\n" +" --output FILE output to FILE instead of $HOME/.info\n" +" --help display this help and exit.\n" +" --version display version information and exit.\n" +msgstr "" + +#: info/infomap.c:1397 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too small" +msgstr "" + +#: info/infomap.c:1400 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too big" +msgstr "" + +#: info/infomap.c:1413 +#, c-format +msgid "Error reading infokey file `%s' - short read" +msgstr "" + +#: info/infomap.c:1431 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1437 +#, c-format +msgid "Your infokey file `%s' is out of date -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1450 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1470 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section code) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1608 +msgid "Bad data in infokey file -- some key bindings ignored" +msgstr "" + +#: info/infomap.c:1659 +msgid "Bad data in infokey file -- some var settings ignored" +msgstr "" + +#: info/m-x.c:70 msgid "Read the name of an Info command and describe it" msgstr "Lees de naam van een Info commando en geef een omschrijving" -#: info/m-x.c:73 +#: info/m-x.c:74 msgid "Describe command: " msgstr "Omschrijf commando: " -#: info/m-x.c:96 +#: info/m-x.c:97 msgid "Read a command name in the echo area and execute it" msgstr "Lees de naam van een commando in de weergeefruimte en voer dat uit" -#: info/m-x.c:134 +#: info/m-x.c:141 msgid "Cannot execute an `echo-area' command here." msgstr "Kan hier geen `echo-area' commando uitvoeren." -#: info/m-x.c:150 +#: info/m-x.c:157 msgid "Set the height of the displayed window" msgstr "Zet de hoogte van het weergegeven venster" -#: info/m-x.c:163 +#: info/m-x.c:170 #, c-format msgid "Set screen height to (%d): " msgstr "Zet schermhoogte op (%d): " -#: info/makedoc.c:132 +#: info/makedoc.c:161 info/makedoc.c:169 msgid "" " Source files groveled to make this file include:\n" "\n" @@ -727,7 +1010,7 @@ msgstr "" " Bronbestanden veranderd om dit bestand in te voegen:\n" "\n" -#: info/makedoc.c:465 +#: info/makedoc.c:553 #, c-format msgid "Couldn't manipulate the file %s.\n" msgstr "Kon het bestand %s niet manipuleren.\n" @@ -765,569 +1048,538 @@ msgstr "Selecteer een pagina die voorheen bekeken is in een zichtbaar venster" msgid "Select visited node: " msgstr "Selecteer een bezochte pagina: " -#: info/nodemenu.c:331 info/session.c:2146 +#: info/nodemenu.c:331 info/session.c:2235 #, c-format msgid "The reference disappeared! (%s)." msgstr "De verwijzing is verdwenen! (%s)." -#: info/session.c:169 +#: info/session.c:170 #, fuzzy, c-format msgid "" "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] " "for menu item." msgstr "" -"Welkom bij Info versie %s. \"\\[get-help-window]\" voor hulp, " -"\"\\[menu-item]\" voor een menukeuze." +"Welkom bij Info versie %s. \"\\[get-help-window]\" voor hulp, \"\\[menu-item]" +"\" voor een menukeuze." -#. Move WINDOW's point down to the next line if possible. -#: info/session.c:642 +#: info/session.c:643 msgid "Move down to the next line" msgstr "Ga naar de volgende regel" -#. Move WINDOW's point up to the previous line if possible. -#: info/session.c:657 +#: info/session.c:658 msgid "Move up to the previous line" msgstr "Ga naar de vorige regel" -#. Move WINDOW's point to the end of the true line. -#: info/session.c:672 +#: info/session.c:673 msgid "Move to the end of the line" msgstr "Ga naar het einde van de regel" -#. Move WINDOW's point to the beginning of the true line. -#: info/session.c:692 +#: info/session.c:693 msgid "Move to the start of the line" msgstr "Ga naar het begin van de regel" -#: info/session.c:884 makeinfo/node.c:1092 +#: info/session.c:885 makeinfo/node.c:1357 #, fuzzy msgid "Next" msgstr "Volgende" -#: info/session.c:887 +#: info/session.c:888 #, fuzzy msgid "Following Next node..." msgstr "\"Volgende\" pagina aan het volgen..." -#: info/session.c:904 +#: info/session.c:905 msgid "Selecting first menu item..." msgstr "Ik selecteer de eerste keuze uit het menu..." -#: info/session.c:915 +#: info/session.c:916 #, fuzzy msgid "Selecting Next node..." msgstr "Ik selecteer de \"Volgende\" pagina..." -#: info/session.c:985 +#: info/session.c:986 #, c-format msgid "Moving Up %d time(s), then Next." msgstr "" -#: info/session.c:1009 +#: info/session.c:1010 #, fuzzy msgid "No more nodes within this document." msgstr "Geen verwijzingen in deze pagina." -#: info/session.c:1033 +#: info/session.c:1034 #, fuzzy msgid "No `Prev' for this node." msgstr "Geen \"Vorige\" voor deze pagina." -#. Move to the previous node. If this node now contains a menu, -#. and we have not inhibited movement to it, move to the node -#. corresponding to the last menu item. -#: info/session.c:1036 info/session.c:1091 +#: info/session.c:1037 info/session.c:1092 #, fuzzy msgid "Moving Prev in this window." msgstr "Ik beweeg \"Vorige\" naar dit venster." -#: info/session.c:1050 +#: info/session.c:1051 #, fuzzy msgid "No `Prev' or `Up' for this node within this document." msgstr "Geen \"Vorige\" of \"Omhoog\" voor deze pagina." -#: info/session.c:1053 +#: info/session.c:1054 #, fuzzy msgid "Moving Up in this window." msgstr "Ik ga \"Omhoog\" in dit venster." -#: info/session.c:1101 +#: info/session.c:1102 #, fuzzy msgid "Moving to `Prev's last menu item." msgstr "Ik ga naar de laatste keuze van het menu van \"Vorige\"." -#: info/session.c:1112 +#: info/session.c:1113 msgid "Move forwards or down through node structure" msgstr "Beweeg naar voren of beneden door de paginastructuur" -#: info/session.c:1128 +#: info/session.c:1129 msgid "Move backwards or up through node structure" msgstr "Beweeg naar achteren of boven door de paginastructuur" -#. Show the next screen of WINDOW's node. -#: info/session.c:1143 +#: info/session.c:1229 msgid "Scroll forward in this window" msgstr "Schuif verder in dit venster" -#: info/session.c:1192 +#: info/session.c:1237 #, fuzzy msgid "Scroll forward in this window and set default window size" msgstr "Schuif verder in dit venster" -#. Show the previous screen of WINDOW's node. -#: info/session.c:1200 +#: info/session.c:1245 +#, fuzzy +msgid "Scroll forward in this window staying within node" +msgstr "Schuif verder in dit venster" + +#: info/session.c:1253 +#, fuzzy +msgid "" +"Scroll forward in this window staying within node and set default window size" +msgstr "Schuif verder in dit venster" + +#: info/session.c:1261 msgid "Scroll backward in this window" msgstr "Schuif terug in dit venster" -#: info/session.c:1244 +#: info/session.c:1269 #, fuzzy msgid "Scroll backward in this window and set default window size" msgstr "Schuif terug in dit venster" -#. Move to the beginning of the node. -#: info/session.c:1252 +#: info/session.c:1278 +#, fuzzy +msgid "Scroll backward in this window staying within node" +msgstr "Schuif terug in dit venster" + +#: info/session.c:1286 +#, fuzzy +msgid "" +"Scroll backward in this window staying within node and set default window " +"size" +msgstr "Schuif terug in dit venster" + +#: info/session.c:1294 msgid "Move to the start of this node" msgstr "Ga naar het begin van deze pagina" -#. Move to the end of the node. -#: info/session.c:1259 +#: info/session.c:1301 msgid "Move to the end of this node" msgstr "Ga naar het einde van deze pagina" -#. Scroll the window forward by N lines. -#: info/session.c:1266 +#: info/session.c:1308 msgid "Scroll down by lines" msgstr "" -#. Scroll the window backward by N lines. -#: info/session.c:1283 +#: info/session.c:1325 msgid "Scroll up by lines" msgstr "" -#: info/session.c:1301 +#: info/session.c:1343 msgid "Scroll down by half screen size" msgstr "" -#: info/session.c:1327 +#: info/session.c:1369 msgid "Scroll up by half screen size" msgstr "" -#. **************************************************************** -#. -#. Commands for Manipulating Windows -#. -#. **************************************************************** -#. Make the next window in the chain be the active window. -#: info/session.c:1356 +#: info/session.c:1398 msgid "Select the next window" msgstr "Selecteer het volgende venster" -#. Make the previous window in the chain be the active window. -#: info/session.c:1395 +#: info/session.c:1437 msgid "Select the previous window" msgstr "Selecteer het vorige venster" -#. Split WINDOW into two windows, both showing the same node. If we -#. are automatically tiling windows, re-tile after the split. -#: info/session.c:1446 +#: info/session.c:1488 msgid "Split the current window" msgstr "Splits het huidige venster" -#. Delete WINDOW, forgetting the list of last visited nodes. If we are -#. automatically displaying footnotes, show or remove the footnotes -#. window. If we are automatically tiling windows, re-tile after the -#. deletion. -#: info/session.c:1527 +#: info/session.c:1569 msgid "Delete the current window" msgstr "Verwijder het huidige venster" -#: info/session.c:1535 +#: info/session.c:1577 msgid "Cannot delete a permanent window" msgstr "Kan een permanent venster niet verwijderen" -#. Just keep WINDOW, deleting all others. -#: info/session.c:1568 +#: info/session.c:1610 msgid "Delete all other windows" msgstr "Verwijder alle andere vensters" -#. Scroll the "other" window of WINDOW. -#: info/session.c:1614 +#: info/session.c:1656 msgid "Scroll the other window" msgstr "Verschuif het andere venster" -#: info/session.c:1635 +#: info/session.c:1677 #, fuzzy msgid "Scroll the other window backward" msgstr "Verschuif het andere venster" -#. Change the size of WINDOW by AMOUNT. -#: info/session.c:1641 +#: info/session.c:1683 msgid "Grow (or shrink) this window" msgstr "Vergroot (of verklein) dit venster" -#: info/session.c:1652 +#: info/session.c:1694 msgid "Divide the available screen space among the visible windows" msgstr "Verdeel de beschikbare schermruimte tussen de zichtbare vensters" -#: info/session.c:1659 +#: info/session.c:1701 msgid "Toggle the state of line wrapping in the current window" msgstr "Verander de status van regeldoorlopen in het huidige venster" -#. Make WINDOW display the "Next:" node of the node currently being -#. displayed. -#: info/session.c:1838 +#: info/session.c:1880 #, fuzzy msgid "Select the Next node" msgstr "Selecteer de `Volgende' pagina" -#. Make WINDOW display the "Prev:" node of the node currently being -#. displayed. -#: info/session.c:1846 +#: info/session.c:1888 #, fuzzy msgid "Select the Prev node" msgstr "Selecteer de `Vorige' pagina" -#. Make WINDOW display the "Up:" node of the node currently being -#. displayed. -#: info/session.c:1854 +#: info/session.c:1896 #, fuzzy msgid "Select the Up node" msgstr "Selecteer de `Omhoog' pagina" -#. Make WINDOW display the last node of this info file. -#: info/session.c:1861 +#: info/session.c:1903 msgid "Select the last node in this file" msgstr "Selecteer de laatste pagina in dit bestand" -#: info/session.c:1888 info/session.c:1921 +#: info/session.c:1930 info/session.c:1963 msgid "This window has no additional nodes" msgstr "Dit venster heeft geen extra pagina's" -#. Make WINDOW display the first node of this info file. -#: info/session.c:1894 +#: info/session.c:1936 msgid "Select the first node in this file" msgstr "Selecteer de eerste pagina in dit bestand" -#: info/session.c:1928 +#: info/session.c:1970 msgid "Select the last item in this node's menu" msgstr "Selecteer de laatste keuze in het menu van deze pagina" -#. Use KEY (a digit) to select the Nth menu item in WINDOW->node. -#: info/session.c:1934 +#: info/session.c:1976 msgid "Select this menu item" msgstr "Selecteer deze menukeuze" -#: info/session.c:1963 +#: info/session.c:2005 #, c-format msgid "There aren't %d items in this menu." msgstr "Er zijn geen %d keuzes in dit menu." -#: info/session.c:2094 +#: info/session.c:2148 #, c-format msgid "Menu item (%s): " msgstr "Menukeuze (%s): " -#: info/session.c:2096 +#: info/session.c:2150 msgid "Menu item: " msgstr "Menukeuze: " -#: info/session.c:2101 +#: info/session.c:2155 #, c-format msgid "Follow xref (%s): " msgstr "Volg verwijzing (%s): " -#: info/session.c:2103 +#: info/session.c:2157 msgid "Follow xref: " msgstr "Volg verwijzing: " -#. Read a line (with completion) which is the name of a menu item, -#. and select that item. -#: info/session.c:2191 +#: info/session.c:2280 msgid "Read a menu item and select its node" msgstr "Lees een menukeuze en selecteer zijn pagina" -#: info/session.c:2199 +#: info/session.c:2288 msgid "Read a footnote or cross reference and select its node" msgstr "Lees een voetnoot of verwijzing en selecteer zijn pagina" -#. Position the cursor at the start of this node's menu. -#: info/session.c:2205 +#: info/session.c:2294 msgid "Move to the start of this node's menu" msgstr "Ga naar het begin van het menu van deze pagina" -#: info/session.c:2229 +#: info/session.c:2318 msgid "Visit as many menu items at once as possible" msgstr "Ga naar zo veel mogelijk menukeuzes tegelijk" -#. Read a line of input which is a node name, and go to that node. -#: info/session.c:2257 +#: info/session.c:2346 msgid "Read a node name and select it" msgstr "Lees de naam van een pagina en selecteer die" -#: info/session.c:2312 info/session.c:2316 +#: info/session.c:2401 info/session.c:2405 #, fuzzy msgid "Goto node: " msgstr "Ga naar Pagina: " -#: info/session.c:2382 +#: info/session.c:2471 #, fuzzy, c-format msgid "No menu in node `%s'." msgstr "Geen pagina's meer." -#: info/session.c:2422 +#: info/session.c:2516 #, fuzzy, c-format msgid "No menu item `%s' in node `%s'." msgstr "Er is geen menukeuze \"%s\" op deze pagina." -#: info/session.c:2452 +#: info/session.c:2546 #, fuzzy, c-format msgid "Unable to find node referenced by `%s' in `%s'." msgstr "Kon de pagina, waarnaar verwezen werd door \"%s\", niet vinden." -#: info/session.c:2503 +#: info/session.c:2597 msgid "Read a list of menus starting from dir and follow them" msgstr "" -#: info/session.c:2505 +#: info/session.c:2599 #, fuzzy msgid "Follow menus: " msgstr "Volg verwijzing: " -#: info/session.c:2703 +#: info/session.c:2797 msgid "Find the node describing program invocation" msgstr "" -#: info/session.c:2705 +#: info/session.c:2799 #, c-format msgid "Find Invocation node of [%s]: " msgstr "" # manpage? -#: info/session.c:2743 +#: info/session.c:2837 msgid "Read a manpage reference and select it" msgstr "Lees een manpagina verwijzing en selecteer die" -#: info/session.c:2747 +#: info/session.c:2841 msgid "Get Manpage: " msgstr "Ga naar manpagina: " -#. Move to the "Top" node in this file. -#: info/session.c:2777 +#: info/session.c:2871 msgid "Select the node `Top' in this file" msgstr "Selecteer de `Top' pagina in dit bestand" -#. Move to the node "(dir)Top". -#: info/session.c:2783 +#: info/session.c:2877 msgid "Select the node `(dir)'" msgstr "Selecteer de pagina `(dir)'" -#: info/session.c:2803 +#: info/session.c:2897 #, c-format msgid "Kill node (%s): " msgstr "Verwijder pagina (%s): " -#: info/session.c:2857 +#: info/session.c:2951 #, c-format msgid "Cannot kill node `%s'" msgstr "Kan pagina `%s' niet verwijderen" -#: info/session.c:2867 +#: info/session.c:2961 msgid "Cannot kill the last node" msgstr "Kan de laatste pagina niet verwijderen" -#: info/session.c:2953 +#: info/session.c:3047 msgid "Select the most recently selected node" msgstr "Selecteer de laatst geselecteerde pagina" -#. Kill named node. -#: info/session.c:2959 +#: info/session.c:3053 msgid "Kill this node" msgstr "Sluit deze pagina" -#. Read the name of a file and select the entire file. -#: info/session.c:2967 +#: info/session.c:3061 msgid "Read the name of a file and select it" msgstr "Lees de naam van een bestand en selecteer die" -#: info/session.c:2971 +#: info/session.c:3065 msgid "Find file: " msgstr "Vind bestand: " -#: info/session.c:2988 +#: info/session.c:3082 #, fuzzy, c-format msgid "Cannot find `%s'." msgstr "Kan \"%s\" niet vinden." -#: info/session.c:3033 info/session.c:3154 +#: info/session.c:3127 info/session.c:3248 #, fuzzy, c-format msgid "Could not create output file `%s'." msgstr "Kan uitvoerbestand \"%s\" niet vinden." -#: info/session.c:3046 info/session.c:3171 info/session.c:3232 +#: info/session.c:3140 info/session.c:3265 info/session.c:3326 msgid "Done." msgstr "Klaar." -#. Maybe we should print some information about the node being output. -#: info/session.c:3102 +#: info/session.c:3196 #, fuzzy, c-format msgid "Writing node %s..." msgstr "Bezig met schrijven van pagina \"%s\"..." -#: info/session.c:3180 +#: info/session.c:3274 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" msgstr "Sluis de inhoud van deze pagina door INFO_PRINT_COMMAND" -#: info/session.c:3216 +#: info/session.c:3310 #, fuzzy, c-format msgid "Cannot open pipe to `%s'." msgstr "Kan pijp naar \"%s\" niet openen." -#. Maybe we should print some information about the node being output. -#: info/session.c:3222 +#: info/session.c:3316 #, fuzzy, c-format msgid "Printing node %s..." msgstr "Bezig met afdrukken van pagina \"%s\"..." -#: info/session.c:3464 +#: info/session.c:3558 #, fuzzy, c-format msgid "Searching subfile %s ..." msgstr "Bezig met zoeken naar sub-bestand \"%s\"..." -#: info/session.c:3516 +#: info/session.c:3610 #, fuzzy msgid "Read a string and search for it case-sensitively" msgstr "Lees een tekenreeks en zoek daar naar" -#: info/session.c:3523 +#: info/session.c:3617 msgid "Read a string and search for it" msgstr "Lees een tekenreeks en zoek daar naar" -#: info/session.c:3531 +#: info/session.c:3625 #, fuzzy msgid "Read a string and search backward for it" msgstr "Lees een tekenreeks en zoek daar naar" -#: info/session.c:3573 +#: info/session.c:3667 #, fuzzy, c-format msgid "%s%sfor string [%s]: " msgstr "%s voor tekenreeks [%s]: " -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search backward" msgstr "Achteruit zoeken" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search" msgstr "Zoek" -#: info/session.c:3575 +#: info/session.c:3669 msgid " case-sensitively " msgstr "" -#: info/session.c:3575 +#: info/session.c:3669 msgid " " msgstr "" -#: info/session.c:3615 +#: info/session.c:3709 msgid "Search failed." msgstr "Niet gevonden." -#: info/session.c:3633 +#: info/session.c:3727 msgid "Repeat last search in the same direction" msgstr "" -#: info/session.c:3636 info/session.c:3646 +#: info/session.c:3730 info/session.c:3740 #, fuzzy msgid "No previous search string" msgstr "Geen eerdere index zoek string." -#: info/session.c:3643 +#: info/session.c:3737 msgid "Repeat last search in the reverse direction" msgstr "" -#: info/session.c:3661 info/session.c:3667 +#: info/session.c:3755 info/session.c:3761 msgid "Search interactively for a string as you type it" msgstr "Zoek interactief naar een string als je het intypt" -#: info/session.c:3761 +#: info/session.c:3855 msgid "I-search backward: " msgstr "Achteruit I-zoeken: " -#: info/session.c:3763 +#: info/session.c:3857 msgid "I-search: " msgstr "I-zoeken: " -#: info/session.c:3788 +#: info/session.c:3882 msgid "Failing " msgstr "Niet gelukt: " -#: info/session.c:4244 +#: info/session.c:4340 msgid "Move to the previous cross reference" msgstr "Ga naar de vorige verwijzing" -#: info/session.c:4253 +#: info/session.c:4349 msgid "Move to the next cross reference" msgstr "Ga naar de volgende verwijzing" -#: info/session.c:4263 +#: info/session.c:4359 msgid "Select reference or menu item appearing on this line" msgstr "Selecteer verwijzing of menukeuze van deze regel" -#. **************************************************************** -#. -#. Miscellaneous Info Commands -#. -#. **************************************************************** -#. What to do when C-g is pressed in a window. -#: info/session.c:4285 +#: info/session.c:4381 msgid "Cancel current operation" msgstr "Annuleer huidige operatie" # Zie Cancel current action -#: info/session.c:4292 +#: info/session.c:4388 msgid "Quit" msgstr "Afgebroken" -#: info/session.c:4301 +#: info/session.c:4397 #, fuzzy msgid "Move the cursor to a specific line of the window" msgstr "Beweeg de cursor naar een bepaalde regel van het venster" -#. Clear the screen and redraw its contents. Given a numeric argument, -#. move the line the cursor is on to the COUNT'th line of the window. -#: info/session.c:4333 +#: info/session.c:4429 msgid "Redraw the display" msgstr "Herschrijf het venster" -#. This command does nothing. It is the fact that a key is bound to it -#. that has meaning. See the code at the top of info_session (). -#: info/session.c:4370 +#: info/session.c:4466 msgid "Quit using Info" msgstr "Stop met Info" -#: info/session.c:4393 +#: info/session.c:4479 +msgid "Run command bound to this key's lowercase variant" +msgstr "" + +#: info/session.c:4491 #, c-format msgid "Unknown command (%s)." msgstr "Onbekend commando (%s)." -#: info/session.c:4396 +#: info/session.c:4494 msgid "\"\" is invalid" msgstr "\"\" is ongeldig" -#: info/session.c:4397 +#: info/session.c:4495 #, c-format msgid "\"%s\" is invalid" msgstr "\"%s\" is ongeldig" -#: info/session.c:4620 +#: info/session.c:4713 msgid "Add this digit to the current numeric argument" msgstr "Voeg dit cijfer toe aan het huidige numerieke argument" -#: info/session.c:4629 +#: info/session.c:4722 msgid "Start (or multiply by 4) the current numeric argument" msgstr "Begin een nieuw numeriek argument of vermenigvuldig het huidige met 4" -#: info/session.c:4644 +#: info/session.c:4737 msgid "Internally used by \\[universal-argument]" msgstr "Intern gebruikt door \\[universeel-argument]" @@ -1335,449 +1587,490 @@ msgstr "Intern gebruikt door \\[universeel-argument]" msgid "readline: Out of virtual memory!\n" msgstr "readline: Geen virtueel geheugen meer!\n" -#: info/variables.c:40 +#: info/variables.c:37 msgid "When \"On\", footnotes appear and disappear automatically" msgstr "Indien \"Aan\", verschijnen en verdwijnen voetnoten automatisch" -#: info/variables.c:44 +#: info/variables.c:41 msgid "When \"On\", creating or deleting a window resizes other windows" msgstr "" "Indien \"Aan\", verandert het aanmaken of verwijderen van een venster de " "grootte van andere vensters" -#: info/variables.c:48 +#: info/variables.c:45 msgid "When \"On\", flash the screen instead of ringing the bell" msgstr "" "Indien \"Aan\", laat het scherm flikkeren in plaats van het laten horen van " "een piep" -#: info/variables.c:52 +#: info/variables.c:49 msgid "When \"On\", errors cause the bell to ring" msgstr "Indien \"Aan\", zorgen fouten voor een belsignaal" -#: info/variables.c:56 +#: info/variables.c:53 msgid "When \"On\", Info garbage collects files which had to be uncompressed" msgstr "" "Indien \"Aan\", haalt Info rommel weg voor bestanden die gedecomprimeerd " "moesten worden" -#: info/variables.c:59 +#: info/variables.c:56 msgid "When \"On\", the portion of the matched search string is highlighted" msgstr "" "Indien \"Aan\", wordt het overeenkomende deel van de zoek-tekenreeks " "opgelicht" -#: info/variables.c:63 +#: info/variables.c:60 msgid "Controls what happens when scrolling is requested at the end of a node" msgstr "" "Stelt in wat er gebeurt als er aan het eind van een node verschoven wordt" -#: info/variables.c:67 +#: info/variables.c:64 msgid "The number lines to scroll when the cursor moves out of the window" msgstr "Het aantal regels dat verschuift als de cursor uit het venster gaat" -#: info/variables.c:71 +#: info/variables.c:68 msgid "When \"On\", Info accepts and displays ISO Latin characters" msgstr "Indien \"Aan\", accepteert Info ISO Latin tekens en laat ze zien" -#: info/variables.c:77 +#: info/variables.c:74 msgid "Explain the use of a variable" msgstr "Leg het gebruik van een variabele uit" -#. Get the variable's name. -#: info/variables.c:83 +#: info/variables.c:80 msgid "Describe variable: " msgstr "Omschrijf variabele: " -#: info/variables.c:102 +#: info/variables.c:99 msgid "Set the value of an Info variable" msgstr "Zet de waarde van een Info variabele" -#. Get the variable's name and value. -#: info/variables.c:108 +#: info/variables.c:105 msgid "Set variable: " msgstr "Stel variabele in: " -#: info/variables.c:126 +#: info/variables.c:123 #, c-format msgid "Set %s to value (%d): " msgstr "Geef een waarde voor %s (%d): " -#: info/variables.c:167 +#: info/variables.c:164 #, c-format msgid "Set %s to value (%s): " msgstr "Geef een waarde voor %s (%s): " -#: info/window.c:1101 +#: info/window.c:1164 msgid "--*** Tags out of Date ***" msgstr "--*** Tags zijn verouderd ***" -#. strlen (location_indicator). -#. 10 for the decimal representation of the number of lines in this -#. node, and the remainder of the text that can appear in the line. -#: info/window.c:1112 +#: info/window.c:1175 msgid "-----Info: (), lines ----, " msgstr "-----Info: (), regels ----, " -#: info/window.c:1119 +#: info/window.c:1182 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "-%s---Info: %s, %d regels --%s--" -#: info/window.c:1123 +#: info/window.c:1186 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "-%s%s-Info: (%s)%s, %d regels --%s--" -#: info/window.c:1130 +#: info/window.c:1193 #, c-format msgid " Subfile: %s" msgstr "Sub-bestand: %s" -#: lib/getopt.c:680 +#: lib/getopt.c:675 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: optie `%s' is dubbelzinnig\n" -#: lib/getopt.c:704 +#: lib/getopt.c:700 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: optie `--%s' staat geen argumenten toe\n" -#: lib/getopt.c:709 +#: lib/getopt.c:705 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: optie `%c%s' staat geen argumenten toe\n" -#: lib/getopt.c:726 lib/getopt.c:899 +#: lib/getopt.c:723 lib/getopt.c:896 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: optie `%s' vereist een argument\n" -#. --option -#: lib/getopt.c:755 +#: lib/getopt.c:752 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: onbekende optie `--%s'\n" -#. +option or -option -#: lib/getopt.c:759 +#: lib/getopt.c:756 #, 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 -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:785 +#: lib/getopt.c:782 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" # Dezelfde tekst als hiervoor -#: lib/getopt.c:788 +#: lib/getopt.c:785 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ongeldige optie -- %c\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:818 lib/getopt.c:948 +#: lib/getopt.c:815 lib/getopt.c:945 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: optie vereist een argument -- %c\n" -#: lib/getopt.c:865 +#: lib/getopt.c:862 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: optie `-W %s' is dubbelzinnig\n" -#: lib/getopt.c:883 +#: lib/getopt.c:880 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: optie `-W %s' staat geen argumenten toe\n" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "January" msgstr "Januari" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "February" msgstr "Februari" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "March" msgstr "Maart" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "April" msgstr "April" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "May" msgstr "Mei" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "June" msgstr "Juni" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "July" msgstr "Juli" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "August" msgstr "Augustus" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "September" msgstr "September" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "October" msgstr "Oktober" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "November" msgstr "November" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "December" msgstr "December" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:658 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:701 msgid "@sc argument all uppercase, thus no effect" msgstr "" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:759 +#, fuzzy, c-format +msgid "`{' expected, but saw `%c'" +msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien" + +#: makeinfo/cmds.c:789 +msgid "end of file inside verb block" +msgstr "" + +#: makeinfo/cmds.c:797 +#, fuzzy, c-format +msgid "`}' expected, but saw `%c'" +msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien" + +#: makeinfo/cmds.c:942 #, c-format msgid "%c%s is obsolete" msgstr "%c%s is verouderd" -#: makeinfo/cmds.c:814 +#: makeinfo/cmds.c:1014 #, fuzzy, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "%csp vereist een postief numeriek argument" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "Verkeerd argument voor %c%s" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142 msgid "none" msgstr "geen" -#: makeinfo/defun.c:83 +#: makeinfo/defun.c:85 #, fuzzy msgid "Missing `}' in @def arg" msgstr "Ontbrekende `}' in het argument voor %cdef" -#: makeinfo/defun.c:358 +#: makeinfo/defun.c:363 msgid "Function" msgstr "Functie" -#: makeinfo/defun.c:361 +#: makeinfo/defun.c:366 msgid "Macro" msgstr "Makro" -#: makeinfo/defun.c:364 +#: makeinfo/defun.c:369 msgid "Special Form" msgstr "Speciaal Formulier" -#: makeinfo/defun.c:368 +#: makeinfo/defun.c:373 msgid "Variable" msgstr "Variabele" -#: makeinfo/defun.c:371 +#: makeinfo/defun.c:376 msgid "User Option" msgstr "Gebruikersoptie" -#: makeinfo/defun.c:375 +#: makeinfo/defun.c:380 msgid "Instance Variable" msgstr "Instantievariabele" -#: makeinfo/defun.c:379 +#: makeinfo/defun.c:384 msgid "Method" msgstr "Methode" -#: makeinfo/defun.c:450 makeinfo/defun.c:454 makeinfo/defun.c:556 -#: makeinfo/defun.c:570 makeinfo/defun.c:610 +#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615 +#: makeinfo/defun.c:631 makeinfo/defun.c:671 msgid "of" msgstr "" -#: makeinfo/defun.c:458 makeinfo/defun.c:462 makeinfo/defun.c:466 -#: makeinfo/defun.c:564 makeinfo/defun.c:615 +#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482 +#: makeinfo/defun.c:624 makeinfo/defun.c:676 #, fuzzy msgid "on" msgstr "geen" # Is die x een foutje? -#: makeinfo/defun.c:656 +#: makeinfo/defun.c:717 #, fuzzy, c-format msgid "Must be in `%s' insertion to use `%sx'" msgstr "Moet in een `%s' `insertion' zitten om `%s'x te gebruiken" -#: makeinfo/files.c:460 +#: makeinfo/files.c:448 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" msgstr "`%c%s' heeft een argument `{...}' nodig, niet slechts `%s'" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" msgstr "Geen afsluitende accolade voor voetnoot `%s'" # mooi vertaald he? -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" msgstr "Voetnoot gedefinieerd zonder referentie pagina" -#: makeinfo/footnote.c:278 +# mooi vertaald he? +#: makeinfo/footnote.c:210 +#, fuzzy +msgid "Footnotes inside footnotes are not allowed" +msgstr "Voetnoot gedefinieerd zonder referentie pagina" + +#: makeinfo/footnote.c:298 #, fuzzy msgid "Footnotes" msgstr "-Voetnoten" -#. The <title> should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:42 msgid "Untitled" msgstr "" -#: makeinfo/index.c:212 +#: makeinfo/html.c:298 +#, c-format +msgid "Invalid node name: `%s'" +msgstr "" + +#: makeinfo/index.c:213 #, c-format msgid "Unknown index `%s'" msgstr "Onbekende index `%s'" -#: makeinfo/index.c:382 +#: makeinfo/index.c:238 +#, c-format +msgid "Info cannot handle `:' in index entry `%s'" +msgstr "" + +#: makeinfo/index.c:396 #, c-format msgid "Index `%s' already exists" msgstr "Index `%s' bestaat al" -#: makeinfo/index.c:425 +#: makeinfo/index.c:439 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "Onbekende index `%s' en/of `%s' in @synindex" -#: makeinfo/index.c:642 +#: makeinfo/index.c:666 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "Onbekende index `%s' in @printindex" -#: makeinfo/index.c:680 +#: makeinfo/index.c:709 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:712 makeinfo/index.c:751 msgid "(outside of any node)" msgstr "" -#: makeinfo/insertion.c:192 +#: makeinfo/insertion.c:198 msgid "Broken-Type in insertion_type_pname" msgstr "Verkeerd-Type in insertion_type_pname" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:271 msgid "Enumeration stack overflow" msgstr "Enumeratiestapel overloop" # FIXME: hoe vertaal je `lettering'? tegenover enumerating -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:303 #, c-format msgid "lettering overflow, restarting at %c" msgstr "lettering overloop, start opnieuw bij %c" # FIXME: formatter? -#: makeinfo/insertion.c:481 +#: makeinfo/insertion.c:538 #, c-format msgid "%s requires an argument: the formatter for %citem" msgstr "%s vereist een argument: de formatteerder voor %citem" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:693 #, fuzzy, c-format msgid "`@end' expected `%s', but saw `%s'" msgstr "`%cend' verwachtte `%s', maar heb `%s' gezien" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:931 #, c-format msgid "No matching `%cend %s'" msgstr "Geen overeenkomende `%cend %s'" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:1084 #, c-format msgid "%s requires letter or digit" msgstr "%s vereist een letter of cijfer" -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1158 +msgid "end of file inside verbatim block" +msgstr "" + +#: makeinfo/insertion.c:1318 #, fuzzy msgid "@menu seen before first @node, creating `Top' node" msgstr "%cmenu gezien voor de eerste pagina" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1319 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" -#. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1331 #, fuzzy msgid "@detailmenu seen before first node, creating `Top' node" msgstr "%cmenu gezien voor de eerste pagina" -#: makeinfo/insertion.c:1074 +#: makeinfo/insertion.c:1346 #, c-format msgid "Unmatched `%c%s'" msgstr "Niet overeenkomende `%c%s'" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1353 #, c-format msgid "`%c%s' needs something after it" msgstr "`%c%s' verwacht er iets na" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1359 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" msgstr "Verkeerd argument voor `%s', `%s', gebruik `%s'" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1453 #, fuzzy, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "%citemx is zinloos in een `%s' blok" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1462 #, fuzzy, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "%citemx is zinloos in een `%s' blok" -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1646 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s buiten een invoeg-blok gevonden" -#: makeinfo/lang.c:199 +#: makeinfo/lang.c:331 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "" -#. This error message isn't perfect if the argument is multiple -#. characters, but it doesn't seem worth getting right. -#: makeinfo/lang.c:406 +#: makeinfo/lang.c:384 +#, fuzzy, c-format +msgid "unrecogized encoding name `%s'" +msgstr "%s: onbekende optie `--%s'\n" + +#: makeinfo/lang.c:387 +#, c-format +msgid "sorry, encoding `%s' not supported" +msgstr "" + +#: makeinfo/lang.c:414 +#, c-format +msgid "invalid encoded character `%s'" +msgstr "" + +#: makeinfo/lang.c:502 +#, c-format +msgid "%s is an invalid ISO code, using %c" +msgstr "" + +#: makeinfo/lang.c:687 #, 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:410 +#: makeinfo/lang.c:691 #, 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" @@ -1802,202 +2095,212 @@ msgstr "" msgid "Macro `%s' called on line %d with too many args" msgstr "Makro `%s' aangeroepen met te veel argumenten" -#: makeinfo/macro.c:595 +#: makeinfo/macro.c:594 #, c-format msgid "%cend macro not found" msgstr "%cend makro niet gevonden" -#: makeinfo/macro.c:634 +#: makeinfo/macro.c:632 #, fuzzy msgid "@quote-arg only useful for single-argument macros" msgstr "" "%cquote-arg is allen nuttig indien de makro slechts een argument verwacht" -#: makeinfo/macro.c:670 +#: makeinfo/macro.c:668 #, c-format msgid "mismatched @end %s with @%s" msgstr "" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:316 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: waarschuwing: " -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:339 msgid "Too many errors! Gave up.\n" msgstr "Te veel fouten! Ik heb het maar opgegeven.\n" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026 #, c-format msgid "Misplaced %c" msgstr "Verkeerd geplaatste %c" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:370 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "Probeer `%s --help' voor meer informatie.\n" -#: makeinfo/makeinfo.c:365 +#: makeinfo/makeinfo.c:373 +#, fuzzy, c-format +msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" +msgstr "Aanroep: %s [OPTIE]... BESTAND...\n" + +#: makeinfo/makeinfo.c:376 +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:380 #, c-format msgid "" -"Usage: %s [OPTION]... TEXINFO-FILE...\n" -"\n" -"Translate Texinfo source documentation to various other formats:\n" -"Info files suitable for reading online with Emacs or standalone GNU Info\n" -"(by default); plain text (with --no-headers); or HTML (with --html).\n" -"\n" -"Options:\n" -" --commands-in-node-names allow @ commands in node names.\n" -" -D VAR define a variable, as with @set.\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" --error-limit=NUM quit after NUM errors (default %d).\n" -" --fill-column=NUM break Info lines at NUM characters (default %d).\n" -" --footnote-style=STYLE output footnotes according to STYLE:\n" -" `separate' to place footnotes in their own " -"node,\n" -" `end' to place the footnotes at the end of the\n" -" node in which they are defined (the default).\n" -" --force preserve output even if errors.\n" -" --help display this help and exit.\n" -" --html output HTML rather than Info format;\n" -" -I DIR append DIR to the @include search path.\n" -" --ifhtml process @ifhtml and @html text even when not\n" -" generating HTML.\n" -" --ifinfo process @ifinfo text even when generating HTML.\n" -" --iftex process @iftex and @tex text.\n" -" implies --no-split.\n" +"General options:\n" +" --error-limit=NUM quit after NUM errors (default %d).\n" +" --force preserve output even if errors.\n" +" --help display this help and exit.\n" +" --no-validate suppress node cross-reference validation.\n" +" --no-warn suppress warnings (but not errors).\n" +" --reference-limit=NUM warn about at most NUM references (default %" +"d).\n" +" -v, --verbose explain what is being done.\n" +" --version display version information and exit.\n" +msgstr "" + +#: makeinfo/makeinfo.c:394 +#, no-wrap +msgid "" +"Output format selection (default is to produce Info):\n" +" --docbook output DocBook rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output XML (TexinfoML) rather than Info.\n" msgstr "" -# tot hier (half af) -#: makeinfo/makeinfo.c:391 -#, fuzzy, c-format +#: makeinfo/makeinfo.c:401 msgid "" -" --no-headers suppress Info node separators and Node: lines " -"and\n" -" write to standard output without --output.\n" -" --no-ifhtml do not process @ifhtml and @html text.\n" -" --no-ifinfo do not process @ifinfo text.\n" -" --no-iftex do not process @iftex and @tex text.\n" -" --no-split suppress splitting of large Info output files or\n" -" generation of one HTML file per node.\n" -" --no-validate suppress node cross-reference validation.\n" -" --no-warn suppress warnings (but not errors).\n" -" --number-sections include chapter, section, etc. numbers in " -"output.\n" -" -o, --output=FILE output to FILE, ignoring any @setfilename.\n" -" -P DIR prepend DIR to the @include search path.\n" -" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " -"%d).\n" -" if VAL is `none', do not indent;\n" -" if VAL is `asis', preserve existing " -"indentation.\n" -" --reference-limit=NUM warn about at most NUM references (default %d).\n" -" -U VAR undefine a variable, as with @clear.\n" -" -v, --verbose explain what is being done.\n" -" --version display version information and exit.\n" -msgstr "" -"Aanroep: %s [OPTIE]... TEXINFO-BESTAND...\n" -"\n" -"Vertaal Texinfo brondocumentatie naar een formaat dat geschikt is om " -"gelezen\n" -"te worden met GNU Info.\n" -"\n" -"Opties:\n" -"-D VAR definieer een variabele, zoals met @set.\n" -"-E MACRO-OFILE behandel alleen makro's, schrijf texinfo broncode.\n" -"-I MAP voeg MAP toe achter het @include mappenzoekpad.\n" -"-P MAP voeg MAP toe voor het @include mappenzoekpad.\n" -"-U VAR ondefinieer een variabele, zoals met @clear.\n" -"--error-limit NUM beëindig na een NUM aantal fouten (standaard %d).\n" -"--fill-column POS breek regels af op positie POS (standaard %d).\n" -"--footnote-style STIJL schrijf voetnoten volgens STIJL:\n" -" `separate' om voetnoten in een eigen pagina te " -"plaatsen,\n" -" `end' om voetnoten aan het einde van de pagina te " -"plaatsen\n" -" waarin ze gedefinieerd zijn (standaard).\n" -"--force bewaar de uitvoer ook bij fouten.\n" -"--help laat deze hulp zien en beëindig.\n" -"--no-validate onderdruk validatie van referenties.\n" -"--no-warn onderdruk waarschuwingen (maar fouten niet).\n" -"--no-split onderdruk het splitsen van grote bestanden.\n" -"--no-headers onderdruk paginascheidingen en Pagina: Foo koppen.\n" -"--output BEST, -o BEST schrijf naar BEST, en negeer een @setfilename.\n" -"--paragraph-indent VAL spring alinea's in met VAL spaties (standaard %d).\n" -" spring niet in indien VAL `none' is; behoud " -"bestaande\n" -" inspringing indien VAL `asis' is.\n" -"--reference-limit NUM klaag over hoogstens NUM verwijzingen (standaard " -"%d).\n" -"--verbose meld wat gedaan wordt.\n" -"--version geef versie-informatie en beëindig.\n" -"\n" -"Meld fouten in het programma aan bug-texinfo@gnu.org;\n" -"meld onjuistheden in de vertaling aan nl@li.org.\n" +"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" +msgstr "" #: makeinfo/makeinfo.c:415 +#, 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" +" --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" +" If VAL is `none', do not indent; if VAL is\n" +" `asis', preserve existing indentation.\n" +" --split-size=NUM split Info files at size NUM (default %d).\n" +msgstr "" + +#: makeinfo/makeinfo.c:433 +msgid "" +"Input file options:\n" +" --commands-in-node-names allow @ commands in node names.\n" +" -D VAR define the variable VAR, as with @set.\n" +" -I DIR append DIR to the @include search path.\n" +" -P DIR prepend DIR to the @include search path.\n" +" -U VAR undefine the variable VAR, as with @clear.\n" +msgstr "" + +#: makeinfo/makeinfo.c:442 +msgid "" +"Conditional processing in input:\n" +" --ifhtml process @ifhtml and @html even if not generating HTML.\n" +" --ifinfo process @ifinfo even if not generating Info.\n" +" --ifplaintext process @ifplaintext even if not generating plain text.\n" +" --iftex process @iftex and @tex; implies --no-split.\n" +" --no-ifhtml do not process @ifhtml and @html text.\n" +" --no-ifinfo do not process @ifinfo text.\n" +" --no-ifplaintext do not process @ifplaintext text.\n" +" --no-iftex do not process @iftex and @tex text.\n" +msgstr "" + +#: 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" +" if generating Info, --ifinfo is on and the others are off;\n" +" if generating plain text, --ifplaintext is on and the others are off;\n" +msgstr "" + +#: makeinfo/makeinfo.c:461 msgid "" -"\n" -"The defaults for the @if... conditionals depend on the output format:\n" -"if generating HTML, --ifhtml is on and the others are off;\n" -"if generating Info or plain text, --ifinfo is on and the others are off.\n" -"\n" "Examples:\n" -" makeinfo foo.texi write Info to foo's @setfilename\n" -" makeinfo --html foo.texi write HTML to foo's @setfilename\n" -" makeinfo --no-headers -o - foo.texi write plain text to standard output\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 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" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org." +" makeinfo --html --no-headers foo.texi write html without node lines, " +"menus\n" +" makeinfo --number-sections foo.texi write Info with numbered sections\n" +" makeinfo --no-split foo.texi write one Info file however big\n" msgstr "" -#: makeinfo/makeinfo.c:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655 +#: makeinfo/makeinfo.c:676 #, 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:521 +#: makeinfo/makeinfo.c:583 #, c-format msgid "Couldn't open macro expansion output `%s'" msgstr "Kon uitvoer `%s' voor makro-uitbreiding niet openen" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:586 msgid "Cannot specify more than one macro expansion output" msgstr "Je kunt niet meer dan een uitvoer voor makro-uitbreiding geven" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:624 #, 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:602 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" -"%s: argument voor --footnote-style moet `separate' of `end' zijn, niet " -"`%s'.\n" +"%s: argument voor --footnote-style moet `separate' of `end' zijn, niet `%" +"s'.\n" -#: makeinfo/makeinfo.c:647 +#: makeinfo/makeinfo.c:723 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: ontbrekend bestandsargument\n" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:898 #, c-format msgid "Expected `%s'" msgstr "Verwachtte `%s'" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1365 +msgid "File exists, but is not a directory" +msgstr "" + +#: makeinfo/makeinfo.c:1366 +#, c-format +msgid "Can't create directory `%s': %s" +msgstr "" + +#: makeinfo/makeinfo.c:1414 #, c-format msgid "No `%s' found in `%s'" msgstr "Geen `%s' gevonden in `%s'" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1496 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" @@ -2005,17 +2308,17 @@ msgstr "" "uitvoer\n" "van Info gaat daar al heen.\n" -#: makeinfo/makeinfo.c:1327 +#: makeinfo/makeinfo.c:1526 #, 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:1358 +#: makeinfo/makeinfo.c:1561 #, fuzzy, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "Dit is Info bestand %s, gemaakt door Makeinfo versie %d.%d" -#: makeinfo/makeinfo.c:1377 +#: makeinfo/makeinfo.c:1583 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -2023,272 +2326,318 @@ msgstr "" "%s: makro uitvoer bestand `%s' weggehaald wegens fouten; gebruik --force om " "te bewaren.\n" -#. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1627 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" "%s: uitvoer bestand `%s' weggehaald wegens fouten; gebruik --force om te " "bewaren.\n" -#: makeinfo/makeinfo.c:1635 +#: makeinfo/makeinfo.c:1853 #, c-format msgid "Unknown command `%s'" msgstr "Onbekend commando `%s'" -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1875 #, fuzzy, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "commandoregel-argument `%s' te veel" -#: makeinfo/makeinfo.c:1838 +#: makeinfo/makeinfo.c:2068 #, c-format msgid "%c%s expected `{...}'" msgstr "%c%s verwachtte `{...}'" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:2098 msgid "Unmatched }" msgstr "Niet-overeenkomende }" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:2148 msgid "NO_NAME!" msgstr "GEEN_NAAM!" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:2169 #, c-format msgid "%c%s missing close brace" msgstr "%c%s ontbrekende afsluitende accolade" -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 +#: makeinfo/makeinfo.c:2958 +msgid "First argument to cross-reference may not be empty" +msgstr "" + +#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340 msgid "see " msgstr "" -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:3018 msgid "See " msgstr "" -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:3164 #, c-format msgid "`.' or `,' must follow cross reference, not %c" msgstr "`.' of `,' moeten op een verwijzing volgen, niet %c" -#: makeinfo/makeinfo.c:3026 -#, c-format -msgid "No .png or .jpg for `%s'" +#: makeinfo/makeinfo.c:3212 +msgid "First argument to @inforef may not be empty" msgstr "" -#: makeinfo/makeinfo.c:3063 +#: makeinfo/makeinfo.c:3427 +#, fuzzy, c-format +msgid "@image file `%s' (for HTML) not readable: %s" +msgstr "@image bestand `%s' onleesbaar: %s" + +#: makeinfo/makeinfo.c:3440 #, c-format -msgid "@image file `%s' unreadable: %s" +msgid "No `%s.png' or `.jpg', and no extension supplied" +msgstr "" + +#: makeinfo/makeinfo.c:3490 +#, fuzzy, c-format +msgid "@image file `%s' (for text) unreadable: %s" msgstr "@image bestand `%s' onleesbaar: %s" -#: makeinfo/makeinfo.c:3070 +#: makeinfo/makeinfo.c:3497 msgid "@image missing filename argument" msgstr "ontbrekend bestandsnaam argument voor @image" -#: makeinfo/makeinfo.c:3259 +#: makeinfo/makeinfo.c:3690 #, fuzzy, c-format msgid "{No value for `%s'}" msgstr "{Geen waarde voor \"%s\"}" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3744 #, c-format msgid "%c%s requires a name" msgstr "%c%s vereist een naam" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3850 #, c-format msgid "Reached eof before matching @end %s" msgstr "Kwam bestandseinde tegen voor een overeenkomende @end %s" -#: makeinfo/multi.c:208 +#: makeinfo/makeinfo.c:4081 +#, c-format +msgid "`%.40s...' is too long for expansion; not expanded" +msgstr "" + +#: makeinfo/multi.c:226 #, fuzzy msgid "Missing } in @multitable template" msgstr "Ontbrekende `}' in het argument voor %cdef" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:302 #, c-format msgid "ignoring stray text `%s' after @multitable" msgstr "onbeheerde tekst `%s' na @multitable genegeerd" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:375 #, c-format msgid "Too many columns in multitable item (max %d)" msgstr "Te veel kolommen in `multitable' item (maximaal %d)" -#: makeinfo/multi.c:401 +#: makeinfo/multi.c:426 #, c-format msgid "Cannot select column #%d in multitable" msgstr "Kan kolom #%d niet selecteren in `multitabel'" -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:529 msgid "ignoring @tab outside of multitable" msgstr "@tab buiten een `multitable' genegeerd" -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:565 msgid "** Multicolumn output from last row:\n" msgstr "** Multikolom uitvoer van laatste regel:\n" -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:568 #, c-format msgid "* column #%d: output = %s\n" msgstr "* kolom #%d: uitvoer = %s\n" -#: makeinfo/node.c:250 +#: makeinfo/node.c:276 #, fuzzy, c-format msgid "Node `%s' previously defined at line %d" msgstr "makro `%s' al eerder gedefinieerd" -#: makeinfo/node.c:514 +#: makeinfo/node.c:594 #, c-format msgid "Formatting node %s...\n" msgstr "Pagina %s wordt geformatteerd...\n" -#: makeinfo/node.c:559 +#: makeinfo/node.c:655 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" msgstr "Pagina `%s' vereist een sectiecommando (bijv. %c%s)" -#: makeinfo/node.c:719 +#: makeinfo/node.c:815 #, c-format msgid "No node name specified for `%c%s' command" msgstr "" -#: makeinfo/node.c:774 +#: makeinfo/node.c:856 makeinfo/node.c:1075 +#, c-format +msgid "Anchor `%s' and node `%s' map to the same file name" +msgstr "" + +#: makeinfo/node.c:859 +msgid "This @anchor command ignored; references to it will not work" +msgstr "" + +#: makeinfo/node.c:861 makeinfo/node.c:1078 +msgid "Rename this anchor or use the `--no-split' option" +msgstr "" + +#: makeinfo/node.c:891 +#, c-format +msgid "Unexpected string at end of split-HTML file `%s'" +msgstr "" + +#: makeinfo/node.c:920 #, fuzzy msgid "Node:" msgstr "Volgende" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 +#: makeinfo/node.c:930 #, fuzzy msgid "Next:" msgstr "Volgende" -#: makeinfo/node.c:793 +#: makeinfo/node.c:940 #, fuzzy msgid "Previous:" msgstr "Vorige" -#: makeinfo/node.c:803 +#: makeinfo/node.c:950 #, fuzzy msgid "Up:" msgstr "Omhoog" -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1072 +#, c-format +msgid "Anchors `%s' and `%s' map to the same file name" +msgstr "" + +#: makeinfo/node.c:1077 +msgid "@anchor command ignored; references to it will not work" +msgstr "" + +#: makeinfo/node.c:1277 #, c-format msgid "%s reference to nonexistent node `%s'" msgstr "%s verwijst naar niet-bestaande pagina `%s'" -#: makeinfo/node.c:1029 +#: makeinfo/node.c:1294 #, fuzzy msgid "Menu" msgstr "* Menu:\n" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1296 msgid "Cross" msgstr "" # 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:1115 +#: makeinfo/node.c:1380 #, fuzzy, c-format msgid "Next field of node `%s' not pointed to" msgstr "Het `next'-veld van pagina `%s' wijst niet terug op" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1383 #, fuzzy, c-format msgid "This node (%s) has the bad Prev" msgstr "Deze node (`%s') is degene met het foute `next'-veld" -#: makeinfo/node.c:1133 +#: makeinfo/node.c:1395 #, fuzzy msgid "Prev" msgstr "Vorige" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1438 #, fuzzy, c-format msgid "Prev field of node `%s' not pointed to" msgstr "Het `prev'-veld van node (`%s') wijst niet terug op" -#: makeinfo/node.c:1180 +#: makeinfo/node.c:1442 #, fuzzy, c-format msgid "This node (%s) has the bad Next" msgstr "Deze node (`%s') is degene met het foute `next'-veld" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1454 #, fuzzy, c-format msgid "`%s' has no Up field" msgstr "Node `%s' heeft geen `up'-veld" -#: makeinfo/node.c:1197 +#: makeinfo/node.c:1457 #, fuzzy msgid "Up" msgstr "Omhoog" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1523 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" # Eigenlijk zouden hier de %s en de %d omgedraaid moeten worden: # `Er wordt %d keer naar %s verwezen' -#: makeinfo/node.c:1296 +#: makeinfo/node.c:1552 #, c-format msgid "node `%s' has been referenced %d times" msgstr "er wordt naar pagina `%s' %d keer verwezen" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1566 #, c-format msgid "unreferenced node `%s'" msgstr "naar pagina `%s' wordt niet verwezen" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " msgstr "" -#. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" msgstr "" -#: makeinfo/sectioning.c:468 +#: makeinfo/sectioning.c:502 #, c-format msgid "%c%s is obsolete; use %c%s instead" msgstr "%c%s is verouderd; gebruik in plaats daarvan %c%s" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:518 #, c-format msgid "Node with %ctop as a section already exists" msgstr "Pagina met %ctop als sectie bestaat al" -#: makeinfo/sectioning.c:496 +#: makeinfo/sectioning.c:526 #, c-format msgid "Here is the %ctop node" msgstr "Hier is de %ctop pagina" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:543 #, c-format msgid "%ctop used before %cnode, defaulting to %s" msgstr "%ctop wordt voor %cnode gebruikt, neem standaard %s aan" -#. in case we are writing stdout -#: makeinfo/toc.c:212 makeinfo/toc.c:261 makeinfo/toc.c:262 +#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299 msgid "Table of Contents" msgstr "" -#. in case we are writing stdout -#: makeinfo/toc.c:292 makeinfo/toc.c:319 makeinfo/toc.c:320 +#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367 msgid "Short Contents" msgstr "" -#: makeinfo/toc.c:354 +#: makeinfo/toc.c:406 #, c-format msgid "%s: TOC should be here, but it was not found" msgstr "" +#: makeinfo/xml.c:1108 +#, c-format +msgid "@image file `%s' unreadable: %s" +msgstr "@image bestand `%s' onleesbaar: %s" + #: util/install-info.c:151 #, c-format msgid "%s: warning: " @@ -2343,9 +2692,6 @@ msgid "" " If you don't specify any sections, they are determined\n" " from information in the Info file itself.\n" " --version display version information and exit.\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" "%s [OPTIE]... [INFO-BESTAND [INHOUD-BESTAND]]\n" "\n" @@ -2381,7 +2727,7 @@ msgstr "" "Meld fouten in het programma aan bug-texinfo@gno.org;\n" "meld onjuistheden in de vertaling aan nl@li.org.\n" -#: util/install-info.c:442 +#: util/install-info.c:444 #, fuzzy, c-format msgid "" "This is the file .../info/dir, which contains the\n" @@ -2417,104 +2763,98 @@ msgstr "" "\n" "* Menu:\n" -#: util/install-info.c:465 +#: util/install-info.c:467 #, c-format msgid "%s: could not read (%s) and could not create (%s)\n" msgstr "%s: niet leesbaar (%s) en het kon ook niet aanmaken (%s)\n" -#: util/install-info.c:549 +#: util/install-info.c:551 #, c-format msgid "%s: empty file" msgstr "" -#: util/install-info.c:864 util/install-info.c:904 +#: util/install-info.c:866 util/install-info.c:906 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:899 +#: util/install-info.c:901 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:1147 util/install-info.c:1157 +#: util/install-info.c:1150 util/install-info.c:1160 #, c-format msgid "%s: Specify the Info directory only once.\n" msgstr "%s: Geef de Info inhoud slechts een keer.\n" -#: util/install-info.c:1192 +#: util/install-info.c:1195 #, 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:1241 +#: util/install-info.c:1244 #, c-format msgid "excess command line argument `%s'" msgstr "commandoregel-argument `%s' te veel" -#: util/install-info.c:1245 +#: util/install-info.c:1248 msgid "No input file specified; try --help for more information." msgstr "Geen invoerbestand gegeven; probeer --help voor meer informatie." -#: util/install-info.c:1247 +#: util/install-info.c:1251 msgid "No dir file specified; try --help for more information." msgstr "Geen inhoudbestand gegeven; probeer --help voor meer informatie." -#. No need to abort here, the original info file may not -#. have the requisite Texinfo commands. This is not -#. something an installer should have to correct (it's a -#. problem for the maintainer), and there's no need to cause -#. subsequent parts of `make install' to fail. -#: util/install-info.c:1269 +#: util/install-info.c:1273 #, c-format msgid "no info dir entry in `%s'" msgstr "geen info inhoudsingang in `%s'" -#: util/install-info.c:1384 +#: util/install-info.c:1388 #, c-format msgid "menu item `%s' already exists, for file `%s'" msgstr "menukeuze `%s' bestaat al, voor bestand `%s'" -#: util/install-info.c:1407 +#: util/install-info.c:1411 #, c-format msgid "no entries found for `%s'; nothing deleted" msgstr "geen ingangen voor `%s' gevonden; niets verwijderd" -#: util/texindex.c:244 +#: util/texindex.c:245 msgid "display this help and exit" msgstr "geef deze hulp en beëindig" -#: util/texindex.c:246 +#: util/texindex.c:247 msgid "keep temporary files around after processing" msgstr "behoud tijdelijke bestanden na verwerking" -#: util/texindex.c:248 +#: util/texindex.c:249 msgid "do not keep temporary files around after processing (default)" msgstr "behoud de tijdelijke bestanden na verwerking niet (standaard)" -#: util/texindex.c:250 +#: util/texindex.c:251 msgid "send output to FILE" msgstr "stuur uitvoor naar BESTAND" -#: util/texindex.c:252 +#: util/texindex.c:253 msgid "display version information and exit" msgstr "geef versie informatie en beëindig" -#: util/texindex.c:263 +#: util/texindex.c:264 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "Aanroep: %s [OPTIE]... BESTAND...\n" -#: util/texindex.c:264 +#: util/texindex.c:265 msgid "Generate a sorted index for each TeX output FILE.\n" msgstr "Maak een gesorteerde index voor elk TeX uitvoer BESTAND.\n" -#: util/texindex.c:267 +#: util/texindex.c:268 #, fuzzy, c-format msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n" msgstr "" "Normaal gesproken is BESTAND... `foo.??' voor een dokument `foo.texi'.\n" -#. avoid trigraph in cat-id-tbl.c -#: util/texindex.c:269 +#: util/texindex.c:270 msgid "" "\n" "Options:\n" @@ -2522,43 +2862,41 @@ msgstr "" "\n" "Opties:\n" -#: util/texindex.c:285 -msgid "" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" -msgstr "" - -#: util/texindex.c:885 util/texindex.c:919 util/texindex.c:995 -#: util/texindex.c:1023 +#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997 +#: util/texindex.c:1025 #, c-format msgid "%s: not a texinfo index file" msgstr "%s: geen texinfo inhoudbestand" -#: util/texindex.c:980 +#: util/texindex.c:982 #, c-format msgid "failure reopening %s" msgstr "fout bij het heropenen van %s" -#: util/texindex.c:1222 +#: util/texindex.c:1224 #, c-format msgid "No page number in %s" msgstr "" # FIXME: secondary -#: util/texindex.c:1293 +#: util/texindex.c:1295 #, c-format msgid "entry %s follows an entry with a secondary name" msgstr "ingang %s volgt op een ingang met een alternatieve naam" -#: util/texindex.c:1631 +#: util/texindex.c:1633 #, c-format msgid "%s; for file `%s'.\n" msgstr "%s; voor bestand `%s'.\n" -#~ msgid "" -#~ "---------- Footnotes ----------\n" +#, fuzzy +#~ msgid "----------------------\n" +#~ msgstr "" +#~ "---------- Voetnoten ----------\n" #~ "\n" + +#, fuzzy +#~ msgid "---------------\n" #~ msgstr "" #~ "---------- Voetnoten ----------\n" #~ "\n" @@ -2573,22 +2911,104 @@ msgstr "%s; voor bestand `%s'.\n" #~ "(by default); plain text (with --no-headers); or HTML (with --html).\n" #~ "\n" #~ "Options:\n" -#~ " -D VAR define a variable, as with @set.\n" -#~ " -I DIR append DIR to the @include search path.\n" -#~ " -P DIR prepend DIR to the @include search path.\n" -#~ " -U VAR undefine a variable, as with @clear.\n" #~ " --commands-in-node-names allow @ commands in node names.\n" +#~ " -D VAR define a variable, as with @set.\n" +#~ "--docbook output DocBook rather than Info format.\n" +#~ " -E, --macro-expand FILE output macro-expanded source to FILE.\n" #~ " --error-limit=NUM quit after NUM errors (default %d).\n" -#~ " --fill-column=NUM break Info lines at NUM characters (default %d).\n" +#~ " --fill-column=NUM break Info lines at NUM characters (default %" +#~ "d).\n" #~ " --footnote-style=STYLE output footnotes according to STYLE:\n" #~ " `separate' to place footnotes in their own " #~ "node,\n" -#~ " `end' to place the footnotes at the end of the\n" -#~ " node in which they are defined (the default).\n" +#~ " `end' to place the footnotes at the end of " +#~ "the\n" +#~ " node in which they are defined (the " +#~ "default).\n" #~ " --force preserve output even if errors.\n" #~ " --help display this help and exit.\n" -#~ " --html output HTML rather than Info format;\n" -#~ " implies --no-split.\n" +#~ " --html output HTML rather than Info format.\n" +#~ " -I DIR append DIR to the @include search path.\n" +#~ " --ifhtml process @ifhtml and @html text even when not\n" +#~ " generating HTML.\n" +#~ " --ifinfo process @ifinfo text even when generating " +#~ "HTML.\n" +#~ " --iftex process @iftex and @tex text.\n" +#~ " implies --no-split.\n" +#~ msgstr "" +#~ "Aanroep: %s [OPTIE]... TEXINFO-BESTAND...\n" +#~ "\n" +#~ "Vertaal Texinfo brondocumentatie naar een formaat dat geschikt is om " +#~ "gelezen\n" +#~ "te worden met GNU Info.\n" +#~ "\n" +#~ "Opties:\n" +#~ "-D VAR definieer een variabele, zoals met @set.\n" +#~ "-E MACRO-OFILE behandel alleen makro's, schrijf texinfo " +#~ "broncode.\n" +#~ "-I MAP voeg MAP toe achter het @include mappenzoekpad.\n" +#~ "-P MAP voeg MAP toe voor het @include mappenzoekpad.\n" +#~ "-U VAR ondefinieer een variabele, zoals met @clear.\n" +#~ "--error-limit NUM beëindig na een NUM aantal fouten (standaard %d).\n" +#~ "--fill-column POS breek regels af op positie POS (standaard %d).\n" +#~ "--footnote-style STIJL schrijf voetnoten volgens STIJL:\n" +#~ " `separate' om voetnoten in een eigen pagina te " +#~ "plaatsen,\n" +#~ " `end' om voetnoten aan het einde van de pagina " +#~ "te plaatsen\n" +#~ " waarin ze gedefinieerd zijn (standaard).\n" +#~ "--force bewaar de uitvoer ook bij fouten.\n" +#~ "--help laat deze hulp zien en beëindig.\n" +#~ "--no-validate onderdruk validatie van referenties.\n" +#~ "--no-warn onderdruk waarschuwingen (maar fouten niet).\n" +#~ "--no-split onderdruk het splitsen van grote bestanden.\n" +#~ "--no-headers onderdruk paginascheidingen en Pagina: Foo " +#~ "koppen.\n" +#~ "--output BEST, -o BEST schrijf naar BEST, en negeer een @setfilename.\n" +#~ "--paragraph-indent VAL spring alinea's in met VAL spaties (standaard %" +#~ "d).\n" +#~ " spring niet in indien VAL `none' is; behoud " +#~ "bestaande\n" +#~ " inspringing indien VAL `asis' is.\n" +#~ "--reference-limit NUM klaag over hoogstens NUM verwijzingen (standaard %" +#~ "d).\n" +#~ "--verbose meld wat gedaan wordt.\n" +#~ "--version geef versie-informatie en beëindig.\n" +#~ "\n" +#~ "Meld fouten in het programma aan bug-texinfo@gnu.org;\n" +#~ "meld onjuistheden in de vertaling aan nl@li.org.\n" + +# tot hier (half af) +#, fuzzy +#~ msgid "" +#~ " --no-headers suppress Info node separators and Node: " +#~ "lines;\n" +#~ " write to standard output without --output.\n" +#~ " --no-ifhtml do not process @ifhtml and @html text.\n" +#~ " --no-ifinfo do not process @ifinfo text.\n" +#~ " --no-iftex do not process @iftex and @tex text.\n" +#~ " --no-split suppress splitting of Info or HTML output,\n" +#~ " generate only one output file.\n" +#~ " --no-validate suppress node cross-reference validation.\n" +#~ " --no-warn suppress warnings (but not errors).\n" +#~ " --number-sections include chapter, section, etc. numbers in " +#~ "output.\n" +#~ " -o, --output=FILE output to FILE (directory if split HTML),\n" +#~ " ignoring any @setfilename.\n" +#~ " -P DIR prepend DIR to the @include search path.\n" +#~ " --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default %" +#~ "d).\n" +#~ " if VAL is `none', do not indent;\n" +#~ " if VAL is `asis', preserve existing " +#~ "indentation.\n" +#~ " --reference-limit=NUM warn about at most NUM references (default %" +#~ "d).\n" +#~ " --split-size=NUM split into files at NUM size. (default %d).\n" +#~ " -U VAR undefine a variable, as with @clear.\n" +#~ " -v, --verbose explain what is being done.\n" +#~ " --version display version information and exit.\n" +#~ " --xml output XML (TexinfoML) rather than Info " +#~ "format.\n" #~ msgstr "" #~ "Aanroep: %s [OPTIE]... TEXINFO-BESTAND...\n" #~ "\n" @@ -2598,7 +3018,8 @@ msgstr "%s; voor bestand `%s'.\n" #~ "\n" #~ "Opties:\n" #~ "-D VAR definieer een variabele, zoals met @set.\n" -#~ "-E MACRO-OFILE behandel alleen makro's, schrijf texinfo broncode.\n" +#~ "-E MACRO-OFILE behandel alleen makro's, schrijf texinfo " +#~ "broncode.\n" #~ "-I MAP voeg MAP toe achter het @include mappenzoekpad.\n" #~ "-P MAP voeg MAP toe voor het @include mappenzoekpad.\n" #~ "-U VAR ondefinieer een variabele, zoals met @clear.\n" @@ -2607,22 +3028,24 @@ msgstr "%s; voor bestand `%s'.\n" #~ "--footnote-style STIJL schrijf voetnoten volgens STIJL:\n" #~ " `separate' om voetnoten in een eigen pagina te " #~ "plaatsen,\n" -#~ " `end' om voetnoten aan het einde van de pagina te " -#~ "plaatsen\n" +#~ " `end' om voetnoten aan het einde van de pagina " +#~ "te plaatsen\n" #~ " waarin ze gedefinieerd zijn (standaard).\n" #~ "--force bewaar de uitvoer ook bij fouten.\n" #~ "--help laat deze hulp zien en beëindig.\n" #~ "--no-validate onderdruk validatie van referenties.\n" #~ "--no-warn onderdruk waarschuwingen (maar fouten niet).\n" #~ "--no-split onderdruk het splitsen van grote bestanden.\n" -#~ "--no-headers onderdruk paginascheidingen en Pagina: Foo koppen.\n" +#~ "--no-headers onderdruk paginascheidingen en Pagina: Foo " +#~ "koppen.\n" #~ "--output BEST, -o BEST schrijf naar BEST, en negeer een @setfilename.\n" -#~ "--paragraph-indent VAL spring alinea's in met VAL spaties (standaard %d).\n" +#~ "--paragraph-indent VAL spring alinea's in met VAL spaties (standaard %" +#~ "d).\n" #~ " spring niet in indien VAL `none' is; behoud " #~ "bestaande\n" #~ " inspringing indien VAL `asis' is.\n" -#~ "--reference-limit NUM klaag over hoogstens NUM verwijzingen (standaard " -#~ "%d).\n" +#~ "--reference-limit NUM klaag over hoogstens NUM verwijzingen (standaard %" +#~ "d).\n" #~ "--verbose meld wat gedaan wordt.\n" #~ "--version geef versie-informatie en beëindig.\n" #~ "\n" @@ -2669,7 +3092,8 @@ msgstr "%s; voor bestand `%s'.\n" #~ msgid "Node `%s' multiply defined (line %d is first definition at)" #~ msgstr "" -#~ "Pagina `%s' meerdere keren gedefinieerd (de eerste definitie is op regel %d)" +#~ "Pagina `%s' meerdere keren gedefinieerd (de eerste definitie is op regel %" +#~ "d)" #~ msgid "This node (`%s') is the one with the bad `Prev'" #~ msgstr "Deze node (`%s') is degene met het foute `prev'-veld" diff --git a/gnu/usr.bin/texinfo/po/no.gmo b/gnu/usr.bin/texinfo/po/no.gmo Binary files differindex 23d75930650..ef5e48e22aa 100644 --- a/gnu/usr.bin/texinfo/po/no.gmo +++ b/gnu/usr.bin/texinfo/po/no.gmo diff --git a/gnu/usr.bin/texinfo/po/no.po b/gnu/usr.bin/texinfo/po/no.po index 71ac2baf0e0..33dd714c90f 100644 --- a/gnu/usr.bin/texinfo/po/no.po +++ b/gnu/usr.bin/texinfo/po/no.po @@ -1,29 +1,23 @@ -# Norwegian translation of messages for Texinfo 3.12t (bokmål dialect). +# Norwegian translation of messages for Texinfo 4.0i (bokmål dialect). # Copyright (C) 1999 Free Software Foundation, Inc. -# Trond Endrestøl <endrestol@hotmail.com>, 1998. +# Trond Endrestøl <endrestol@hotmail.com>, 1998. # msgid "" msgstr "" -"Project-Id-Version: Texinfo 3.12t\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" -"PO-Revision-Date: 1999-09-20 23:27+02:00\n" -"Last-Translator: Trond Endrestøl <endrestol@hotmail.com>\n" -"Language-Team: Norwegian-bokmål <no@li.org>\n" +"Project-Id-Version: Texinfo 4.0i\n" +"POT-Creation-Date: 2002-04-01 06:10-0800\n" +"PO-Revision-Date: 2002-02-25 23:06+01:00\n" +"Last-Translator: Trond Endrestøl <trond@ramstind.gtf.ol.no>\n" +"Language-Team: Norwegian-bokmål <no@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=ISO-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#. **************************************************************** -#. -#. Echo Area Movement Commands -#. -#. **************************************************************** -#: info/echo-area.c:283 info/session.c:711 +#: info/echo-area.c:283 info/session.c:712 msgid "Move forward a character" msgstr "Flytte forover et tegn" -#. Move point backward in the node. -#: info/echo-area.c:295 info/session.c:727 +#: info/echo-area.c:295 info/session.c:728 msgid "Move backward a character" msgstr "Flytte bakover et tegn" @@ -35,22 +29,21 @@ msgstr "Flytte til starten av denne linjen" msgid "Move to the end of this line" msgstr "Flytte til slutten av denne linjen" -#. Move forward a word in the input line. -#: info/echo-area.c:320 info/session.c:745 +#: info/echo-area.c:320 info/session.c:746 msgid "Move forward a word" msgstr "Flytte forover et ord" -#: info/echo-area.c:360 info/session.c:794 +#: info/echo-area.c:360 info/session.c:795 msgid "Move backward a word" msgstr "Flytte tilbake et ord" #: info/echo-area.c:400 msgid "Delete the character under the cursor" -msgstr "Slette tegnet under markøren" +msgstr "Slette tegnet under markøren" #: info/echo-area.c:430 msgid "Delete the character behind the cursor" -msgstr "Slette tegnet bak markøren" +msgstr "Slette tegnet bak markøren" #: info/echo-area.c:451 msgid "Cancel or quit operation" @@ -58,7 +51,7 @@ msgstr "Avbryte eller avslutte operasjon" #: info/echo-area.c:466 msgid "Accept (or force completion of) this line" -msgstr "Godta (eller tvinge fullføring av) denne linjen" +msgstr "Godta (eller tvinge fullføring av) denne linjen" #: info/echo-area.c:471 msgid "Insert next character verbatim" @@ -72,8 +65,6 @@ msgstr "Sette inn dette tegnet" msgid "Insert a TAB character" msgstr "Sette inn en tabulator" -#. Transpose the characters at point. If point is at the end of the line, -#. then transpose the characters before point. #: info/echo-area.c:504 msgid "Transpose characters at point" msgstr "Transponere tegnet ved punktet" @@ -86,14 +77,10 @@ msgstr "Rykke tilbake innholdet fra forrige felling" msgid "Kill ring is empty" msgstr "Fellingsringen er tom" -#. If the last command was yank, or yank_pop, and the text just before -#. point is identical to the current kill item, then delete that text -#. from the line, rotate the index down, and yank back some other text. #: info/echo-area.c:575 msgid "Yank back a previous kill" msgstr "Rykke tilbake en tidligere felling" -#. Delete the text from point to end of line. #: info/echo-area.c:608 msgid "Kill to the end of the line" msgstr "Slette til slutten av linjen" @@ -102,54 +89,50 @@ msgstr "Slette til slutten av linjen" msgid "Kill to the beginning of the line" msgstr "Slette til begynnelsen av linjen" -#. Delete from point to the end of the current word. #: info/echo-area.c:633 msgid "Kill the word following the cursor" -msgstr "Slette ordet etter markøren" +msgstr "Slette ordet etter markøren" #: info/echo-area.c:652 msgid "Kill the word preceding the cursor" -msgstr "Slette ordet før markøren" +msgstr "Slette ordet før markøren" -#: info/echo-area.c:871 +#: info/echo-area.c:872 info/echo-area.c:932 +msgid "No completions" +msgstr "Ingen fullføringer" + +#: info/echo-area.c:874 msgid "Not complete" msgstr "Ikke fullstendig" -#: info/echo-area.c:916 +#: info/echo-area.c:919 msgid "List possible completions" -msgstr "Liste mulige fullføringer" - -#: info/echo-area.c:929 -msgid "No completions" -msgstr "Ingen fullføringer" +msgstr "Liste mulige fullføringer" -#: info/echo-area.c:933 +#: info/echo-area.c:936 msgid "Sole completion" -msgstr "Eneste fullføring" +msgstr "Eneste fullføring" -#: info/echo-area.c:942 +#: info/echo-area.c:945 msgid "One completion:\n" -msgstr "En fullføring:\n" +msgstr "En fullføring:\n" -#: info/echo-area.c:943 +#: info/echo-area.c:946 #, c-format msgid "%d completions:\n" -msgstr "%d fullføringer:\n" +msgstr "%d fullføringer:\n" -#: info/echo-area.c:1089 +#: info/echo-area.c:1092 msgid "Insert completion" -msgstr "Sett inn fullføring" +msgstr "Sett inn fullføring" -#: info/echo-area.c:1222 +#: info/echo-area.c:1225 msgid "Building completions..." -msgstr "Bygger fullføringer..." +msgstr "Bygger fullføringer..." -#. Scroll the "other" window. If there is a window showing completions, scroll -#. that one, otherwise scroll the window which was active on entering the read -#. function. -#: info/echo-area.c:1320 +#: info/echo-area.c:1342 msgid "Scroll the completions window" -msgstr "Rulle fullføringsvinduet" +msgstr "Rulle fullføringsvinduet" #: info/footnotes.c:212 msgid "Footnotes could not be displayed" @@ -159,6 +142,10 @@ msgstr "Fotnoter kunne ikke vises" msgid "Show the footnotes associated with this node in another window" msgstr "Vise fotnotene assosiert med denne noden i et annet vindu" +#: info/footnotes.h:26 +msgid "---------- Footnotes ----------" +msgstr "---------- Fotnoter -----------" + #: info/indices.c:175 msgid "Look up a string in the index for this file" msgstr "Lete opp en streng i indeksen til denne filen" @@ -179,12 +166,12 @@ msgstr "Indeksinnslag: " msgid "" "Go to the next matching index item from the last `\\[index-search]' command" msgstr "" -"Gå til det neste passende indeksinnslaget fra forrige " -"'\\[index-search]'-kommando" +"Gå til det neste passende indeksinnslaget fra forrige '\\[index-search]'-" +"kommando" #: info/indices.c:342 msgid "No previous index search string." -msgstr "Ingen tidligere indekssøkestrenger." +msgstr "Ingen tidligere indekssøkestrenger." #: info/indices.c:349 msgid "No index entries." @@ -193,7 +180,7 @@ msgstr "Ingen indeksinnslag." #: info/indices.c:382 #, c-format msgid "No %sindex entries containing \"%s\"." -msgstr "Ingen %sindeksinnslag inneholdende «%s»." +msgstr "Ingen %sindeksinnslag inneholdende «%s»." #: info/indices.c:383 msgid "more " @@ -206,18 +193,23 @@ msgstr "KAN IKKE SE DETTE" #: info/indices.c:429 #, c-format msgid "Found \"%s\" in %s. (`\\[next-index-match]' tries to find next.)" -msgstr "Fant «%s» i %s. («\\[next-index-match]» prøver å finne den neste.)" +msgstr "Fant «%s» i %s. («\\[next-index-match]» prøver å finne den neste.)" #: info/indices.c:549 #, c-format msgid "Scanning indices of \"%s\"..." -msgstr "Sjekker indekser i «%s»..." +msgstr "Sjekker indekser i «%s»..." + +#: info/indices.c:603 +#, c-format +msgid "No available info files have \"%s\" in their indices." +msgstr "Ingen av de tilgjengelig infofilene har «%s» i deres indekser." #: info/indices.c:632 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "" -"Kravle gjennom alle kjente infofilers indekser etter en streng og bygge opp " -"en meny" +"Kravle gjennom alle kjente infofilers indekser etter en streng\n" +" og bygge opp en meny" #: info/indices.c:636 msgid "Index apropos: " @@ -230,14 +222,14 @@ msgid "" "* Menu: Nodes whoses indices contain \"%s\":\n" msgstr "" "\n" -"* Menu: Noder med indekser som inneholder «%s»:\n" +"* Menu: Noder med indekser som inneholder «%s»:\n" -#: info/info.c:248 +#: info/info.c:260 info/infokey.c:884 msgid "Try --help for more information.\n" -msgstr "Prøv --help for mer informasjon.\n" +msgstr "Prøv --help for mer informasjon.\n" -#: info/info.c:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 -#: util/texindex.c:336 +#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689 +#: util/install-info.c:1224 util/texindex.c:338 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -250,32 +242,39 @@ msgstr "" "etter betingelsene i GNU General Public License. For mer informasjon\n" "om dette, se filen COPYING.\n" -#: info/info.c:461 +#: info/info.c:462 #, c-format msgid "no index entries found for `%s'\n" -msgstr "ingen innslag funnet for «%s»\n" +msgstr "ingen innslag funnet for «%s»\n" -#: info/info.c:530 -#, c-format +#: info/info.c:555 +#, fuzzy +msgid " -b, --speech-friendly be friendly to speech synthesizers.\n" +msgstr " --speech-friendly vær vennlig ovenfor talesyntetisatorer.\n" + +#: info/info.c:562 +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" "\n" "Read documentation in Info format.\n" "\n" "Options:\n" -" --apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n" -" --directory=DIR add DIR to INFOPATH.\n" -" --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" --file=FILENAME specify Info file to visit.\n" -" --help display this help and exit.\n" -" --index-search=STRING go to node pointed by index entry STRING.\n" -" --node=NODENAME specify nodes in first visited Info file.\n" -" --output=FILENAME output selected nodes to FILENAME.\n" -" --restore=FILENAME read initial keystrokes from FILENAME.\n" -" --show-options, --usage go to command-line options node.\n" -" --subnodes recursively output menu items.\n" -"%s --vi-keys use vi-like and less-like key bindings.\n" -" --version display version information and exit.\n" +" --apropos=STRING look up STRING in all indices of all " +"manuals.\n" +" -d, --directory=DIR add DIR to INFOPATH.\n" +" --dribble=FILENAME remember user keystrokes in FILENAME.\n" +" -f, --file=FILENAME specify Info file to visit.\n" +" -h, --help display this help and exit.\n" +" --index-search=STRING go to node pointed by index entry STRING.\n" +" -n, --node=NODENAME specify nodes in first visited Info file.\n" +" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -R, --raw-escapes don't remove ANSI escapes from man pages.\n" +" --restore=FILENAME read initial keystrokes from FILENAME.\n" +" -O, --show-options, --usage go to command-line options node.\n" +"%s --subnodes recursively output menu items.\n" +" --vi-keys use vi-like and less-like key bindings.\n" +" --version display version information and exit.\n" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" @@ -289,316 +288,473 @@ msgid "" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" " info -f ./foo.info show file ./foo.info, not searching dir\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" -"Bruksmåte: %s [VALG]... [MENYPUNKT...]\n" +"Bruksmåte: %s [VALG]... [MENYPUNKT...]\n" "\n" "Lese dokumentasjon i Infoformat.\n" "\n" "Valg:\n" -" --apropos=EMNE søke etter EMNE i alle indeksene til alle " +" --apropos=EMNE søke etter EMNE i alle indeksene til alle " "Infofilene.\n" " --directory=KAT legge til KAT til INFOPATH.\n" " --dribble=FILNAVN huske brukerens tastetrykk i FILNAVN.\n" -" --file=FILNAVN angi Infofilen som skal besøkes.\n" +" --file=FILNAVN angi Infofilen som skal besøkes.\n" " --help vise denne hjelpen og avslutte.\n" -" --index-search=STRENG gå til noden pekt på av indeksoppslaget STRENG.\n" -" --node=NODENAVN angi noder i første besøkte Infofil.\n" +" --index-search=STRENG gå til noden pekt på av indeksoppslaget STRENG.\n" +" --node=NODENAVN angi noder i første besøkte Infofil.\n" " --output=FILNAVN skrive ut utvalgte noder til FILNAVN.\n" +" --raw-escapes ikke fjern ANSI-escapes fra mansider.\n" " --restore=FILNAVN lese innledende tastetrykk fra FILNAVN.\n" -" --show-options, --usage gå til kommandolinje-valg-noden.\n" -" --subnodes rekursivt skrive ut menypunkter.\n" -"%s --vi-keys bruke vi-aktige og less-aktige tastebindinger.\n" +" --show-options, --usage gå til kommandolinje-valg-noden.\n" +"%s --subnodes rekursivt skrive ut menypunkter.\n" +" --vi-keys bruke vi-aktige og less-aktige tastebindinger.\n" " --version vise programversjon og avslutte.\n" "\n" -"Det første ikke-valg-argumentet, dersom tilstede, er menypunktet som du\n" -"starter fra; det blir søkt etter i alle «dir»-filer langs med INFOPATH.\n" -"Dersom det ikke er tilstede, vil info flette sammen alle «dir»-filene\n" -"og vise resultatet. Øvrige gjenværende argumenter blir behandlet som\n" -"navnene til menypunktene relativ til den første besøkte noden.\n" +"Det første ikke-valg-argumentet, dersom tilstede, er menypunktet som du\n" +"starter fra; det blir søkt etter i alle «dir»-filer langs med INFOPATH.\n" +"Dersom det ikke er tilstede, vil info flette sammen alle «dir»-filene\n" +"og vise resultatet. Øvrige gjenværende argumenter blir behandlet som\n" +"navnene til menypunktene relativ til den første besøkte noden.\n" "\n" "Eksempler:\n" -" info vise toppnivå dirmeny\n" -" info emacs starte ved emacs-noden fra toppnivå dir\n" +" info vise toppnivå dirmeny\n" +" info emacs starte ved emacs-noden fra toppnivå dir\n" " info emacs buffers starte ved buffers-noden i emacs-manualen\n" " info --show-options emacs starte ved emacs kommandolinjevalg\n" -" info -f ./foo.info vise filen ./foo.info, ikke søke gjennom dir\n" +" info -f ./foo.info vise filen ./foo.info, ikke søke gjennom dir\n" "\n" "Send bugrapport til bug-texinfo@gnu.org,\n" -"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n" +"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n" -#: info/info.c:604 -#, fuzzy, c-format +#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474 +#: util/install-info.c:421 util/texindex.c:286 +#, fuzzy +msgid "" +"\n" +"Email bug reports to bug-texinfo@gnu.org,\n" +"general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" +msgstr "" +"\n" +"Send bugrapporter til bug-texinfo@gnu.org,\n" +"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n" + +#: info/info.c:632 +#, c-format msgid "Cannot find node `%s'." -msgstr "Kan ikke slette noden «%s»" +msgstr "Kan ikke finne noden «%s»." -#: info/info.c:605 -#, fuzzy, c-format +#: info/info.c:633 +#, c-format msgid "Cannot find node `(%s)%s'." -msgstr "Kan ikke slette noden «%s»" +msgstr "Kan ikke finne noden «(%s)%s»." -#: info/info.c:606 -#, fuzzy +#: info/info.c:634 msgid "Cannot find a window!" -msgstr "Kan ikke slette et permanent vindu" +msgstr "Kan ikke finne et vindu!" -#: info/info.c:607 +#: info/info.c:635 msgid "Point doesn't appear within this window's node!" -msgstr "" +msgstr "Markøren vises ikke innen dette vinduets node!" -#: info/info.c:608 -#, fuzzy +#: info/info.c:636 msgid "Cannot delete the last window." -msgstr "Kan ikke slette et permanent vindu" +msgstr "Kan ikke slette det siste vinduet." -#: info/info.c:609 -#, fuzzy +#: info/info.c:637 msgid "No menu in this node." -msgstr "Ingen meny i noden «%s»." +msgstr "Ingen meny i denne noden." -#: info/info.c:610 -#, fuzzy +#: info/info.c:638 msgid "No footnotes in this node." -msgstr "Ingen kryssreferanser i denne noden." +msgstr "Ingen fotnoter i denne noden." -#: info/info.c:611 +#: info/info.c:639 msgid "No cross references in this node." msgstr "Ingen kryssreferanser i denne noden." -#: info/info.c:612 +#: info/info.c:640 #, c-format msgid "No `%s' pointer for this node." -msgstr "Ingen «%s»-peker for denne noden." +msgstr "Ingen «%s»-peker for denne noden." -#: info/info.c:613 +#: info/info.c:641 #, c-format msgid "Unknown Info command `%c'; try `?' for help." -msgstr "" +msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp." -#: info/info.c:614 +#: info/info.c:642 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." -msgstr "" +msgstr "Terminaltypen «%s» er ikke smart nok for å kjøre Info." -#: info/info.c:615 -#, fuzzy +#: info/info.c:643 msgid "You are already at the last page of this node." -msgstr "Flytte til starten av denne noden" +msgstr "Du er allerede på den siste siden av denne noden." -#: info/info.c:616 -#, fuzzy +#: info/info.c:644 msgid "You are already at the first page of this node." -msgstr "Flytte til starten av denne noden" +msgstr "Du er allerede på den første siden til denne noden." -#: info/info.c:617 +#: info/info.c:645 msgid "Only one window." -msgstr "" +msgstr "Bare et vindu." -#: info/info.c:618 +#: info/info.c:646 msgid "Resulting window would be too small." -msgstr "" +msgstr "Resulterende vindu ville blitt for lite." -#: info/info.c:619 +#: info/info.c:647 msgid "Not enough room for a help window, please delete a window." -msgstr "" +msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu." # The next translation should match the length of this one -#: info/infodoc.c:45 -msgid "Basic Commands in Info Windows\n" -msgstr "Grunnleggende kommandoer i infovinduer\n" - -#: info/infodoc.c:46 -msgid "******************************\n" -msgstr "**************************************\n" +#: info/infodoc.c:45 info/infodoc.c:94 +msgid "" +"Basic Commands in Info Windows\n" +"******************************\n" +msgstr "" +"Grunnleggende kommandoer i infovinduer\n" +"**************************************\n" #: info/infodoc.c:48 -#, c-format -msgid " %-10s Quit this help.\n" -msgstr " %-10s Avslutte denne hjelpen.\n" +msgid "\\%-10[quit-help] Quit this help.\n" +msgstr "\\%-10[quit-help] Avslutte denne hjelpen.\n" #: info/infodoc.c:49 -#, c-format -msgid " %-10s Quit Info altogether.\n" -msgstr " %-10s Avslutte Info fullstendig.\n" +msgid "\\%-10[quit] Quit Info altogether.\n" +msgstr "\\%-10[quit] Avslutte Info fullstendig.\n" #: info/infodoc.c:50 -#, c-format -msgid " %-10s Invoke the Info tutorial.\n" -msgstr " %-10s Starte Infoopplæring.\n" +msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" +msgstr "\\%-10[get-info-help-node] Starte Infoopplæring.\n" # The next translation should match the length of this one -#: info/infodoc.c:52 -msgid "Moving within a node:\n" -msgstr "Flytte innen en node:\n" - -#: info/infodoc.c:53 -msgid "---------------------\n" -msgstr "---------------------\n" +#: info/infodoc.c:52 info/infodoc.c:101 +msgid "" +"Selecting other nodes:\n" +"----------------------\n" +msgstr "" +"Velger andre noder:\n" +"-------------------\n" #: info/infodoc.c:54 -#, c-format -msgid " %-10s Scroll forward a page.\n" -msgstr " %-10s Rulle forover en side.\n" +msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" +msgstr "\\%-10[next-node] Flytte til neste node etter denne noden.\n" #: info/infodoc.c:55 -#, c-format -msgid " %-10s Scroll backward a page.\n" -msgstr " %-10s Rulle bakover en side.\n" +msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" +msgstr "\\%-10[prev-node] Flytte til forrige node før denne noden.\n" #: info/infodoc.c:56 -#, c-format -msgid " %-10s Go to the beginning of this node.\n" -msgstr " %-10s Gå til begynnelsen av denne noden.\n" +msgid "\\%-10[up-node] Move \"up\" from this node.\n" +msgstr "\\%-10[up-node] Flytte «opp» fra denne noden.\n" #: info/infodoc.c:57 -#, c-format -msgid " %-10s Go to the end of this node.\n" -msgstr " %-10s Gå til slutten av denne noden.\n" - -#: info/infodoc.c:58 -#, c-format -msgid " %-10s Scroll forward 1 line.\n" -msgstr " %-10s Rulle forover 1 linje.\n" +msgid "" +"\\%-10[menu-item] Pick menu item specified by name.\n" +" Picking a menu item causes another node to be selected.\n" +msgstr "" +"\\%-10[menu-item] Velge et menypunkt angitt ved navn.\n" +" Valg av et menypunkt fører til at en annen node blir valgt.\n" #: info/infodoc.c:59 -#, c-format -msgid " %-10s Scroll backward 1 line.\n" -msgstr " %-10s Rulle bakover 1 linje.\n" +msgid "" +"\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n" +msgstr "" +"\\%-10[history-node] Følge en kryssreferanse. Leser navnet til " +"referansen.\n" + +#: info/infodoc.c:60 +msgid "\\%-10[history-node] Move to the last node seen in this window.\n" +msgstr "" +"\\%-10[history-node] Flytte til den siste noden sett i dette vinduet.\n" -# The next translation should match the length of this one #: info/infodoc.c:61 -msgid "Selecting other nodes:\n" -msgstr "Velger andre noder:\n" +msgid "" +"\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n" +msgstr "" +"\\%-10[move-to-prev-xref] Flytte til neste hypertekstlenke innen denne " +"noden.\n" #: info/infodoc.c:62 -msgid "----------------------\n" -msgstr "-------------------\n" +msgid "" +"\\%-10[move-to-prev-xref] Skip to previous hypertext link within this " +"node.\n" +msgstr "" +"\\%-10[move-to-prev-xref] Flytte til neste hypertekstlenke innen denne " +"noden.\n" #: info/infodoc.c:63 -#, fuzzy, c-format -msgid " %-10s Move to the `next' node of this node.\n" -msgstr " %-10s Flytte til «neste»-noden etter denne noden.\n" +msgid "" +"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" +msgstr "\\%-10[dir-node] Følge hypertekstlenken under markøren.\n" #: info/infodoc.c:64 -#, fuzzy, c-format -msgid " %-10s Move to the `previous' node of this node.\n" -msgstr " %-10s Flytte til «forrige»-noden før denne noden.\n" +msgid "" +"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" +"node] (DIR)'.\n" +msgstr "" +"\\%-10[dir-node] Flytte til «katalog»-noden. Det samme som «\\[goto-node] " +"(DIR)».\n" #: info/infodoc.c:65 -#, fuzzy, c-format +msgid "" +"\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node] Top'.\n" +msgstr "" +"\\%-10[top-node] Flytte til «Top»-noden. Det samme som «\\[goto-node] " +"Top».\n" + +# The next translation should match the length of this one +#: info/infodoc.c:67 info/infodoc.c:115 +msgid "" +"Moving within a node:\n" +"---------------------\n" +msgstr "" +"Flytte innen en node:\n" +"---------------------\n" + +#: info/infodoc.c:69 +msgid "\\%-10[scroll-forward] Scroll forward a page.\n" +msgstr "\\%-10[scroll-forward] Rulle forover en side.\n" + +#: info/infodoc.c:70 +msgid "\\%-10[scroll-backward] Scroll backward a page.\n" +msgstr "\\%-10[scroll-backward] Rulle bakover en side.\n" + +#: info/infodoc.c:71 +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" +msgstr "\\%-10[beginning-of-node] Gå til begynnelsen av denne noden.\n" + +#: info/infodoc.c:72 +msgid "\\%-10[end-of-node] Go to the end of this node.\n" +msgstr "\\%-10[end-of-node] Gå til slutten av denne noden.\n" + +#: info/infodoc.c:73 +#, fuzzy +msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" +msgstr "\\%-10[1scroll-forward] Rulle forover 1 linje.\n" + +#: info/infodoc.c:74 +#, fuzzy +msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" +msgstr "\\%-10[1scroll-backward] Rulle bakover 1 linje.\n" + +# The next translation should match the length of this one +#: info/infodoc.c:76 info/infodoc.c:124 +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "" +"Andre kommandoer:\n" +"-----------------\n" + +#: info/infodoc.c:78 +msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" +msgstr "\\%-10[menu-digit] Velge første ... niende punkt i nodens meny.\n" + +#: info/infodoc.c:79 +msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" +msgstr "\\%-10[last-menu-item] Velge det siste punktet i nodens meny.\n" + +#: info/infodoc.c:80 +msgid "" +"\\%-10[index-search] Search for a specified string in the index entries of " +"this Info\n" +" file, and select the node referenced by the first entry " +"found.\n" +msgstr "" +"\\%-10[index-search] Søke etter en angitt streng blant indeksinnslagene i " +"denne\n" +" infofilen og velge noden til det første innslaget som blir " +"funnet.\n" + +#: info/infodoc.c:82 +msgid "" +"\\%-10[goto-node] Move to node specified by name.\n" +" You may include a filename as well, as in (FILENAME)NODENAME.\n" +msgstr "" +"\\%-10[goto-node] Flytte til en node angitt ved navn.\n" +" Du kan like godt inkludere et filnavn, som i (FILNAVN)" +"NODENAVN.\n" + +#: info/infodoc.c:84 +msgid "" +"\\%-10[search] Search forward for a specified string\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" +"\\%-10[search] Søke forover etter en angitt streng\n" +" og velge den noden som den neste forekomsten blir funnet i.\n" + +#: info/infodoc.c:86 +msgid "" +"\\%-10[search-backward] Search backward for a specified string\n" +" and select the node in which the previous occurrence is " +"found.\n" +msgstr "" +"\\%-10[search-backward] Søke baklengs etter en angitt streng\n" +" og velge den noden som den neste forekomsten blir funnet i.\n" + +#: info/infodoc.c:97 +#, c-format +msgid " %-10s Quit this help.\n" +msgstr " %-10s Avslutte denne hjelpen.\n" + +#: info/infodoc.c:98 +#, c-format +msgid " %-10s Quit Info altogether.\n" +msgstr " %-10s Avslutte Info fullstendig.\n" + +#: info/infodoc.c:99 +#, c-format +msgid " %-10s Invoke the Info tutorial.\n" +msgstr " %-10s Starte Infoopplæring.\n" + +#: info/infodoc.c:103 +#, c-format +msgid " %-10s Move to the `next' node of this node.\n" +msgstr " %-10s Flytte til «neste»-noden etter denne noden.\n" + +#: info/infodoc.c:104 +#, c-format +msgid " %-10s Move to the `previous' node of this node.\n" +msgstr " %-10s Flytte til «forrige»-noden før denne noden.\n" + +#: info/infodoc.c:105 +#, c-format msgid " %-10s Move `up' from this node.\n" -msgstr " %-10s Flytte «up» fra denne noden.\n" +msgstr " %-10s Flytte «opp» fra denne noden.\n" -#: info/infodoc.c:66 +#: info/infodoc.c:106 #, c-format msgid " %-10s Pick menu item specified by name.\n" msgstr " %-10s Velge menypunkt spesifisert ved navn.\n" -#: info/infodoc.c:67 +#: info/infodoc.c:107 msgid " Picking a menu item causes another node to be selected.\n" msgstr "" -" Valg av menypunkt fører til at en annen node blir valgt.\n" +" Valg av menypunkt fører til at en annen node blir valgt.\n" -#: info/infodoc.c:68 +#: info/infodoc.c:108 #, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" -msgstr " %-10s Følge en kryssreferanse. Leser navnet til referansen.\n" +msgstr " %-10s Følge en kryssreferanse. Leser navnet til referansen.\n" -#: info/infodoc.c:69 +#: info/infodoc.c:109 #, c-format msgid " %-10s Move to the last node seen in this window.\n" msgstr " %-10s Flytte til den siste noden sett i dette vinduet.\n" -#: info/infodoc.c:70 +#: info/infodoc.c:110 #, c-format msgid " %-10s Skip to next hypertext link within this node.\n" msgstr " %-10s Flytte til neste hypertekstlenke innen denne noden.\n" -#: info/infodoc.c:71 +#: info/infodoc.c:111 #, c-format msgid " %-10s Follow the hypertext link under cursor.\n" -msgstr " %-10s Følge hypertekstlenken under markøren.\n" +msgstr " %-10s Følge hypertekstlenken under markøren.\n" -#: info/infodoc.c:72 +#: info/infodoc.c:112 #, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" -msgstr " %-10s Flytte til «katalog»-noden. Det samme som «g (DIR)».\n" +msgstr " %-10s Flytte til «katalog»-noden. Det samme som «g (DIR)».\n" -#: info/infodoc.c:73 +#: info/infodoc.c:113 #, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" -msgstr " %-10s Flytte til «Top»-noden. Det samme som «g Top».\n" +msgstr " %-10s Flytte til «Top»-noden. Det samme som «g Top».\n" -# The next translation should match the length of this one -#: info/infodoc.c:75 -msgid "Other commands:\n" -msgstr "Andre kommandoer:\n" +#: info/infodoc.c:117 +#, c-format +msgid " %-10s Scroll forward a page.\n" +msgstr " %-10s Rulle forover en side.\n" + +#: info/infodoc.c:118 +#, c-format +msgid " %-10s Scroll backward a page.\n" +msgstr " %-10s Rulle bakover en side.\n" + +#: info/infodoc.c:119 +#, c-format +msgid " %-10s Go to the beginning of this node.\n" +msgstr " %-10s Gå til begynnelsen av denne noden.\n" + +#: info/infodoc.c:120 +#, c-format +msgid " %-10s Go to the end of this node.\n" +msgstr " %-10s Gå til slutten av denne noden.\n" -#: info/infodoc.c:76 -msgid "---------------\n" -msgstr "-----------------\n" +#: info/infodoc.c:121 +#, c-format +msgid " %-10s Scroll forward 1 line.\n" +msgstr " %-10s Rulle forover 1 linje.\n" -#: info/infodoc.c:77 +#: info/infodoc.c:122 +#, c-format +msgid " %-10s Scroll backward 1 line.\n" +msgstr " %-10s Rulle bakover 1 linje.\n" + +#: info/infodoc.c:126 #, c-format msgid " %-10s Pick first ... ninth item in node's menu.\n" -msgstr " %-10s Velge første ... niende punkt i nodens meny.\n" +msgstr " %-10s Velge første ... niende punkt i nodens meny.\n" -#: info/infodoc.c:78 +#: info/infodoc.c:127 #, c-format msgid " %-10s Pick last item in node's menu.\n" msgstr " %-10s Velge det siste punktet i nodens meny.\n" # This translation is connected to the next one -#: info/infodoc.c:79 +#: info/infodoc.c:128 #, c-format msgid "" " %-10s Search for a specified string in the index entries of this Info\n" -msgstr " %-10s Søke etter en spesifikk streng i indeksinnslagene i denne\n" +msgstr " %-10s Søke etter en spesifikk streng i indeksinnslagene i denne\n" -#: info/infodoc.c:80 +#: info/infodoc.c:129 msgid "" " file, and select the node referenced by the first entry " "found.\n" msgstr "" -" infofil, og velge noden referert av det første oppslaget " +" infofil, og velge noden referert av det første oppslaget " "funnet.\n" -#: info/infodoc.c:81 +#: info/infodoc.c:130 #, c-format msgid " %-10s Move to node specified by name.\n" msgstr " %-10s Flytte til noden spesifisert av navn.\n" -#: info/infodoc.c:82 +#: info/infodoc.c:131 msgid "" " You may include a filename as well, as in (FILENAME)NODENAME.\n" msgstr "" -" Du kan like godt inkludere et filnavn, som i " -"(FILNAVN)NODENAVN.\n" +" Du kan like godt inkludere et filnavn, som i (FILNAVN)" +"NODENAVN.\n" -#: info/infodoc.c:83 +#: info/infodoc.c:132 #, c-format -msgid "" -" %-10s Search forward through this Info file for a specified string,\n" -msgstr " %-10s Søke gjennom denne Infofilen for en spesifikk streng,\n" +msgid " %-10s Search forward for a specified string,\n" +msgstr "" +" %-10s Søke forlengs gjennom denne Infofilen for en spesifikk streng,\n" -#: info/infodoc.c:84 info/infodoc.c:86 +#: info/infodoc.c:133 info/infodoc.c:135 msgid "" " and select the node in which the next occurrence is found.\n" msgstr "" " og velge den noden som i det neste tilfellet blir funnet.\n" -#: info/infodoc.c:85 +#: info/infodoc.c:134 #, c-format -msgid " %-10s Search backward in this Info file for a specified string,\n" -msgstr " %-10s Søke gjennom denne Infofilen for en spesifikk streng,\n" +msgid " %-10s Search backward for a specified string\n" +msgstr "" +" %-10s Søke baklengs gjennom denne Infofilen for en spesifikk streng,\n" -#: info/infodoc.c:258 +#: info/infodoc.c:313 msgid "The current search path is:\n" -msgstr "Gjeldende søkesti er:\n" +msgstr "Gjeldende søkesti er:\n" -#: info/infodoc.c:261 +#: info/infodoc.c:316 msgid "" "Commands available in Info windows:\n" "\n" @@ -606,123 +762,292 @@ msgstr "" "Kommandoer tilgjengelig i Infovinduer:\n" "\n" -#: info/infodoc.c:264 +#: info/infodoc.c:319 msgid "" "Commands available in the echo area:\n" "\n" msgstr "" -"Kommandoer tilgjengelig i ekkoområdet:\n" +"Kommandoer tilgjengelig i ekkoområdet:\n" +"\n" + +#: info/infodoc.c:340 +#, c-format +msgid "" +"The following commands can only be invoked via %s:\n" +"\n" +msgstr "" +"Følgende kommandoer kan bare bli påkallet via %s:\n" "\n" -#: info/infodoc.c:280 +#: info/infodoc.c:343 msgid "" -"The following commands can only be invoked via M-x:\n" +"The following commands cannot be invoked at all:\n" "\n" msgstr "" -"Følgende kommandoer kan bare bli påkallet via M-x:\n" +"Følgende kommandoer kan ikke bli påkallet i det hele tatt:\n" "\n" -#: info/infodoc.c:301 +#: info/infodoc.c:367 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" -msgstr "--- Bruk «\\[history-node]» eller «\\[kill-node]» for å avslutte ---\n" +msgstr "--- Bruk «\\[history-node]» eller «\\[kill-node]» for å avslutte ---\n" -#. Create or move to the help window. -#: info/infodoc.c:411 +#: info/infodoc.c:477 msgid "Display help message" msgstr "Vise hjelpemelding" -#. Show the Info help node. This means that the "info" file is installed -#. where it can easily be found on your system. -#: info/infodoc.c:429 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" -msgstr "Vise infonoden «(info)Help»" +msgstr "Vise infonoden «(info)Help»" -#: info/infodoc.c:555 +#: info/infodoc.c:638 msgid "Print documentation for KEY" msgstr "Skrive ut dokumentasjonen for KEY" -#: info/infodoc.c:568 +#: info/infodoc.c:650 #, c-format msgid "Describe key: %s" msgstr "Beskriv tast: %s" -#: info/infodoc.c:577 +#: info/infodoc.c:660 #, c-format msgid "ESC %s is undefined." msgstr "ESC %s er udefinert." -#: info/infodoc.c:594 +#: info/infodoc.c:676 info/infodoc.c:703 #, c-format msgid "%s is undefined." msgstr "%s er udefinert." -#: info/infodoc.c:620 +#: info/infodoc.c:724 #, c-format msgid "%s is defined to %s." msgstr "%s er definert som %s." -#: info/infodoc.c:812 +#: info/infodoc.c:1151 msgid "Show what to type to execute a given command" -msgstr "Vise hva som må tastes for å utføre en gitt kommando" +msgstr "Vise hva som må tastes for å utføre en gitt kommando" -#: info/infodoc.c:816 +#: info/infodoc.c:1155 msgid "Where is command: " msgstr "Hvor er kommandoen: " -#: info/infodoc.c:838 +#: info/infodoc.c:1177 #, c-format msgid "`%s' is not on any keys" -msgstr "«%s» er ikke på noen taster" +msgstr "«%s» er ikke på noen taster" -#: info/infodoc.c:844 +#: info/infodoc.c:1183 #, c-format msgid "%s can only be invoked via %s." -msgstr "%s kan bare bli påkallet via %s." +msgstr "%s kan bare bli påkallet via %s." -#: info/infodoc.c:847 +#: info/infodoc.c:1186 #, c-format msgid "%s can be invoked via %s." -msgstr "%s kan bli påkallet via %s." +msgstr "%s kan bli påkallet via %s." -#: info/infodoc.c:851 +#: info/infodoc.c:1190 #, c-format msgid "There is no function named `%s'" -msgstr "Det finnes ingen funksjon ved navn «%s»" +msgstr "Det finnes ingen funksjon ved navn «%s»" + +#: info/infokey.c:164 +msgid "incorrect number of arguments" +msgstr "unøyaktig antall argumenter" + +#: info/infokey.c:194 +#, c-format +msgid "cannot open input file `%s'" +msgstr "Kan ikke åpne inputfilen «%s»" -#: info/m-x.c:69 +#: info/infokey.c:207 +#, c-format +msgid "cannot create output file `%s'" +msgstr "Kunne ikke opprette outputfila «%s»" + +#: info/infokey.c:217 +#, c-format +msgid "error writing to `%s'" +msgstr "feil ved skriving til «%s»" + +#: info/infokey.c:222 +#, c-format +msgid "error closing output file `%s'" +msgstr "Feil ved lukking av outputfila «%s»" + +#: info/infokey.c:443 +msgid "key sequence too long" +msgstr "tastesekvensen er for lang" + +#: info/infokey.c:521 +msgid "missing key sequence" +msgstr "manglende tastesekvens" + +#: info/infokey.c:600 +msgid "NUL character (\\000) not permitted" +msgstr "NULL-tegn (\\000) er ikke tillatt" + +#: info/infokey.c:629 +#, c-format +msgid "NUL character (^%c) not permitted" +msgstr "NULL-tegn (^%c) er ikke tillatt" + +#: info/infokey.c:652 +msgid "missing action name" +msgstr "manglende handlingsnavn" + +#: info/infokey.c:667 info/infokey.c:733 +msgid "section too long" +msgstr "avdeling for lang" + +#: info/infokey.c:673 +#, c-format +msgid "unknown action `%s'" +msgstr "Ukjent handling «%s»" + +#: info/infokey.c:682 +msgid "action name too long" +msgstr "handlingsnavn for langt" + +#: info/infokey.c:694 +#, c-format +msgid "extra characters following action `%s'" +msgstr "ekstra tegn følger handlingen «%s»" + +#: info/infokey.c:704 +msgid "missing variable name" +msgstr "manglende variabelnavn" + +#: info/infokey.c:712 +msgid "missing `=' immediately after variable name" +msgstr "manglende «=» umiddelbart etter variabelnavn" + +#: info/infokey.c:719 +msgid "variable name too long" +msgstr "variabelnavn for langt" + +#: info/infokey.c:741 +msgid "value too long" +msgstr "verdi for lang" + +#: info/infokey.c:875 +#, c-format +msgid "\"%s\", line %u: " +msgstr "«%s», linje %u: " + +#: info/infokey.c:891 +#, fuzzy, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT-FILE]\n" +"\n" +"Compile infokey source file to infokey file. Reads INPUT-FILE (default\n" +"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n" +"\n" +"Options:\n" +" --output FILE output to FILE instead of $HOME/.info\n" +" --help display this help and exit.\n" +" --version display version information and exit.\n" +msgstr "" +"Bruksmåte: %s [VALG]... [INPUTFIL]\n" +"\n" +"Kompilere infokey-kildefil til infokeyfil. Leser INPUTFIL (standard\n" +"$HOME/.infokey) og skriver kompilert tastfil til $HOME/.info.\n" +"\n" +"Valg:\n" +" --output FILNAVN skrive ut til FILNAVN istedet for $HOME/." +"info.\n" +" --help vise denne hjelpen og avslutte.\n" +" --version vise programversjon og avslutte.\n" +"\n" +"Send bugrapporter til bug-texinfo@gnu.org,\n" +"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n" + +#: info/infomap.c:1397 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too small" +msgstr "Ignorerer ugyldig infokeyfil «%s» - for liten" + +#: info/infomap.c:1400 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too big" +msgstr "Ignorerer ugyldig infokeyfil «%s» - for stor" + +#: info/infomap.c:1413 +#, c-format +msgid "Error reading infokey file `%s' - short read" +msgstr "Feil ved lesing av infokeyfil «%s» - for kort" + +#: info/infomap.c:1431 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" +msgstr "" +"Ugyldig infokeyfil «%s» (feil magiske tall) -- kjør infokey for å oppdatere " +"den" + +#: info/infomap.c:1437 +#, c-format +msgid "Your infokey file `%s' is out of date -- run infokey to update it" +msgstr "Din infokeyfil «%s» er utdatert -- kjør infokey for å oppdatere den" + +#: info/infomap.c:1450 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" +msgstr "" +"Ugyldig infokeyfil «%s» (feil avdelingslengde) -- kjør infokey for å " +"oppdatere den" + +#: info/infomap.c:1470 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section code) -- run infokey to update it" +msgstr "" +"Ugyldig infokeyfil «%s» (feil avdelingskode) -- kjør infokey for å oppdatere " +"den" + +#: info/infomap.c:1608 +msgid "Bad data in infokey file -- some key bindings ignored" +msgstr "Feil data i infokeyfil -- noen tastebindinger ble ignorert" + +#: info/infomap.c:1659 +msgid "Bad data in infokey file -- some var settings ignored" +msgstr "Feil data i infokeyfil -- noen variabelinnstillinger ble ignorert" + +#: info/m-x.c:70 msgid "Read the name of an Info command and describe it" -msgstr "Lese inn navnet på en infokommando og beskrive den" +msgstr "Lese inn navnet på en infokommando og beskrive den" -#: info/m-x.c:73 +#: info/m-x.c:74 msgid "Describe command: " msgstr "Beskriv kommandoen: " -#: info/m-x.c:96 +#: info/m-x.c:97 msgid "Read a command name in the echo area and execute it" -msgstr "Lese et kommandonavn i ekkoområdet og utføre den" +msgstr "Lese et kommandonavn i ekkoområdet og utføre den" -#: info/m-x.c:134 +#: info/m-x.c:141 msgid "Cannot execute an `echo-area' command here." -msgstr "Kan ikke utføre en «echo-area»-kommando her." +msgstr "Kan ikke utføre en «echo-area»-kommando her." -#: info/m-x.c:150 +#: info/m-x.c:157 msgid "Set the height of the displayed window" -msgstr "Sette høyden på det viste vinduet" +msgstr "Sette høyden på det viste vinduet" -#: info/m-x.c:163 +#: info/m-x.c:170 #, c-format msgid "Set screen height to (%d): " -msgstr "Sette skjermhøyde til (%d): " +msgstr "Sette skjermhøyde til (%d): " -#: info/makedoc.c:132 +#: info/makedoc.c:161 info/makedoc.c:169 msgid "" " Source files groveled to make this file include:\n" "\n" msgstr "" -" Kildefiler søkt gjennom for å lage denne filen inkluderer:\n" +" Kildefiler søkt gjennom for å lage denne filen inkluderer:\n" "\n" -#: info/makedoc.c:465 +#: info/makedoc.c:553 #, c-format msgid "Couldn't manipulate the file %s.\n" msgstr "Kunne ikke manipulere filen %s.\n" @@ -744,567 +1069,533 @@ msgid "" "Here is the menu of nodes you have recently visited.\n" "Select one from this menu, or use `\\[history-node]' in another window.\n" msgstr "" -"Her er menyen over nodene du har nylig besøkt.\n" -"Velg en fra denne menyen, eller bruk «\\[history-node]» i et annet vindu.\n" +"Her er menyen over nodene du har nylig besøkt.\n" +"Velg en fra denne menyen, eller bruk «\\[history-node]» i et annet vindu.\n" #: info/nodemenu.c:219 msgid "Make a window containing a menu of all of the currently visited nodes" -msgstr "Lag et vindu inneholdene en meny over alle de nylig besøkte nodene" +msgstr "Lag et vindu inneholdene en meny over alle de nylig besøkte nodene" #: info/nodemenu.c:299 msgid "Select a node which has been previously visited in a visible window" -msgstr "Velge en node som har blitt tidligere besøkt i et synlig vindu" +msgstr "Velge en node som har blitt tidligere besøkt i et synlig vindu" #: info/nodemenu.c:311 msgid "Select visited node: " -msgstr "Velg besøkt node: " +msgstr "Velg besøkt node: " -#: info/nodemenu.c:331 info/session.c:2146 +#: info/nodemenu.c:331 info/session.c:2235 #, c-format msgid "The reference disappeared! (%s)." msgstr "Referansen forsvant! (%s)." -#: info/session.c:169 -#, fuzzy, c-format +#: info/session.c:170 +#, c-format msgid "" "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] " "for menu item." msgstr "" -"Velkommen til Info versjon %s. «\\[get-help-window]» for hjelp, " -"«\\[menu-item]» for menypunkt." +"Velkommen til Info versjon %s. Trykk «\\[get-help-window]» for hjelp,\n" +"«\\[menu-item]» for menypunkt." -#. Move WINDOW's point down to the next line if possible. -#: info/session.c:642 +#: info/session.c:643 msgid "Move down to the next line" msgstr "Flytte ned til neste linje" -#. Move WINDOW's point up to the previous line if possible. -#: info/session.c:657 +#: info/session.c:658 msgid "Move up to the previous line" msgstr "Flytte opp til den forrige linjen" -#. Move WINDOW's point to the end of the true line. -#: info/session.c:672 +#: info/session.c:673 msgid "Move to the end of the line" msgstr "Flytte til slutten av linjen" -#. Move WINDOW's point to the beginning of the true line. -#: info/session.c:692 +#: info/session.c:693 msgid "Move to the start of the line" msgstr "Flytte til starten av linjen" -#: info/session.c:884 makeinfo/node.c:1092 +#: info/session.c:885 makeinfo/node.c:1357 msgid "Next" msgstr "neste" -#: info/session.c:887 +#: info/session.c:888 msgid "Following Next node..." -msgstr "Følger nestenoden..." +msgstr "Følger nestenoden..." -#: info/session.c:904 +#: info/session.c:905 msgid "Selecting first menu item..." -msgstr "Velger første menypunkt..." +msgstr "Velger første menypunkt..." -#: info/session.c:915 +#: info/session.c:916 msgid "Selecting Next node..." msgstr "Velger nestenoden..." -#: info/session.c:985 +#: info/session.c:986 #, c-format msgid "Moving Up %d time(s), then Next." msgstr "Flytter opp %d gang(er), deretter neste." -#: info/session.c:1009 +#: info/session.c:1010 msgid "No more nodes within this document." msgstr "Ingen flere noder i dette dokumentet." -#: info/session.c:1033 -#, fuzzy +#: info/session.c:1034 msgid "No `Prev' for this node." -msgstr "Ingen «forrige» for denne noden." +msgstr "Ingen «forrige» for denne noden." -#. Move to the previous node. If this node now contains a menu, -#. and we have not inhibited movement to it, move to the node -#. corresponding to the last menu item. -#: info/session.c:1036 info/session.c:1091 +#: info/session.c:1037 info/session.c:1092 msgid "Moving Prev in this window." msgstr "Flytter til forrige i dette vinduet." -#: info/session.c:1050 -#, fuzzy +#: info/session.c:1051 msgid "No `Prev' or `Up' for this node within this document." -msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet." +msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet." -#: info/session.c:1053 +#: info/session.c:1054 msgid "Moving Up in this window." msgstr "Flytter opp i dette vinduet." -#: info/session.c:1101 -#, fuzzy +#: info/session.c:1102 msgid "Moving to `Prev's last menu item." -msgstr "Flytter til «forrige»s siste menypunkt." +msgstr "Flytter til «forrige»s siste menypunkt." -#: info/session.c:1112 +#: info/session.c:1113 msgid "Move forwards or down through node structure" msgstr "Flytte forover eller ned gjennom nodestrukturen" -#: info/session.c:1128 +#: info/session.c:1129 msgid "Move backwards or up through node structure" msgstr "Flytte tilbake eller opp gjennom nodestrukturen" -#. Show the next screen of WINDOW's node. -#: info/session.c:1143 +#: info/session.c:1229 msgid "Scroll forward in this window" msgstr "Rulle forover i dette vinduet" -#: info/session.c:1192 +#: info/session.c:1237 msgid "Scroll forward in this window and set default window size" -msgstr "Rulle forover i dette vinduet og sette standard vindustørrelse" +msgstr "Rulle forover i dette vinduet og sette standard vindustørrelse" + +#: info/session.c:1245 +msgid "Scroll forward in this window staying within node" +msgstr "Rulle forover i dette vinduet, men forbli innenfor noden" -#. Show the previous screen of WINDOW's node. -#: info/session.c:1200 +#: info/session.c:1253 +msgid "" +"Scroll forward in this window staying within node and set default window size" +msgstr "" +"Rulle forover i dette vinduet, forbli innenfor noden og sette standard " +"vindustørrelse" + +#: info/session.c:1261 msgid "Scroll backward in this window" msgstr "Rulle bakover i dette vinduet" -#: info/session.c:1244 +#: info/session.c:1269 msgid "Scroll backward in this window and set default window size" -msgstr "Rulle bakover i dette vinduet og sette standard vindustørrelse" +msgstr "Rulle bakover i dette vinduet og sette standard vindustørrelse" + +#: info/session.c:1278 +msgid "Scroll backward in this window staying within node" +msgstr "Rulle bakover i dette vinduet, men forbli innenfor noden" + +#: info/session.c:1286 +msgid "" +"Scroll backward in this window staying within node and set default window " +"size" +msgstr "" +"Rulle bakover i dette vinduet, forbli innenfor noden og sette standard " +"vindustørrelse" -#. Move to the beginning of the node. -#: info/session.c:1252 +#: info/session.c:1294 msgid "Move to the start of this node" msgstr "Flytte til starten av denne noden" -#. Move to the end of the node. -#: info/session.c:1259 +#: info/session.c:1301 msgid "Move to the end of this node" msgstr "Flytte til slutten av denne noden" -#. Scroll the window forward by N lines. -#: info/session.c:1266 +#: info/session.c:1308 msgid "Scroll down by lines" msgstr "Rulle ned pr. antall linjer" -#. Scroll the window backward by N lines. -#: info/session.c:1283 +#: info/session.c:1325 msgid "Scroll up by lines" msgstr "Rulle opp pr. antall linjer" -#: info/session.c:1301 +#: info/session.c:1343 msgid "Scroll down by half screen size" msgstr "Rulle ned en halv side" -#: info/session.c:1327 +#: info/session.c:1369 msgid "Scroll up by half screen size" msgstr "Rulle opp en halv side" -#. **************************************************************** -#. -#. Commands for Manipulating Windows -#. -#. **************************************************************** -#. Make the next window in the chain be the active window. -#: info/session.c:1356 +#: info/session.c:1398 msgid "Select the next window" msgstr "Velge neste vindu" -#. Make the previous window in the chain be the active window. -#: info/session.c:1395 +#: info/session.c:1437 msgid "Select the previous window" msgstr "Velge forrige vindu" -#. Split WINDOW into two windows, both showing the same node. If we -#. are automatically tiling windows, re-tile after the split. -#: info/session.c:1446 +#: info/session.c:1488 msgid "Split the current window" msgstr "Dele gjeldende vindu" -#. Delete WINDOW, forgetting the list of last visited nodes. If we are -#. automatically displaying footnotes, show or remove the footnotes -#. window. If we are automatically tiling windows, re-tile after the -#. deletion. -#: info/session.c:1527 +#: info/session.c:1569 msgid "Delete the current window" msgstr "Slette den gjeldende vindu" -#: info/session.c:1535 +#: info/session.c:1577 msgid "Cannot delete a permanent window" msgstr "Kan ikke slette et permanent vindu" -#. Just keep WINDOW, deleting all others. -#: info/session.c:1568 +#: info/session.c:1610 msgid "Delete all other windows" msgstr "Slette alle andre vinduer" -#. Scroll the "other" window of WINDOW. -#: info/session.c:1614 +#: info/session.c:1656 msgid "Scroll the other window" msgstr "Rulle det andre vinduet" -#: info/session.c:1635 +#: info/session.c:1677 msgid "Scroll the other window backward" msgstr "Rulle det andre vinduet bakover" -#. Change the size of WINDOW by AMOUNT. -#: info/session.c:1641 +#: info/session.c:1683 msgid "Grow (or shrink) this window" -msgstr "Øke (eller minke) dette vinduet" +msgstr "Øke (eller minke) dette vinduet" -#: info/session.c:1652 +#: info/session.c:1694 msgid "Divide the available screen space among the visible windows" msgstr "Dele den tilgjengelige skjermplassen mellom de synlige vinduene" -#: info/session.c:1659 +#: info/session.c:1701 msgid "Toggle the state of line wrapping in the current window" msgstr "Veksle tilstanden til linjebryting i gjeldende vindu" -#. Make WINDOW display the "Next:" node of the node currently being -#. displayed. -#: info/session.c:1838 +#: info/session.c:1880 msgid "Select the Next node" msgstr "Velge neste node" -#. Make WINDOW display the "Prev:" node of the node currently being -#. displayed. -#: info/session.c:1846 +#: info/session.c:1888 msgid "Select the Prev node" msgstr "Velge forrige node" -#. Make WINDOW display the "Up:" node of the node currently being -#. displayed. -#: info/session.c:1854 +#: info/session.c:1896 msgid "Select the Up node" msgstr "Velge oppnoden" -#. Make WINDOW display the last node of this info file. -#: info/session.c:1861 +#: info/session.c:1903 msgid "Select the last node in this file" msgstr "Velge den siste noden i denne filen" -#: info/session.c:1888 info/session.c:1921 +#: info/session.c:1930 info/session.c:1963 msgid "This window has no additional nodes" msgstr "Dette vinduet har ingen andre noder" -#. Make WINDOW display the first node of this info file. -#: info/session.c:1894 +#: info/session.c:1936 msgid "Select the first node in this file" -msgstr "Velge første node i denne filen" +msgstr "Velge første node i denne filen" -#: info/session.c:1928 +#: info/session.c:1970 msgid "Select the last item in this node's menu" msgstr "Velge det siste punktet i nodens meny" -#. Use KEY (a digit) to select the Nth menu item in WINDOW->node. -#: info/session.c:1934 +#: info/session.c:1976 msgid "Select this menu item" msgstr "Velge dette menypunktet" -#: info/session.c:1963 +#: info/session.c:2005 #, c-format msgid "There aren't %d items in this menu." msgstr "Det er ikke %d punkter i denne menyen." -#: info/session.c:2094 +#: info/session.c:2148 #, c-format msgid "Menu item (%s): " msgstr "Menypunkt (%s): " -#: info/session.c:2096 +#: info/session.c:2150 msgid "Menu item: " msgstr "Menypunkt: " -#: info/session.c:2101 +#: info/session.c:2155 #, c-format msgid "Follow xref (%s): " -msgstr "Følge kryssreferanse (%s): " +msgstr "Følge kryssreferanse (%s): " -#: info/session.c:2103 +#: info/session.c:2157 msgid "Follow xref: " -msgstr "Følge kryssreferanse: " +msgstr "Følge kryssreferanse: " -#. Read a line (with completion) which is the name of a menu item, -#. and select that item. -#: info/session.c:2191 +#: info/session.c:2280 msgid "Read a menu item and select its node" msgstr "Lese et menyvalg og velge dens node" -#: info/session.c:2199 +#: info/session.c:2288 msgid "Read a footnote or cross reference and select its node" msgstr "Lese en fotnote eller kryssreferanse og velge dens node" -#. Position the cursor at the start of this node's menu. -#: info/session.c:2205 +#: info/session.c:2294 msgid "Move to the start of this node's menu" msgstr "Flytte til starten av denne nodens meny" -#: info/session.c:2229 +#: info/session.c:2318 msgid "Visit as many menu items at once as possible" -msgstr "Besøke så mange menypunkter som mulig samtidig" +msgstr "Besøke så mange menypunkter som mulig samtidig" -#. Read a line of input which is a node name, and go to that node. -#: info/session.c:2257 +#: info/session.c:2346 msgid "Read a node name and select it" msgstr "Lese et nodenavn og velge det" -#: info/session.c:2312 info/session.c:2316 +#: info/session.c:2401 info/session.c:2405 msgid "Goto node: " -msgstr "Gå til node: " +msgstr "Gå til node: " -#: info/session.c:2382 -#, fuzzy, c-format +#: info/session.c:2471 +#, c-format msgid "No menu in node `%s'." -msgstr "Ingen meny i noden «%s»." +msgstr "Ingen meny i noden «%s»." -#: info/session.c:2422 -#, fuzzy, c-format +#: info/session.c:2516 +#, c-format msgid "No menu item `%s' in node `%s'." -msgstr "Ingen menypunkt «%s» i noden «%s»." +msgstr "Ingen menypunkt «%s» i noden «%s»." -#: info/session.c:2452 -#, fuzzy, c-format +#: info/session.c:2546 +#, c-format msgid "Unable to find node referenced by `%s' in `%s'." -msgstr "Klarte ikke å finne noden referert av «%s» i «%s»." +msgstr "Klarte ikke å finne noden referert av «%s» i «%s»." -#: info/session.c:2503 +#: info/session.c:2597 msgid "Read a list of menus starting from dir and follow them" -msgstr "Lese en liste over menyer fra dir og følge dem" +msgstr "Lese en liste over menyer fra dir og følge dem" -#: info/session.c:2505 +#: info/session.c:2599 msgid "Follow menus: " -msgstr "Følge menyer: " +msgstr "Følge menyer: " -#: info/session.c:2703 +#: info/session.c:2797 msgid "Find the node describing program invocation" -msgstr "Finne noden som beskriver bruksmåten for programmet" +msgstr "Finne noden som beskriver bruksmåten for programmet" -#: info/session.c:2705 +#: info/session.c:2799 #, c-format msgid "Find Invocation node of [%s]: " msgstr "Finne Invocation-noden til [%s]: " -#: info/session.c:2743 +#: info/session.c:2837 msgid "Read a manpage reference and select it" msgstr "Lese en manualside-referanse og velge den" -#: info/session.c:2747 +#: info/session.c:2841 msgid "Get Manpage: " msgstr "Hent manualsiden: " -#. Move to the "Top" node in this file. -#: info/session.c:2777 +#: info/session.c:2871 msgid "Select the node `Top' in this file" -msgstr "Velge «Top»-noden i denne filen" +msgstr "Velge «Top»-noden i denne filen" -#. Move to the node "(dir)Top". -#: info/session.c:2783 +#: info/session.c:2877 msgid "Select the node `(dir)'" -msgstr "Velge noden «(dir)»" +msgstr "Velge noden «(dir)»" -#: info/session.c:2803 +#: info/session.c:2897 #, c-format msgid "Kill node (%s): " msgstr "Slette noden (%s): " -#: info/session.c:2857 +#: info/session.c:2951 #, c-format msgid "Cannot kill node `%s'" -msgstr "Kan ikke slette noden «%s»" +msgstr "Kan ikke slette noden «%s»" -#: info/session.c:2867 +#: info/session.c:2961 msgid "Cannot kill the last node" msgstr "Kan ikke slette den forrige noden" -#: info/session.c:2953 +#: info/session.c:3047 msgid "Select the most recently selected node" msgstr "Velge den sist valgte noden" -#. Kill named node. -#: info/session.c:2959 +#: info/session.c:3053 msgid "Kill this node" msgstr "Slette denne noden" -#. Read the name of a file and select the entire file. -#: info/session.c:2967 +#: info/session.c:3061 msgid "Read the name of a file and select it" -msgstr "Lese inn navnet på en fil og velge den" +msgstr "Lese inn navnet på en fil og velge den" -#: info/session.c:2971 +#: info/session.c:3065 msgid "Find file: " msgstr "Finne fil: " -#: info/session.c:2988 -#, fuzzy, c-format +#: info/session.c:3082 +#, c-format msgid "Cannot find `%s'." -msgstr "Kan ikke finne «%s»." +msgstr "Kan ikke finne «%s»." -#: info/session.c:3033 info/session.c:3154 -#, fuzzy, c-format +#: info/session.c:3127 info/session.c:3248 +#, c-format msgid "Could not create output file `%s'." -msgstr "Kunne ikke opprette utskriftsfil «%s»." +msgstr "Kunne ikke opprette utskriftsfil «%s»." -#: info/session.c:3046 info/session.c:3171 info/session.c:3232 +#: info/session.c:3140 info/session.c:3265 info/session.c:3326 msgid "Done." msgstr "Ferdig." -#. Maybe we should print some information about the node being output. -#: info/session.c:3102 -#, fuzzy, c-format +#: info/session.c:3196 +#, c-format msgid "Writing node %s..." -msgstr "Skriver noden «%s»..." +msgstr "Skriver noden «%s»..." -# I need a better substitute for the verb «to pipe». -# «Å pipe» sounds no good to me. -#: info/session.c:3180 +# I need a better substitute for the verb «to pipe». +# «Å pipe» sounds no good to me. +#: info/session.c:3274 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" -msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND" +msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND" -#: info/session.c:3216 -#, fuzzy, c-format +#: info/session.c:3310 +#, c-format msgid "Cannot open pipe to `%s'." -msgstr "Kan ikke åpne «pipe» til «%s»." +msgstr "Kan ikke åpne «pipe» til «%s»." -#. Maybe we should print some information about the node being output. -#: info/session.c:3222 -#, fuzzy, c-format +#: info/session.c:3316 +#, c-format msgid "Printing node %s..." -msgstr "Skriver ut noden «%s»..." +msgstr "Skriver ut noden «%s»..." -#: info/session.c:3464 -#, fuzzy, c-format +#: info/session.c:3558 +#, c-format msgid "Searching subfile %s ..." -msgstr "Søker i delfil «%s»..." +msgstr "Søker i delfil «%s»..." -#: info/session.c:3516 +#: info/session.c:3610 msgid "Read a string and search for it case-sensitively" msgstr "" -"Lese inn en streng og søke etter den med skille på store og små bokstaver" +"Lese inn en streng og søke etter den med skille på store og små bokstaver" -#: info/session.c:3523 +#: info/session.c:3617 msgid "Read a string and search for it" -msgstr "Lese inn en streng og søke etter den" +msgstr "Lese inn en streng og søke etter den" -#: info/session.c:3531 +#: info/session.c:3625 msgid "Read a string and search backward for it" -msgstr "Lese inn en streng og søke bakover etter den" +msgstr "Lese inn en streng og søke bakover etter den" -#: info/session.c:3573 +#: info/session.c:3667 #, c-format msgid "%s%sfor string [%s]: " msgstr "%s%setter streng [%s]: " -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search backward" -msgstr "Søke bakover" +msgstr "Søke bakover" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search" -msgstr "Søke" +msgstr "Søke" -#: info/session.c:3575 +#: info/session.c:3669 msgid " case-sensitively " -msgstr " med skille på store og små bokstaver " +msgstr " med skille på store og små bokstaver " -#: info/session.c:3575 +#: info/session.c:3669 msgid " " msgstr " " -#: info/session.c:3615 +#: info/session.c:3709 msgid "Search failed." -msgstr "Søk mislyktes" +msgstr "Søk mislyktes" -#: info/session.c:3633 +#: info/session.c:3727 msgid "Repeat last search in the same direction" -msgstr "Gjenta forrige søk i samme retning" +msgstr "Gjenta forrige søk i samme retning" -#: info/session.c:3636 info/session.c:3646 +#: info/session.c:3730 info/session.c:3740 msgid "No previous search string" -msgstr "Ingen tidligere søkestreng" +msgstr "Ingen tidligere søkestreng" -#: info/session.c:3643 +#: info/session.c:3737 msgid "Repeat last search in the reverse direction" -msgstr "Gjenta forrige søk i motsatt retning" +msgstr "Gjenta forrige søk i motsatt retning" -#: info/session.c:3661 info/session.c:3667 +#: info/session.c:3755 info/session.c:3761 msgid "Search interactively for a string as you type it" -msgstr "Søke interaktivt for en streng mens du skriver" +msgstr "Søke interaktivt for en streng mens du skriver" -#: info/session.c:3761 +#: info/session.c:3855 msgid "I-search backward: " -msgstr "I-søk bakover: " +msgstr "I-søk bakover: " -#: info/session.c:3763 +#: info/session.c:3857 msgid "I-search: " -msgstr "I-søk: " +msgstr "I-søk: " -#: info/session.c:3788 +#: info/session.c:3882 msgid "Failing " msgstr "Mislyktes " -#: info/session.c:4244 +#: info/session.c:4340 msgid "Move to the previous cross reference" msgstr "Flytte til forrige kryssreferanse" -#: info/session.c:4253 +#: info/session.c:4349 msgid "Move to the next cross reference" msgstr "Flytte til neste kryssreferanse" -#: info/session.c:4263 +#: info/session.c:4359 msgid "Select reference or menu item appearing on this line" -msgstr "Velge referanse eller menypunkt på denne linjen" - -#. **************************************************************** -#. -#. Miscellaneous Info Commands -#. -#. **************************************************************** -#. What to do when C-g is pressed in a window. -#: info/session.c:4285 +msgstr "Velge referanse eller menypunkt på denne linjen" + +#: info/session.c:4381 msgid "Cancel current operation" msgstr "Avbryte gjeldende operasjon" -#: info/session.c:4292 +#: info/session.c:4388 msgid "Quit" msgstr "Avbrutt" -#: info/session.c:4301 +#: info/session.c:4397 msgid "Move the cursor to a specific line of the window" -msgstr "Flytte markøren til en angitt linje i vinduet" +msgstr "Flytte markøren til en angitt linje i vinduet" -#. Clear the screen and redraw its contents. Given a numeric argument, -#. move the line the cursor is on to the COUNT'th line of the window. -#: info/session.c:4333 +#: info/session.c:4429 msgid "Redraw the display" -msgstr "Tegne skjermen på nytt" +msgstr "Tegne skjermen på nytt" -#. This command does nothing. It is the fact that a key is bound to it -#. that has meaning. See the code at the top of info_session (). -#: info/session.c:4370 +#: info/session.c:4466 msgid "Quit using Info" msgstr "Avslutte Info" -#: info/session.c:4393 +#: info/session.c:4479 +msgid "Run command bound to this key's lowercase variant" +msgstr "Kjør kommandoen knyttet til denne tastens «liten-bokstav-variant»" + +#: info/session.c:4491 #, c-format msgid "Unknown command (%s)." msgstr "Ukjent kommando (%s)." -#: info/session.c:4396 +#: info/session.c:4494 msgid "\"\" is invalid" -msgstr "«» er ugyldig" +msgstr "«» er ugyldig" -#: info/session.c:4397 +#: info/session.c:4495 #, c-format msgid "\"%s\" is invalid" -msgstr "«%s» er ugyldig" +msgstr "«%s» er ugyldig" -#: info/session.c:4620 +#: info/session.c:4713 msgid "Add this digit to the current numeric argument" msgstr "Legge til dette siffret til det gjeldende numeriske argumentet" -#: info/session.c:4629 +#: info/session.c:4722 msgid "Start (or multiply by 4) the current numeric argument" msgstr "Starte (eller multiplisere med 4) den gjeldende numeriske argumentet" -#: info/session.c:4644 +#: info/session.c:4737 msgid "Internally used by \\[universal-argument]" msgstr "Brukt internt av \\[universal-argument]" @@ -1312,947 +1603,1098 @@ msgstr "Brukt internt av \\[universal-argument]" msgid "readline: Out of virtual memory!\n" msgstr "readline: Tomt for virtuelt minne!\n" -#: info/variables.c:40 +#: info/variables.c:37 msgid "When \"On\", footnotes appear and disappear automatically" -msgstr "Når «On», oppstår og forsvinner fotnoter automatisk" +msgstr "Når «On», oppstår og forsvinner fotnoter automatisk" -#: info/variables.c:44 +#: info/variables.c:41 msgid "When \"On\", creating or deleting a window resizes other windows" msgstr "" -"Når «On», laging eller fjerning av vinduer endrer størrelsen på andre vinduer" +"Når «On», laging eller fjerning av vinduer endrer størrelsen på andre vinduer" -#: info/variables.c:48 +#: info/variables.c:45 msgid "When \"On\", flash the screen instead of ringing the bell" -msgstr "Når «On», blink skjermen istedet for å ringe i bjellen." +msgstr "Når «On», blink skjermen istedet for å ringe i bjellen." -#: info/variables.c:52 +#: info/variables.c:49 msgid "When \"On\", errors cause the bell to ring" -msgstr "Når «On», feil får bjellen til å ringe" +msgstr "Når «On», feil får bjellen til å ringe" -#: info/variables.c:56 +#: info/variables.c:53 msgid "When \"On\", Info garbage collects files which had to be uncompressed" -msgstr "Når «On», Info søppelhenter filer som måtte dekomprimeres" +msgstr "Når «On», Info søppelhenter filer som måtte dekomprimeres" -#: info/variables.c:59 +#: info/variables.c:56 msgid "When \"On\", the portion of the matched search string is highlighted" -msgstr "Når «On», den delen av en matchende søkestreng blir uthevet" +msgstr "Når «On», den delen av en matchende søkestreng blir uthevet" -#: info/variables.c:63 +#: info/variables.c:60 msgid "Controls what happens when scrolling is requested at the end of a node" msgstr "" -"Kontrollerer hva som skjer når rulling er ønsket ved slutten av en node" +"Kontrollerer hva som skjer når rulling er ønsket ved slutten av en node" -#: info/variables.c:67 +#: info/variables.c:64 msgid "The number lines to scroll when the cursor moves out of the window" -msgstr "Antall linjer som skal rulles når markøren flyttes utenfor vinduet" +msgstr "Antall linjer som skal rulles når markøren flyttes utenfor vinduet" -#: info/variables.c:71 +#: info/variables.c:68 msgid "When \"On\", Info accepts and displays ISO Latin characters" -msgstr "Når «On», aksepterer og viser Info ISO-Latin-tegn" +msgstr "Når «On», aksepterer og viser Info ISO-Latin-tegn" -#: info/variables.c:77 +#: info/variables.c:74 msgid "Explain the use of a variable" msgstr "Forklar bruken av en variabel" -#. Get the variable's name. -#: info/variables.c:83 +#: info/variables.c:80 msgid "Describe variable: " msgstr "Beskriv variabel: " -#: info/variables.c:102 +#: info/variables.c:99 msgid "Set the value of an Info variable" msgstr "Sette verdien til en Infovariabel" -#. Get the variable's name and value. -#: info/variables.c:108 +#: info/variables.c:105 msgid "Set variable: " msgstr "Sett variabel: " -#: info/variables.c:126 +#: info/variables.c:123 #, c-format msgid "Set %s to value (%d): " msgstr "Sette %s til verdien (%d): " -#: info/variables.c:167 +#: info/variables.c:164 #, c-format msgid "Set %s to value (%s): " msgstr "Sette %s til verdien (%s): " -#: info/window.c:1101 +#: info/window.c:1164 msgid "--*** Tags out of Date ***" msgstr "--*** Tagger er ute av synk ***" -#. strlen (location_indicator). -#. 10 for the decimal representation of the number of lines in this -#. node, and the remainder of the text that can appear in the line. -#: info/window.c:1112 +#: info/window.c:1175 msgid "-----Info: (), lines ----, " msgstr "-----Info: (), linjer ----, " -#: info/window.c:1119 +#: info/window.c:1182 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "-%s---Info: %s, %d linjer --%s--" -#: info/window.c:1123 +#: info/window.c:1186 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "-%s%s-Info: (%s)%s, %d linjer --%s--" -#: info/window.c:1130 +#: info/window.c:1193 #, c-format msgid " Subfile: %s" msgstr " Delfil: %s" -#: lib/getopt.c:680 +#: lib/getopt.c:675 #, c-format msgid "%s: option `%s' is ambiguous\n" -msgstr "%s: valget «%s» er flertydig\n" +msgstr "%s: valget «%s» er flertydig\n" -#: lib/getopt.c:704 +#: lib/getopt.c:700 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "%s: valget «--%s» tillater ikke et argument\n" +msgstr "%s: valget «--%s» tillater ikke et argument\n" -#: lib/getopt.c:709 +#: lib/getopt.c:705 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "%s: valget «%c%s» tillater ikke et argument\n" +msgstr "%s: valget «%c%s» tillater ikke et argument\n" -#: lib/getopt.c:726 lib/getopt.c:899 +#: lib/getopt.c:723 lib/getopt.c:896 #, c-format msgid "%s: option `%s' requires an argument\n" -msgstr "%s: valget «%s» krever et argument\n" +msgstr "%s: valget «%s» krever et argument\n" -#. --option -#: lib/getopt.c:755 +#: lib/getopt.c:752 #, c-format msgid "%s: unrecognized option `--%s'\n" -msgstr "%s: ukjent valg «--%s»\n" +msgstr "%s: ukjent valg «--%s»\n" -#. +option or -option -#: lib/getopt.c:759 +#: lib/getopt.c:756 #, c-format msgid "%s: unrecognized option `%c%s'\n" -msgstr "%s: ukjent valg «%c%s»\n" +msgstr "%s: ukjent valg «%c%s»\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:785 +#: lib/getopt.c:782 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ulovlig valg -- %c\n" -#: lib/getopt.c:788 +#: lib/getopt.c:785 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ugyldig valg -- %c\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:818 lib/getopt.c:948 +#: lib/getopt.c:815 lib/getopt.c:945 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: valget krever et argument -- %c\n" -#: lib/getopt.c:865 +#: lib/getopt.c:862 #, c-format msgid "%s: option `-W %s' is ambiguous\n" -msgstr "%s: valget «-W %s» er flertydig\n" +msgstr "%s: valget «-W %s» er flertydig\n" -#: lib/getopt.c:883 +#: lib/getopt.c:880 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "%s: valget «-W %s» tillater ikke et argument\n" +msgstr "%s: valget «-W %s» tillater ikke et argument\n" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "January" msgstr "januar" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "February" msgstr "februar" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "March" msgstr "mars" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "April" msgstr "april" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "May" msgstr "mai" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "June" msgstr "juni" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "July" msgstr "juli" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "August" msgstr "august" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "September" msgstr "september" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "October" msgstr "oktober" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "November" msgstr "november" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "December" msgstr "desember" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:658 #, c-format msgid "unlikely character %c in @var" msgstr "usannsynlig tegn %c i @var" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:701 msgid "@sc argument all uppercase, thus no effect" msgstr "@sc-argument med store bokstaver, dermed ingen effekt" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:759 +#, c-format +msgid "`{' expected, but saw `%c'" +msgstr "«{» forventet, men så «%c»" + +#: makeinfo/cmds.c:789 +msgid "end of file inside verb block" +msgstr "slutt-på-fila inne i verb-blokk" + +#: makeinfo/cmds.c:797 +#, c-format +msgid "`}' expected, but saw `%c'" +msgstr "«{» forventet, men så «%c»" + +#: makeinfo/cmds.c:942 #, c-format msgid "%c%s is obsolete" -msgstr "%c%s er utgått" +msgstr "%c%s er utgått" -#: makeinfo/cmds.c:814 +#: makeinfo/cmds.c:1014 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "@sp krever et positivt numerisk argument, ikke `%s'" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "Ugyldig argument til %c%s" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140 msgid "asis" msgstr "asis" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142 msgid "none" msgstr "none" -#: makeinfo/defun.c:83 +#: makeinfo/defun.c:85 msgid "Missing `}' in @def arg" -msgstr "Manglende «}» i @def-arg" +msgstr "Manglende «}» i @def-arg" -#: makeinfo/defun.c:358 +#: makeinfo/defun.c:363 msgid "Function" msgstr "Funksjon" -#: makeinfo/defun.c:361 +#: makeinfo/defun.c:366 msgid "Macro" msgstr "Makro" -#: makeinfo/defun.c:364 +#: makeinfo/defun.c:369 msgid "Special Form" msgstr "Spesiell form" -#: makeinfo/defun.c:368 +#: makeinfo/defun.c:373 msgid "Variable" msgstr "Variabel" -#: makeinfo/defun.c:371 +#: makeinfo/defun.c:376 msgid "User Option" msgstr "Brukervalg" -#: makeinfo/defun.c:375 +#: makeinfo/defun.c:380 msgid "Instance Variable" msgstr "Forekomst" -#: makeinfo/defun.c:379 +#: makeinfo/defun.c:384 msgid "Method" msgstr "Metode" -#: makeinfo/defun.c:450 makeinfo/defun.c:454 makeinfo/defun.c:556 -#: makeinfo/defun.c:570 makeinfo/defun.c:610 +#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615 +#: makeinfo/defun.c:631 makeinfo/defun.c:671 msgid "of" msgstr "av" -#: makeinfo/defun.c:458 makeinfo/defun.c:462 makeinfo/defun.c:466 -#: makeinfo/defun.c:564 makeinfo/defun.c:615 +#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482 +#: makeinfo/defun.c:624 makeinfo/defun.c:676 msgid "on" -msgstr "på" +msgstr "på" -#: makeinfo/defun.c:656 +#: makeinfo/defun.c:717 #, c-format msgid "Must be in `%s' insertion to use `%sx'" -msgstr "Må være i en «%s»-innsetting for å bruke «%sx»" +msgstr "Må være i en «%s»-innsetting for å bruke «%sx»" -#: makeinfo/files.c:460 +#: makeinfo/files.c:448 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "%s: getwd: %s, %s\n" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" -msgstr "«%c%s» trenger et argument «{...}», ikke bare «%s»" +msgstr "«%c%s» trenger et argument «{...}», ikke bare «%s»" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" -msgstr "Ingen avsluttende krøllparentes for fotnoten «%s»" +msgstr "Ingen avsluttende krøllparentes for fotnoten «%s»" -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" msgstr "Fotnote definert uten foreldrenode" -#: makeinfo/footnote.c:278 +#: makeinfo/footnote.c:210 +#, fuzzy +msgid "Footnotes inside footnotes are not allowed" +msgstr "Fotnote definert uten foreldrenode" + +#: makeinfo/footnote.c:298 msgid "Footnotes" msgstr "Fotnoter" -#. The <title> should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:42 msgid "Untitled" msgstr "Uten navn" -#: makeinfo/index.c:212 +#: makeinfo/html.c:298 +#, c-format +msgid "Invalid node name: `%s'" +msgstr "Ugyldig nodenavn: «%s»" + +#: makeinfo/index.c:213 #, c-format msgid "Unknown index `%s'" -msgstr "Ukjent indeks «%s»" +msgstr "Ukjent indeks «%s»" + +#: makeinfo/index.c:238 +#, c-format +msgid "Info cannot handle `:' in index entry `%s'" +msgstr "Info kan ikke håndtere `:' i indeksinnslaget `%s'" -#: makeinfo/index.c:382 +#: makeinfo/index.c:396 #, c-format msgid "Index `%s' already exists" -msgstr "Indeksen «%s» eksisterer allerede" +msgstr "Indeksen «%s» eksisterer allerede" -#: makeinfo/index.c:425 +#: makeinfo/index.c:439 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" -msgstr "Ukjent indeks «%s» og/eller «%s» i @synindex" +msgstr "Ukjent indeks «%s» og/eller «%s» i @synindex" -#: makeinfo/index.c:642 +#: makeinfo/index.c:666 #, c-format msgid "Unknown index `%s' in @printindex" -msgstr "Ukjent indeks «%s» i @printindex" +msgstr "Ukjent indeks «%s» i @printindex" -#: makeinfo/index.c:680 +#: makeinfo/index.c:709 #, c-format msgid "Entry for index `%s' outside of any node" -msgstr "Innslag for indeksen «%s» utenfor node" +msgstr "Innslag for indeksen «%s» utenfor node" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:712 makeinfo/index.c:751 msgid "(outside of any node)" msgstr "(utenfor noder)" -#: makeinfo/insertion.c:192 +#: makeinfo/insertion.c:198 msgid "Broken-Type in insertion_type_pname" msgstr "Broken-Type i insertion_type_pname" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:271 msgid "Enumeration stack overflow" msgstr "Stakkoverflyt ved oppramsing" -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:303 #, c-format msgid "lettering overflow, restarting at %c" -msgstr "bokstavoverflyt, starter på nytt ved %c" +msgstr "bokstavoverflyt, starter på nytt ved %c" -#: makeinfo/insertion.c:481 +#: makeinfo/insertion.c:538 #, c-format msgid "%s requires an argument: the formatter for %citem" msgstr "%s krever et argument: formattereren for %citem" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:693 #, c-format msgid "`@end' expected `%s', but saw `%s'" -msgstr "`@end' forventet «%s», men så «%s»" +msgstr "`@end' forventet «%s», men så «%s»" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:931 #, c-format msgid "No matching `%cend %s'" -msgstr "Ingen tilsvarende «%cend %s»" +msgstr "Ingen tilsvarende «%cend %s»" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:1084 #, c-format msgid "%s requires letter or digit" msgstr "%s krever en bokstav eller et siffer" -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1158 +msgid "end of file inside verbatim block" +msgstr "slutt-på-filen inne i verbatimblokk" + +#: makeinfo/insertion.c:1318 msgid "@menu seen before first @node, creating `Top' node" -msgstr "@menu sett før første @node, oppretter «Top»-noden" +msgstr "@menu sett før første @node, oppretter «Top»-noden" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1319 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?" -#. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1331 msgid "@detailmenu seen before first node, creating `Top' node" -msgstr "@detailmenu sett før første node, oppretter «Top»-noden" +msgstr "@detailmenu sett før første node, oppretter «Top»-noden" -#: makeinfo/insertion.c:1074 +#: makeinfo/insertion.c:1346 #, c-format msgid "Unmatched `%c%s'" -msgstr "Umatchet «%c%s»" +msgstr "Umatchet «%c%s»" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1353 #, c-format msgid "`%c%s' needs something after it" -msgstr "«%c%s» trenger noe etter den" +msgstr "«%c%s» trenger noe etter den" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1359 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" -msgstr "Ugyldig argument til «%s», «%s», bruker «%s»" +msgstr "Ugyldig argument til «%s», «%s», bruker «%s»" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1453 #, c-format msgid "@%s not meaningful inside `@%s' block" -msgstr "@%s er meningsløs innenfor en «%s»-blokk" +msgstr "@%s er meningsløs innenfor en «%s»-blokk" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1462 #, c-format msgid "@itemx not meaningful inside `%s' block" -msgstr "@itemx er meningsløs innenfor en «%s»-blokk" +msgstr "@itemx er meningsløs innenfor en «%s»-blokk" -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1646 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s funnet utenfor en innsettingsblokk" -#: makeinfo/lang.c:199 +#: makeinfo/lang.c:331 #, c-format msgid "%s is not a valid ISO 639 language code" -msgstr "%s er ikke en gyldig ISO 639-språkkode" +msgstr "%s er ikke en gyldig ISO 639-språkkode" + +#: makeinfo/lang.c:384 +#, c-format +msgid "unrecogized encoding name `%s'" +msgstr "ukjent kodingsnavn «%s»" -#. This error message isn't perfect if the argument is multiple -#. characters, but it doesn't seem worth getting right. -#: makeinfo/lang.c:406 +#: makeinfo/lang.c:387 +#, c-format +msgid "sorry, encoding `%s' not supported" +msgstr "beklager, kodingen «%s» er ikke støttet" + +#: makeinfo/lang.c:414 +#, c-format +msgid "invalid encoded character `%s'" +msgstr "Ugyldig kodet tegn «%s»" + +#: makeinfo/lang.c:502 +#, c-format +msgid "%s is an invalid ISO code, using %c" +msgstr "%s er en ugyldig ISO-kode, bruker %c" + +#: makeinfo/lang.c:687 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" -msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»" +msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»" -#: makeinfo/lang.c:410 +#: makeinfo/lang.c:691 #, 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" +msgstr "%c%s forventer et enkelt tegn, «i» eller «j» som argument" #: makeinfo/macro.c:134 #, c-format msgid "macro `%s' previously defined" -msgstr "makroen «%s» er tidligere definert" +msgstr "makroen «%s» er tidligere definert" #: makeinfo/macro.c:138 #, c-format msgid "here is the previous definition of `%s'" -msgstr "her er den tidligere definisjonen av «%s»" +msgstr "her er den tidligere definisjonen av «%s»" #: makeinfo/macro.c:355 #, c-format msgid "\\ in macro expansion followed by `%s' instead of \\ or parameter name" -msgstr "\\ i makroekspansjon fulgt av «%s» istedet for \\ eller parameternavn" +msgstr "\\ i makroekspansjon fulgt av «%s» istedet for \\ eller parameternavn" #: makeinfo/macro.c:403 #, c-format msgid "Macro `%s' called on line %d with too many args" -msgstr "Makroen «%s» kalt på linje %d med for mange argumenter" +msgstr "Makroen «%s» kalt på linje %d med for mange argumenter" -#: makeinfo/macro.c:595 +#: makeinfo/macro.c:594 #, c-format msgid "%cend macro not found" msgstr "%cend macro ikke funnet" -#: makeinfo/macro.c:634 +#: makeinfo/macro.c:632 msgid "@quote-arg only useful for single-argument macros" -msgstr "@quote-arg bare brukbart når makroen bare tar et argument" +msgstr "@quote-arg bare brukbart når makroen bare tar et argument" -#: makeinfo/macro.c:670 +#: makeinfo/macro.c:668 #, c-format msgid "mismatched @end %s with @%s" msgstr "umatchet @end %s med @%s" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:316 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: advarsel: " -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:339 msgid "Too many errors! Gave up.\n" msgstr "For mange feil! Ga opp.\n" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026 #, c-format msgid "Misplaced %c" msgstr "Feilplassert %c" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:370 #, c-format msgid "Try `%s --help' for more information.\n" -msgstr "Prøv «%s --help» for mer informasjon.\n" +msgstr "Prøv «%s --help» for mer informasjon.\n" -#: makeinfo/makeinfo.c:365 +#: makeinfo/makeinfo.c:373 #, c-format +msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" +msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n" + +#: makeinfo/makeinfo.c:376 msgid "" -"Usage: %s [OPTION]... TEXINFO-FILE...\n" -"\n" -"Translate Texinfo source documentation to various other formats:\n" -"Info files suitable for reading online with Emacs or standalone GNU Info\n" -"(by default); plain text (with --no-headers); or HTML (with --html).\n" -"\n" -"Options:\n" -" --commands-in-node-names allow @ commands in node names.\n" -" -D VAR define a variable, as with @set.\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" --error-limit=NUM quit after NUM errors (default %d).\n" -" --fill-column=NUM break Info lines at NUM characters (default %d).\n" -" --footnote-style=STYLE output footnotes according to STYLE:\n" -" `separate' to place footnotes in their own " -"node,\n" -" `end' to place the footnotes at the end of the\n" -" node in which they are defined (the default).\n" -" --force preserve output even if errors.\n" -" --help display this help and exit.\n" -" --html output HTML rather than Info format;\n" -" -I DIR append DIR to the @include search path.\n" -" --ifhtml process @ifhtml and @html text even when not\n" -" generating HTML.\n" -" --ifinfo process @ifinfo text even when generating HTML.\n" -" --iftex process @iftex and @tex text.\n" -" implies --no-split.\n" -msgstr "" -"Bruksmåte: %s [VALG]... TEXINFOFIL...\n" -"\n" -"Oversette Texinfo-kilde-dokumentasjon til forskjellige andre formater:\n" -"Infofiler laget for lesing online med Emacs eller frittstående GNU Info\n" -"(som standard); ren tekst (med --no-headers); eller HTML (med --html).\n" -"\n" -"Valg:\n" -" --commands-in-node-names tillate @-kommandoer i nodenavn.\n" -" -D VAR definere en variabel, som med @set.\n" -" -E, --macro-expand FIL skrive ut makroekspandert kilde til FIL.\n" -" --error-limit=ANT avbryte etter ANT feil (standard %d).\n" -" --fill-column=ANT bryte Infolinjer ved ANT tegn (standard %d).\n" -" --footnote-style=STIL skrive ut fotnoter i henhold til STIL:\n" -" «separate» for å plassere fotnotene i egne " -"noder,\n" -" «end» for å plassere fotnotene ved slutten av\n" -" noden de er definert i (standard).\n" -" --force bevar utskrift selv med feil.\n" -" --help vise denne hjelpen og avslutte.\n" -" --html skrive ut HTML i stedet for Infoformat;\n" -" -I KAT tilføye KAT til @include-søkelisten.\n" -" --ifhtml behandle @ifhtml og @html-tekst selv når ikke\n" -" HTML genereres.\n" -" --ifinfo behandle @ifinfo-tekst selv når HTML genereres.\n" -" --iftex behandle @iftex og @tex-tekst.\n" -" innebærer --no-split.\n" - -#: makeinfo/makeinfo.c:391 +"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 "" +"Oversette Texinfodokumentasjon til forskjellige andre formater:\n" +"Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n" + +#: makeinfo/makeinfo.c:380 #, c-format msgid "" -" --no-headers suppress Info node separators and Node: lines " -"and\n" -" write to standard output without --output.\n" -" --no-ifhtml do not process @ifhtml and @html text.\n" -" --no-ifinfo do not process @ifinfo text.\n" -" --no-iftex do not process @iftex and @tex text.\n" -" --no-split suppress splitting of large Info output files or\n" -" generation of one HTML file per node.\n" -" --no-validate suppress node cross-reference validation.\n" -" --no-warn suppress warnings (but not errors).\n" -" --number-sections include chapter, section, etc. numbers in " -"output.\n" -" -o, --output=FILE output to FILE, ignoring any @setfilename.\n" -" -P DIR prepend DIR to the @include search path.\n" -" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " -"%d).\n" -" if VAL is `none', do not indent;\n" -" if VAL is `asis', preserve existing " -"indentation.\n" -" --reference-limit=NUM warn about at most NUM references (default %d).\n" -" -U VAR undefine a variable, as with @clear.\n" -" -v, --verbose explain what is being done.\n" -" --version display version information and exit.\n" -msgstr "" -" --no-headers undertrykke Infonodeseparatorer og Node:-linjer " -"og\n" -" skrive til standard ut uten --output.\n" -" --no-ifhtml ikke behandle @ifhtml og @html-tekst.\n" -" --no-ifinfo ikke behandle @ifinfo-tekst.\n" -" --no-iftex ikke behandle @iftex og @tex-tekst.\n" -" --no-split undertrykke oppdeling av store Infofiler eller\n" -" generering av en HTML-fil pr. node.\n" -" --no-validate undertrykke kontroll av kryssreferanser.\n" -" --no-warn undertrykke advarsler (men ikke feil).\n" -" --number-sections numerere kapitler, avsnitt, etc. i utskrift.\n" -" -o, --output=FIL skrive ut til FIL, ignorerer enhver " -"@setfilename.\n" -" -P DIR tilføye KAT på starten til @include-søkelisten.\n" -" --paragraph-indent=ANT rykke inn Info-avsnitt med ANT mellomrommer " +"General options:\n" +" --error-limit=NUM quit after NUM errors (default %d).\n" +" --force preserve output even if errors.\n" +" --help display this help and exit.\n" +" --no-validate suppress node cross-reference validation.\n" +" --no-warn suppress warnings (but not errors).\n" +" --reference-limit=NUM warn about at most NUM references (default %" +"d).\n" +" -v, --verbose explain what is being done.\n" +" --version display version information and exit.\n" +msgstr "" +"Generelle valg:\n" +" --error-limit=ANT avbryte etter ANT feil (standard %d).\n" +" --force bevare output selv med feil.\n" +" --help vise denne hjelpen og avslutte.\n" +" --no-validate undertrykke sjekking av kryssreferanser.\n" +" --no-warn undertrykke advarsler (men ikke feil).\n" +" --reference-limit=ANT advare om på det meste ANT referanser " "(standard %d).\n" -" dersom ANT er «none», ikke rykk inn;\n" -" dersom ANT er «asis»', bevares eksisterende " -"innrykk.\n" -" --reference-limit=ANT advar på det meste om ANT referanser (standard " -"%d).\n" -" -U VAR udefinere en variabel, som med @clear.\n" -" -v, --verbose forklar hva som blir gjort.\n" -" --version vise programversjon og avslutte.\n" +" -v, --verbose forklare hva som blir gjort.\n" +" --version vise programversjon og avslutte.\n" +#: makeinfo/makeinfo.c:394 +#, fuzzy, no-wrap +msgid "" +"Output format selection (default is to produce Info):\n" +" --docbook output DocBook rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output XML (TexinfoML) rather than Info.\n" +msgstr "" +"Valg av outputformat (standard er å produsere Info):\n" +" --docbook generere DocBook i stedet for Info.\n" +" --html generere HTML i stedet for Info.\n" +" --no-headers generere plain text, undertrykke Info-nodeseparatorer\n" +" og Node:-linjer; i tillegg skriv til standard output\n" +" med mindre --output er gitt.\n" +" --xml generere XML (TexinfoML) i stedet for Info.\n" + +#: makeinfo/makeinfo.c:401 +#, 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" +msgstr "" +"Generelle outputvalg:\n" +" -E, --macro-expand FIL sende makroekspandert kilde til FIL,\n" +" ignorerer enhver @setfilename.\n" +" --no-split undertrykke splitting av Info- eller HTML-" +"output,\n" +" generere bare en outputfil.\n" +" --number-sections nummerere kapitler og avdelinger (section).\n" +" -o, --output=FIL sende output til FIL (katalog dersom splittet " +"HTML),\n" + +# Denne mangler oversettelse, må rettes snarest. #: makeinfo/makeinfo.c:415 +#, 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" +" --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" +" If VAL is `none', do not indent; if VAL is\n" +" `asis', preserve existing indentation.\n" +" --split-size=NUM split Info files at size NUM (default %d).\n" +msgstr "" +"Valg for Infooutput og ren tekst:\n" +" --enable-encoding skrive ut spesialtegn og tegn med aksenter i" +"\\n\n" +" Infooutput basert på @documentencoding.\\n\n" +" --fill-column=ANT bryte Infolinjer ved ANT tegn (standard %d).\n" +" --footnote-style=STIL generere fotnoter i Info i henhold til STIL:\n" +" «separate» for å legge fotnotene i egne " +"noder;\n" +" «end» for å legge fotnotene i slutten av " +"hver node\n" +" der fotnotene er definert (standard).\n" +" --paragraph-indent=ANT rykke inn Infoavsnitt med ANT mellomrom " +"(standard %d).\n" +" Dersom ANT er «none» rykkes ikke avsnittene " +"inn;\n" +" Dersom ANT er «asis» bevares eksisterende " +"innrykk.\n" +" --split-size=ANT splitte Infofilene ved lengde ANT (standard %" +"d).\n" + +#: makeinfo/makeinfo.c:433 +msgid "" +"Input file options:\n" +" --commands-in-node-names allow @ commands in node names.\n" +" -D VAR define the variable VAR, as with @set.\n" +" -I DIR append DIR to the @include search path.\n" +" -P DIR prepend DIR to the @include search path.\n" +" -U VAR undefine the variable VAR, as with @clear.\n" +msgstr "" +"Inputvalg:\n" +" --commands-in-node-names tillate @-kommandoer i nodenavn.\n" +" -D VAR definer variabelen VAR, som om @set " +"brukes.\n" +" -I KAT legg til KAT på slutten av @include-" +"søkestien.\n" +" -P KAT legg til KAT på starten av @include-" +"søkestien.\n" +" -U VAR udefiner variabelen VAR, som om @clear " +"brukes.\n" + +#: makeinfo/makeinfo.c:442 +#, fuzzy +msgid "" +"Conditional processing in input:\n" +" --ifhtml process @ifhtml and @html even if not generating HTML.\n" +" --ifinfo process @ifinfo even if not generating Info.\n" +" --ifplaintext process @ifplaintext even if not generating plain text.\n" +" --iftex process @iftex and @tex; implies --no-split.\n" +" --no-ifhtml do not process @ifhtml and @html text.\n" +" --no-ifinfo do not process @ifinfo text.\n" +" --no-ifplaintext do not process @ifplaintext text.\n" +" --no-iftex do not process @iftex and @tex text.\n" +msgstr "" +"Betinget behandling av input:\n" +" --ifhtml behandle @ifhtml og @html selv om HTML ikke skal " +"genereres.\n" +" --ifinfo behandle @ifinfo selv når HTML skal genereres.\n" +" --iftex behandle @iftex og @tex; innebærer --no-split.\n" +" --no-ifhtml ikke behandle @ifhtml og @html.\n" +" --no-ifinfo ikke behandle @ifinfo.\n" +" --no-iftex ikke behandle @iftex og @tex.\n" + +#: makeinfo/makeinfo.c:454 +#, fuzzy +msgid "" +" The defaults for the @if... conditionals depend on the output format:\n" +" if generating HTML, --ifhtml is on and the others are off;\n" +" if generating Info, --ifinfo is on and the others are off;\n" +" if generating plain text, --ifplaintext is on and the others are off;\n" +msgstr "" +" Standardverdiene for @if...-betingelsene avhenger av outputformatet:\n" +" dersom HTML genereres er --ifhtml påslått og de andre av;\n" +" dersom Info eller ren tekst genereres er --ifinfo påslått og de andre av.\n" + +#: makeinfo/makeinfo.c:461 +#, fuzzy msgid "" -"\n" -"The defaults for the @if... conditionals depend on the output format:\n" -"if generating HTML, --ifhtml is on and the others are off;\n" -"if generating Info or plain text, --ifinfo is on and the others are off.\n" -"\n" "Examples:\n" -" makeinfo foo.texi write Info to foo's @setfilename\n" -" makeinfo --html foo.texi write HTML to foo's @setfilename\n" -" makeinfo --no-headers -o - foo.texi write plain text to standard output\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 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" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org." +" 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 "" -"\n" -"Standardene for @if...-betingelsene avhenger av outputformatet:\n" -"dersom generere HTML, er --ifhtml på og de andre er av;\n" -"dersom generere Info eller ren tekst, er --ifinfo på og de andre av.\n" -"\n" "Eksempler:\n" -" makeinfo foo.texi skrive Info til foos @setfilename\n" -" makeinfo --html foo.texi skrive HTML til foos @setfilename\n" -" makeinfo --no-headers -o - foo.texi skrive ren tekst til standard ut\n" -" makeinfo --number-sections foo.texi skrive Info med nummererte avsnitt\n" -" makeinfo --no-split foo.texi skrive en Infofil uansett størrelse\n" -"\n" -"Send bugrapporter til bug-texinfo@gnu.org,\n" -"generelle spørsmål og diskusjoner til help-texinfo@gnu.org." +" makeinfo foo.texi skrive Info til foos @setfilename\n" +" makeinfo --html foo.texi skrive HTML til foos @setfilename\n" +" makeinfo --no-headers -o - foo.texi skrive ren tekst til standard ut\n" +" 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:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655 +#: makeinfo/makeinfo.c:676 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" -msgstr "%s: %s arg må være numerisk, ikke «%s».\n" +msgstr "%s: %s arg må være numerisk, ikke «%s».\n" -#: makeinfo/makeinfo.c:521 +#: makeinfo/makeinfo.c:583 #, c-format msgid "Couldn't open macro expansion output `%s'" -msgstr "Kunne ikke åpne filen «%s» for utskrift av makroekspansjon" +msgstr "Kunne ikke åpne filen «%s» for utskrift av makroekspansjon" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:586 msgid "Cannot specify more than one macro expansion output" msgstr "Kan ikke angi mer enn en fil for utskrift av makroekspansjon" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:624 #, 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" +"%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n" -#: makeinfo/makeinfo.c:602 +#: makeinfo/makeinfo.c:665 #, 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" +msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n" -#: makeinfo/makeinfo.c:647 +#: makeinfo/makeinfo.c:723 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: mangler filargument.\n" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:898 #, c-format msgid "Expected `%s'" -msgstr "Forventet «%s»" +msgstr "Forventet «%s»" + +#: makeinfo/makeinfo.c:1365 +msgid "File exists, but is not a directory" +msgstr "" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1366 +#, c-format +msgid "Can't create directory `%s': %s" +msgstr "Kan ikke opprette katalogen «%s»: %s" + +#: makeinfo/makeinfo.c:1414 #, c-format msgid "No `%s' found in `%s'" -msgstr "Ingen «%s» funnet i «%s»" +msgstr "Ingen «%s» funnet i «%s»" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1496 #, 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 " +"%s: Hopper over makroekspansjon til stdout siden Info-output også sendes " "dit.\n" -#: makeinfo/makeinfo.c:1327 +#: makeinfo/makeinfo.c:1526 #, c-format msgid "Making %s file `%s' from `%s'.\n" -msgstr "Lager %s-filen «%s» fra «%s».\n" +msgstr "Lager %s-filen «%s» fra «%s».\n" -#: makeinfo/makeinfo.c:1358 +#: makeinfo/makeinfo.c:1561 #, 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:1377 +#: makeinfo/makeinfo.c:1583 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" -"%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å " +"%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å " "bevare.\n" -#. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1627 #, 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 å " +"%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å " "bevare.\n" -#: makeinfo/makeinfo.c:1635 +#: makeinfo/makeinfo.c:1853 #, c-format msgid "Unknown command `%s'" -msgstr "Ukjent kommando «%s»" +msgstr "Ukjent kommando «%s»" -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1875 #, 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" +msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s" -#: makeinfo/makeinfo.c:1838 +#: makeinfo/makeinfo.c:2068 #, c-format msgid "%c%s expected `{...}'" -msgstr "%c%s forventet «{...}»" +msgstr "%c%s forventet «{...}»" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:2098 msgid "Unmatched }" msgstr "Umatchet }" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:2148 msgid "NO_NAME!" msgstr "INTET_NAVN!" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:2169 #, c-format msgid "%c%s missing close brace" -msgstr "%c%s mangler avsluttende krøllparentes" +msgstr "%c%s mangler avsluttende krøllparentes" + +#: makeinfo/makeinfo.c:2958 +msgid "First argument to cross-reference may not be empty" +msgstr "Det første argumentet til kryssreferanser kan ikke være tomt" -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 +#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340 msgid "see " msgstr "se " -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:3018 msgid "See " msgstr "Se " -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:3164 #, c-format msgid "`.' or `,' must follow cross reference, not %c" -msgstr "«.» eller «,» må følge kryssreferanser, ikke %c" +msgstr "«.» eller «,» må følge kryssreferanser, ikke %c" -#: makeinfo/makeinfo.c:3026 +#: makeinfo/makeinfo.c:3212 +msgid "First argument to @inforef may not be empty" +msgstr "Det første argumentet til @inforef kan ikke være tomt" + +#: makeinfo/makeinfo.c:3427 #, c-format -msgid "No .png or .jpg for `%s'" -msgstr "Ingen .png eller .jpg for «%s»" +msgid "@image file `%s' (for HTML) not readable: %s" +msgstr "@image-fil «%s» (for HTML) er uleselig: %s" -#: makeinfo/makeinfo.c:3063 +#: makeinfo/makeinfo.c:3440 #, c-format -msgid "@image file `%s' unreadable: %s" -msgstr "@image-fil «%s» er uleselig: %s" +msgid "No `%s.png' or `.jpg', and no extension supplied" +msgstr "Ingen «%s.png» eller «.jpg» og ingen filutvidelse oppgitt" + +#: makeinfo/makeinfo.c:3490 +#, c-format +msgid "@image file `%s' (for text) unreadable: %s" +msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s" -#: makeinfo/makeinfo.c:3070 +#: makeinfo/makeinfo.c:3497 msgid "@image missing filename argument" msgstr "@image mangler filnavn" -#: makeinfo/makeinfo.c:3259 +#: makeinfo/makeinfo.c:3690 #, c-format msgid "{No value for `%s'}" -msgstr "{Ingen verdi for «%s»}" +msgstr "{Ingen verdi for «%s»}" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3744 #, c-format msgid "%c%s requires a name" msgstr "%c%s krever et navn" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3850 #, c-format msgid "Reached eof before matching @end %s" -msgstr "Traff slutt-på-filen før matchende @end %s" +msgstr "Traff slutt-på-filen før matchende @end %s" + +#: makeinfo/makeinfo.c:4081 +#, c-format +msgid "`%.40s...' is too long for expansion; not expanded" +msgstr "" -#: makeinfo/multi.c:208 +#: makeinfo/multi.c:226 msgid "Missing } in @multitable template" -msgstr "Manglende «}» i @multitable-mal" +msgstr "Manglende «}» i @multitable-mal" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:302 #, c-format msgid "ignoring stray text `%s' after @multitable" -msgstr "ignorerer løs tekst «%s» etter @multitable" +msgstr "ignorerer løs tekst «%s» etter @multitable" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:375 #, c-format msgid "Too many columns in multitable item (max %d)" msgstr "For mange kolonner i multitabellrad (maks %d)" -#: makeinfo/multi.c:401 +#: makeinfo/multi.c:426 #, c-format msgid "Cannot select column #%d in multitable" msgstr "Kan ikke velge kolonne #%d i multitabell" -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:529 msgid "ignoring @tab outside of multitable" msgstr "ignorerer @tab utenfor multitabell" -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:565 msgid "** Multicolumn output from last row:\n" msgstr "** Multikolonne-output fra siste rad:\n" -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:568 #, c-format msgid "* column #%d: output = %s\n" msgstr "* kolonne #%d output = %s\n" -#: makeinfo/node.c:250 +#: makeinfo/node.c:276 #, c-format msgid "Node `%s' previously defined at line %d" -msgstr "Noden «%s» er tidligere definert ved linje %d" +msgstr "Noden «%s» er tidligere definert ved linje %d" -#: makeinfo/node.c:514 +#: makeinfo/node.c:594 #, c-format msgid "Formatting node %s...\n" msgstr "Skriver noden %s...\n" -#: makeinfo/node.c:559 +#: makeinfo/node.c:655 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" -msgstr "Noden «%s» krever en inndelingskommando (f.eks. %c%s)" +msgstr "Noden «%s» krever en inndelingskommando (f.eks. %c%s)" -#: makeinfo/node.c:719 +#: makeinfo/node.c:815 #, c-format msgid "No node name specified for `%c%s' command" -msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen" +msgstr "Ingen nodenavn spesifisert for «%c%s»-kommandoen" + +#: makeinfo/node.c:856 makeinfo/node.c:1075 +#, c-format +msgid "Anchor `%s' and node `%s' map to the same file name" +msgstr "Ankeret «%s» og noden «%s» blir knyttet til det samme filnavnet" + +#: makeinfo/node.c:859 +msgid "This @anchor command ignored; references to it will not work" +msgstr "" +"Denne @anchor-kommandoen ble ignorert, referanser til den vil ikke virke" + +#: makeinfo/node.c:861 makeinfo/node.c:1078 +msgid "Rename this anchor or use the `--no-split' option" +msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget" -#: makeinfo/node.c:774 +#: makeinfo/node.c:891 +#, c-format +msgid "Unexpected string at end of split-HTML file `%s'" +msgstr "Uforventet streng ved slutten av splitt-HTML-fila «%s»" + +#: makeinfo/node.c:920 msgid "Node:" msgstr "Node:" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 +#: makeinfo/node.c:930 msgid "Next:" msgstr "Neste:" -#: makeinfo/node.c:793 +#: makeinfo/node.c:940 msgid "Previous:" msgstr "Forrige:" -#: makeinfo/node.c:803 +#: makeinfo/node.c:950 msgid "Up:" msgstr "Opp:" -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1072 +#, 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:1077 +msgid "@anchor command ignored; references to it will not work" +msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke" + +#: makeinfo/node.c:1277 #, c-format msgid "%s reference to nonexistent node `%s'" -msgstr "%s referanse til ikke-eksisterende node «%s»" +msgstr "%s referanse til ikke-eksisterende node «%s»" -#: makeinfo/node.c:1029 +#: makeinfo/node.c:1294 msgid "Menu" msgstr "Meny" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1296 msgid "Cross" msgstr "Kryss" -#: makeinfo/node.c:1115 +#: makeinfo/node.c:1380 #, c-format msgid "Next field of node `%s' not pointed to" -msgstr "Nestefeltet til noden «%s» er ikke pekt på" +msgstr "Nestefeltet til noden «%s» er ikke pekt på" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1383 #, c-format msgid "This node (%s) has the bad Prev" -msgstr "Denne noden (%s) har den dårlige forrigepekeren" +msgstr "Denne noden (%s) har den dårlige forrigepekeren" -#: makeinfo/node.c:1133 +#: makeinfo/node.c:1395 msgid "Prev" msgstr "forrige" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1438 #, c-format msgid "Prev field of node `%s' not pointed to" -msgstr "Forrigefeltet til noden «%s» er ikke pekt på" +msgstr "Forrigefeltet til noden «%s» er ikke pekt på" -#: makeinfo/node.c:1180 +#: makeinfo/node.c:1442 #, c-format msgid "This node (%s) has the bad Next" -msgstr "Denne noden (%s) har den dårlige nestepekeren" +msgstr "Denne noden (%s) har den dårlige nestepekeren" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1454 #, c-format msgid "`%s' has no Up field" -msgstr "«%s» har ikke et oppfelt" +msgstr "«%s» har ikke et oppfelt" -#: makeinfo/node.c:1197 +#: makeinfo/node.c:1457 msgid "Up" msgstr "opp" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1523 #, 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" +msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål" -#: makeinfo/node.c:1296 +#: makeinfo/node.c:1552 #, c-format msgid "node `%s' has been referenced %d times" -msgstr "noden «%s» har blitt referert %d ganger" +msgstr "noden «%s» har blitt referert %d ganger" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1566 #, c-format msgid "unreferenced node `%s'" -msgstr "ureferert node «%s»" +msgstr "ureferert node «%s»" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " msgstr "Vedlegg %c " -#. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" -msgstr "Intern feil (search_sectioning) «%s»!" +msgstr "Intern feil (search_sectioning) «%s»!" -#: makeinfo/sectioning.c:468 +#: makeinfo/sectioning.c:502 #, c-format msgid "%c%s is obsolete; use %c%s instead" msgstr "%c%s er avlegs; bruk %c%s i stedet" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:518 #, c-format msgid "Node with %ctop as a section already exists" msgstr "Node med %ctop som en seksjon eksisterer allerede" -#: makeinfo/sectioning.c:496 +#: makeinfo/sectioning.c:526 #, c-format msgid "Here is the %ctop node" msgstr "Her er %ctop-noden" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:543 #, c-format msgid "%ctop used before %cnode, defaulting to %s" -msgstr "%ctop brukt før %cnode, benytter %s" +msgstr "%ctop brukt før %cnode, benytter %s" -#. in case we are writing stdout -#: makeinfo/toc.c:212 makeinfo/toc.c:261 makeinfo/toc.c:262 +#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299 msgid "Table of Contents" msgstr "Innholdsfortegnelse" -#. in case we are writing stdout -#: makeinfo/toc.c:292 makeinfo/toc.c:319 makeinfo/toc.c:320 +#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367 msgid "Short Contents" msgstr "Kort innholdsfortegnelse" -#: makeinfo/toc.c:354 +#: makeinfo/toc.c:406 #, c-format msgid "%s: TOC should be here, but it was not found" -msgstr "%s: TOC burde være her, men ble ikke funnet" +msgstr "%s: TOC burde være her, men ble ikke funnet" + +#: makeinfo/xml.c:1108 +#, c-format +msgid "@image file `%s' unreadable: %s" +msgstr "@image-fil «%s» er uleselig: %s" #: util/install-info.c:151 #, c-format @@ -2261,7 +2703,7 @@ msgstr "%s: advarsel: " #: util/install-info.c:176 util/install-info.c:189 msgid "virtual memory exhausted" -msgstr "virtuelt minne uttømt" +msgstr "virtuelt minne uttømt" #: util/install-info.c:232 #, c-format @@ -2271,10 +2713,10 @@ msgstr " for %s" #: util/install-info.c:381 #, 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" +msgstr "\tPrøv «%s --help» for en komplett liste over valg.\n" #: util/install-info.c:389 -#, c-format +#, fuzzy, c-format msgid "" "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n" "\n" @@ -2308,11 +2750,8 @@ msgid "" " If you don't specify any sections, they are determined\n" " from information in the Info file itself.\n" " --version display version information and exit.\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" -"Bruksmåte: %s [VALG]... [INFOFIL [DIRFIL]]\n" +"Bruksmåte: %s [VALG]... [INFOFIL [DIRFIL]]\n" "\n" "Installere eller slette dir-innslag fra INFOFIL i Info-katalogfilen\n" "DIRFIL.\n" @@ -2321,9 +2760,9 @@ msgstr "" " --delete slette eksisterende innslag for INFOFIL fra DIRFIL;\n" " ikke sett inn noe nye innslag.\n" " --dir-file=NAVN angi filnavnet til Info-katalogfilen.\n" -" Dette er det samme som å bruke DIRFIL-argumentet.\n" +" Dette er det samme som å bruke DIRFIL-argumentet.\n" " --entry=TEKST sette inn TEKST som en Info-kataloginnslag.\n" -" TEKST bør ha form som et Info-menypunkt\n" +" TEKST bør ha form som et Info-menypunkt\n" " pluss null eller flere linjer som starter med " "whitespace.\n" " Dersom du angir mer enn et innslag, blir alle lagt " @@ -2332,7 +2771,7 @@ msgstr "" " fra informasjon i selve Infofilen.\n" " --help vise denne hjelpen og avslutte.\n" " --info-file=FIL angi Infofilen som skal installeres i katalogen.\n" -" Dette er det samme som å bruke INFOFIL-argumentet.\n" +" Dette er det samme som å bruke INFOFIL-argumentet.\n" " --info-dir=DIR det samme som --dir-file=DIR/dir.\n" " --item=TEKST det samme som --entry TEKST.\n" " Et Info-kataloginnslag er egentlig et menypunkt.\n" @@ -2347,9 +2786,9 @@ msgstr "" " --version vise programversjon og avslutte.\n" "\n" "Send bugrapporter til bug-texinfo@gnu.org,\n" -"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n" +"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n" -#: util/install-info.c:442 +#: util/install-info.c:444 #, c-format msgid "" "This is the file .../info/dir, which contains the\n" @@ -2368,121 +2807,115 @@ msgid "" "\n" "* Menu:\n" msgstr "" -"Dette er filen .../info/dir, som inneholder de øverste\n" +"Dette er filen .../info/dir, som inneholder de øverste\n" "nodene i Info-hierarkiet, kalt (dir)Top.\n" -"Første gangen du starter Info begynner du i denne noden.\n" +"Første gangen du starter Info begynner du i denne noden.\n" " \n" "%s\tDette er toppen av INFO-treet\n" "\n" " Denne katalognoden gir en meny over alle hovedemner.\n" -" Inntasting av «q» avslutter, «?» lister alle Info-kommandoene, «d» " +" Inntasting av «q» avslutter, «?» lister alle Info-kommandoene, «d» " "returner hit,\n" -" «h» gir en innføring for nybegynnere,\n" -" «mEmacs<Return>» besøker Emacs-manualen, osv.\n" +" «h» gir en innføring for nybegynnere,\n" +" «mEmacs<Return>» besøker Emacs-manualen, osv.\n" "\n" -" I Emacs kan du klikke med musknapp 2 på et menypunkt eller kryssreferanse\n" -" for å velge den.\n" +" I Emacs kan du klikke med musknapp 2 på et menypunkt eller kryssreferanse\n" +" for å velge den.\n" "\n" "* Menu:\n" -#: util/install-info.c:465 +#: util/install-info.c:467 #, 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:549 +#: util/install-info.c:551 #, c-format msgid "%s: empty file" msgstr "%s: tom fil" -#: util/install-info.c:864 util/install-info.c:904 +#: util/install-info.c:866 util/install-info.c:906 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY" -msgstr "START-INFO-DIR-ENTRY uten tilhørende END-INFO-DIR-ENTRY" +msgstr "START-INFO-DIR-ENTRY uten tilhørende END-INFO-DIR-ENTRY" -#: util/install-info.c:899 +#: util/install-info.c:901 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY" -msgstr "END-INFO-DIR-ENTRY uten tilhørende START-INFO-DIR-ENTRY" +msgstr "END-INFO-DIR-ENTRY uten tilhørende START-INFO-DIR-ENTRY" -#: util/install-info.c:1147 util/install-info.c:1157 +#: util/install-info.c:1150 util/install-info.c:1160 #, c-format msgid "%s: Specify the Info directory only once.\n" msgstr "%s: Spesifiser infokatalogen bare en gang.\n" -#: util/install-info.c:1192 +#: util/install-info.c:1195 #, c-format msgid "%s: Specify the Info file only once.\n" msgstr "%s: Spesifiser infofilen bare en gang.\n" -#: util/install-info.c:1241 +#: util/install-info.c:1244 #, c-format msgid "excess command line argument `%s'" -msgstr "overflødig argument på kommandolinjen «%s»" +msgstr "overflødig argument på kommandolinjen «%s»" -#: util/install-info.c:1245 +#: util/install-info.c:1248 msgid "No input file specified; try --help for more information." -msgstr "Ingen innfil angitt; prøv --help for mer informasjon." +msgstr "Ingen innfil angitt; prøv --help for mer informasjon." -#: util/install-info.c:1247 +#: util/install-info.c:1251 msgid "No dir file specified; try --help for more information." -msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon." +msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon." -#. No need to abort here, the original info file may not -#. have the requisite Texinfo commands. This is not -#. something an installer should have to correct (it's a -#. problem for the maintainer), and there's no need to cause -#. subsequent parts of `make install' to fail. -#: util/install-info.c:1269 +#: util/install-info.c:1273 #, c-format msgid "no info dir entry in `%s'" -msgstr "ingen info-dir-oppføring i «%s»" +msgstr "ingen info-dir-oppføring i «%s»" -#: util/install-info.c:1384 +#: util/install-info.c:1388 #, c-format msgid "menu item `%s' already exists, for file `%s'" -msgstr "menypunktet «%s» eksisterer allerede for filen «%s»" +msgstr "menypunktet «%s» eksisterer allerede for filen «%s»" -#: util/install-info.c:1407 +#: util/install-info.c:1411 #, c-format msgid "no entries found for `%s'; nothing deleted" -msgstr "fant ingen oppføringer for «%s»; ingenting slettet" +msgstr "fant ingen oppføringer for «%s»; ingenting slettet" -#: util/texindex.c:244 +#: util/texindex.c:245 msgid "display this help and exit" msgstr "vise denne hjelpen og avslutte" -#: util/texindex.c:246 +#: util/texindex.c:247 msgid "keep temporary files around after processing" msgstr "bevar midlertidige filer etter behandling" -#: util/texindex.c:248 +#: util/texindex.c:249 msgid "do not keep temporary files around after processing (default)" msgstr "ikke bevar midlertidige filer etter behandling (standard)" -#: util/texindex.c:250 +#: util/texindex.c:251 msgid "send output to FILE" msgstr "sende utdata til FILE" -#: util/texindex.c:252 +#: util/texindex.c:253 msgid "display version information and exit" msgstr "vise programversjon og avslutte" -#: util/texindex.c:263 +#: util/texindex.c:264 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" -msgstr "Bruksmåte: %s [VALG]... FIL...\n" +msgstr "Bruksmåte: %s [VALG]... FIL...\n" -#: util/texindex.c:264 +#: util/texindex.c:265 msgid "Generate a sorted index for each TeX output FILE.\n" msgstr "Generere en sortert indeks for hver TeX-outputfil.\n" -#: util/texindex.c:267 +#: util/texindex.c:268 #, 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" +"Vanligvis er FIL... angitt som «foo.%c%c» for et dokument «foo.texi».\n" -#. avoid trigraph in cat-id-tbl.c -#: util/texindex.c:269 +#: util/texindex.c:270 msgid "" "\n" "Options:\n" @@ -2490,38 +2923,35 @@ msgstr "" "\n" "Valg:\n" -#: util/texindex.c:285 -msgid "" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" -msgstr "" -"\n" -"Send bugrapporter til bug-texinfo@gnu.org,\n" -"generelle spørsmål og diskusjoner til help-texinfo@gnu.org.\n" - -#: util/texindex.c:885 util/texindex.c:919 util/texindex.c:995 -#: util/texindex.c:1023 +#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997 +#: util/texindex.c:1025 #, c-format msgid "%s: not a texinfo index file" msgstr "%s: ikke en texinfo-indeksfil" -#: util/texindex.c:980 +#: util/texindex.c:982 #, c-format msgid "failure reopening %s" -msgstr "feil ved gjenåpning av %s" +msgstr "feil ved gjenåpning av %s" -#: util/texindex.c:1222 +#: util/texindex.c:1224 #, c-format msgid "No page number in %s" msgstr "Ingen sidenummer i %s" -#: util/texindex.c:1293 +#: util/texindex.c:1295 #, 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" +msgstr "oppføring %s følger en oppføring med et annet navn" -#: util/texindex.c:1631 +#: util/texindex.c:1633 #, c-format msgid "%s; for file `%s'.\n" -msgstr "%s; for filen «%s».\n" +msgstr "%s; for filen %s.\n" + +#~ msgid "" +#~ "Email bug reports to bug-texinfo@gnu.org,\n" +#~ "general questions and discussion to help-texinfo@gnu.org." +#~ msgstr "" +#~ "Send bugrapporter til bug-texinfo@gnu.org,\n" +#~ "generelle spørsmål og diskusjoner til help-texinfo@gnu.org." diff --git a/gnu/usr.bin/texinfo/po/ru.gmo b/gnu/usr.bin/texinfo/po/ru.gmo Binary files differindex 56e0cf45d77..a7514c84bc5 100644 --- a/gnu/usr.bin/texinfo/po/ru.gmo +++ b/gnu/usr.bin/texinfo/po/ru.gmo diff --git a/gnu/usr.bin/texinfo/po/ru.po b/gnu/usr.bin/texinfo/po/ru.po index 7ffff57d5d1..e70f43db9ba 100644 --- a/gnu/usr.bin/texinfo/po/ru.po +++ b/gnu/usr.bin/texinfo/po/ru.po @@ -1,29 +1,23 @@ # ðÅÒÅ×ÏÄÙ ÓÏÏÂÝÅÎÉÊ ÄÌÑ GNU Texinfo. # Copyright (C) 1999 Free Software Foundation, Inc. -# Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>, 1999. +# Oleg S. Tihonov <ost@tatnipi.ru>, 1999, 2001, 2002 # msgid "" msgstr "" -"Project-Id-Version: texinfo 3.12n\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" -"PO-Revision-Date: 1999-08-06 18:21+04:00\n" +"Project-Id-Version: texinfo 4.1c\n" +"POT-Creation-Date: 2002-04-01 06:10-0800\n" +"PO-Revision-Date: 2002-03-26 08:35+0300\n" "Last-Translator: Oleg S. Tihonov <tihonov@ffke-campus.mipt.ru>\n" "Language-Team: Russian <ru@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=koi8-r\n" "Content-Transfer-Encoding: 8bit\n" -#. **************************************************************** -#. -#. Echo Area Movement Commands -#. -#. **************************************************************** -#: info/echo-area.c:283 info/session.c:711 +#: info/echo-area.c:283 info/session.c:712 msgid "Move forward a character" msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ×ÐÅÒÅÄ" -#. Move point backward in the node. -#: info/echo-area.c:295 info/session.c:727 +#: info/echo-area.c:295 info/session.c:728 msgid "Move backward a character" msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ÎÁÚÁÄ" @@ -35,12 +29,11 @@ msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ" msgid "Move to the end of this line" msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÓÔÒÏËÉ" -#. Move forward a word in the input line. -#: info/echo-area.c:320 info/session.c:745 +#: info/echo-area.c:320 info/session.c:746 msgid "Move forward a word" msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÏ×Ï ×ÐÅÒÅÄ" -#: info/echo-area.c:360 info/session.c:794 +#: info/echo-area.c:360 info/session.c:795 msgid "Move backward a word" msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÏ×Ï ÎÁÚÁÄ" @@ -72,8 +65,6 @@ msgstr "÷ÓÔÁ×ÉÔØ ÜÔÏÔ ÓÉÍ×ÏÌ" msgid "Insert a TAB character" msgstr "÷ÓÔÁ×ÉÔØ ÓÉÍ×ÏÌ ÔÁÂÕÌÑÃÉÉ" -#. Transpose the characters at point. If point is at the end of the line, -#. then transpose the characters before point. #: info/echo-area.c:504 msgid "Transpose characters at point" msgstr "ðÅÒÅÓÔÁ×ÉÔØ ÓÉÍ×ÏÌÙ ×ÏËÒÕÇ ÔÏÞËÉ" @@ -86,14 +77,10 @@ msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÐÏÓÌÅÄÎÉÊ ÕÎÉÞÔÏÖÅÎÎÙÊ ÔÅËÓÔ" msgid "Kill ring is empty" msgstr "ëÏÌØÃÏ ÕÎÉÞÔÏÖÅÎÉÊ ÐÕÓÔÏ" -#. If the last command was yank, or yank_pop, and the text just before -#. point is identical to the current kill item, then delete that text -#. from the line, rotate the index down, and yank back some other text. #: info/echo-area.c:575 msgid "Yank back a previous kill" msgstr "÷ÏÓÓÔÁÎÏ×ÉÔØ ÐÒÅÄÛÅÓÔ×ÕÀÝÉÊ ÕÎÉÞÔÏÖÅÎÎÙÊ ÔÅËÓÔ" -#. Delete the text from point to end of line. #: info/echo-area.c:608 msgid "Kill to the end of the line" msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ËÏÎÃÁ ÓÔÒÏËÉ" @@ -102,7 +89,6 @@ msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ËÏÎÃÁ ÓÔÒÏËÉ" msgid "Kill to the beginning of the line" msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ÎÁÞÁÌÁ ÓÔÒÏËÉ" -#. Delete from point to the end of the current word. #: info/echo-area.c:633 msgid "Kill the word following the cursor" msgstr "õÎÉÞÔÏÖÉÔØ ÓÌÅÄÕÀÝÅÅ ÓÌÏ×Ï" @@ -111,43 +97,40 @@ msgstr "õÎÉÞÔÏÖÉÔØ ÓÌÅÄÕÀÝÅÅ ÓÌÏ×Ï" msgid "Kill the word preceding the cursor" msgstr "õÎÉÞÔÏÖÉÔØ ÐÒÅÄÙÄÕÝÅÅ ÓÌÏ×Ï" -#: info/echo-area.c:871 +#: info/echo-area.c:872 info/echo-area.c:932 +msgid "No completions" +msgstr "úÁ×ÅÒÛÅÎÉÊ ÎÅÔ" + +#: info/echo-area.c:874 msgid "Not complete" msgstr "îÅ ÚÁ×ÅÒÛÅÎÏ" -#: info/echo-area.c:916 +#: info/echo-area.c:919 msgid "List possible completions" msgstr "ðÏËÁÚÁÔØ ×ÏÚÍÏÖÎÙÅ ÚÁ×ÅÒÛÅÎÉÑ" -#: info/echo-area.c:929 -msgid "No completions" -msgstr "úÁ×ÅÒÛÅÎÉÊ ÎÅÔ" - -#: info/echo-area.c:933 +#: info/echo-area.c:936 msgid "Sole completion" msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ" -#: info/echo-area.c:942 +#: info/echo-area.c:945 msgid "One completion:\n" msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ:\n" -#: info/echo-area.c:943 +#: info/echo-area.c:946 #, c-format msgid "%d completions:\n" msgstr "úÁ×ÅÒÛÅÎÉÊ: %d :\n" -#: info/echo-area.c:1089 +#: info/echo-area.c:1092 msgid "Insert completion" msgstr "÷ÓÔÁ×ÉÔØ ÚÁ×ÅÒÛÅÎÉÅ" -#: info/echo-area.c:1222 +#: info/echo-area.c:1225 msgid "Building completions..." msgstr "óÏÓÔÁ×ÌÅÎÉÅ ÚÁ×ÅÒÛÅÎÉÊ..." -#. Scroll the "other" window. If there is a window showing completions, scroll -#. that one, otherwise scroll the window which was active on entering the read -#. function. -#: info/echo-area.c:1320 +#: info/echo-area.c:1342 msgid "Scroll the completions window" msgstr "ðÒÏËÒÕÔÉÔØ ÏËÎÏ ÚÁ×ÅÒÛÅÎÉÊ" @@ -159,6 +142,10 @@ msgstr "óÎÏÓËÉ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÐÏËÁÚÁÎÙ" msgid "Show the footnotes associated with this node in another window" msgstr "ðÏËÁÚÁÔØ ÓÎÏÓËÉ, Ó×ÑÚÁÎÎÙÅ Ó ÜÔÏÊ ÎÏÄÏÊ, × ÄÒÕÇÏÍ ÏËÎÅ" +#: info/footnotes.h:26 +msgid "---------- Footnotes ----------" +msgstr "---------- óÎÏÓËÉ ----------" + #: info/indices.c:175 msgid "Look up a string in the index for this file" msgstr "îÁÊÔÉ ÓÔÒÏËÕ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÄÌÑ ÄÁÎÎÏÇÏ ÆÁÊÌÁ" @@ -214,6 +201,12 @@ msgstr "" msgid "Scanning indices of \"%s\"..." msgstr "ðÏÉÓË × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÆÁÊÌÁ \"%s\"..." +#: info/indices.c:603 +#, c-format +msgid "No available info files have \"%s\" in their indices." +msgstr "" +"îÉ ÏÄÉÎ ÉÚ info-ÆÁÊÌÏ× ÎÅ ÓÏÄÅÒÖÉÔ \"%s\" × Ó×ÏÉÈ ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ." + #: info/indices.c:632 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "" @@ -233,12 +226,12 @@ msgstr "" "\n" "* Menu: îÏÄÙ, ÞØÉ ÁÌÆÁ×ÉÔÎÙÅ ÕËÁÚÁÔÅÌÉ ÓÏÄÅÒÖÁÔ \"%s\":\n" -#: info/info.c:248 +#: info/info.c:260 info/infokey.c:884 msgid "Try --help for more information.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ --help ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n" -#: info/info.c:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 -#: util/texindex.c:336 +#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689 +#: util/install-info.c:1224 util/texindex.c:338 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -252,32 +245,40 @@ msgstr "" "äÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÄÒÏÂÎÏÊ ÉÎÆÏÒÍÁÃÉÉ Ï ×ÏÚÍÏÖÎÏÓÔÉ ÒÁÓÐÒÏÓÔÒÁÎÅÎÉÑ ÓÍÏÔÒÉÔÅ\n" "ÆÁÊÌ COPYING.\n" -#: info/info.c:461 +#: info/info.c:462 #, c-format msgid "no index entries found for `%s'\n" msgstr "ÄÌÑ `%s' ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ × ÉÍÅÎÎÏÍ ÕËÁÚÁÔÅÌÅ\n" -#: info/info.c:530 -#, fuzzy, c-format +#: info/info.c:555 +msgid " -b, --speech-friendly be friendly to speech synthesizers.\n" +msgstr "" +" -b, --speech-friendly ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ, ÕÄÏÂÎÏÍ ÄÌÑ ÓÉÎÔÅÚÁÔÏÒÏ× " +"ÒÅÞÉ.\n" + +#: info/info.c:562 +#, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" "\n" "Read documentation in Info format.\n" "\n" "Options:\n" -" --apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n" -" --directory=DIR add DIR to INFOPATH.\n" -" --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" --file=FILENAME specify Info file to visit.\n" -" --help display this help and exit.\n" -" --index-search=STRING go to node pointed by index entry STRING.\n" -" --node=NODENAME specify nodes in first visited Info file.\n" -" --output=FILENAME output selected nodes to FILENAME.\n" -" --restore=FILENAME read initial keystrokes from FILENAME.\n" -" --show-options, --usage go to command-line options node.\n" -" --subnodes recursively output menu items.\n" -"%s --vi-keys use vi-like and less-like key bindings.\n" -" --version display version information and exit.\n" +" --apropos=STRING look up STRING in all indices of all " +"manuals.\n" +" -d, --directory=DIR add DIR to INFOPATH.\n" +" --dribble=FILENAME remember user keystrokes in FILENAME.\n" +" -f, --file=FILENAME specify Info file to visit.\n" +" -h, --help display this help and exit.\n" +" --index-search=STRING go to node pointed by index entry STRING.\n" +" -n, --node=NODENAME specify nodes in first visited Info file.\n" +" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -R, --raw-escapes don't remove ANSI escapes from man pages.\n" +" --restore=FILENAME read initial keystrokes from FILENAME.\n" +" -O, --show-options, --usage go to command-line options node.\n" +"%s --subnodes recursively output menu items.\n" +" --vi-keys use vi-like and less-like key bindings.\n" +" --version display version information and exit.\n" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" @@ -291,38 +292,38 @@ msgid "" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" " info -f ./foo.info show file ./foo.info, not searching dir\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [ðõîëô-íåîà...]\n" "\n" "ðÏÚ×ÏÌÑÅÔ ÐÒÏÓÍÁÔÒÉ×ÁÔØ ÄÏËÕÍÅÎÔÁÃÉÀ × ÆÏÒÍÁÔÅ Info.\n" "\n" "ëÌÀÞÉ:\n" -"--directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë INFOPATH.\n" -"--dribble=æáêì ÚÁÐÉÓÁÔØ ××ÏÄÉÍÙÅ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÓÉÍ×ÏÌÙ × " -"æáêì.\n" -"--file=æáêì ÐÒÏÓÍÏÔÒÅÔØ ÚÁÄÁÎÎÙÊ æáêì.\n" -"--help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n" -"--index-search=óôòïëá ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÎÁ ËÏÔÏÒÕÀ ÓÓÙÌÁÅÔÓÑ ÚÁÄÁÎÎÏÅ\n" -" óôòïëïê ×ÈÏÖÄÅÎÉÅ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ.\n" -"--node=îïäá ÎÁÞÁÔØ ÐÒÏÓÍÏÔÒ Ó ÚÁÄÁÎÎÏÊ îïäù.\n" -"--output=æáêì ÚÁÐÉÓÁÔØ ×ÙÂÒÁÎÎÙÅ ÎÏÄÙ × æáêì.\n" -"--restore=æáêì ÓÞÉÔÁÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÎÁÖÁÔÙÈ ËÌÁ×ÉÛ ÉÚ " +" --apropos=ôåíá ÉÓËÁÔØ ôåíõ ×Ï ×ÓÅÈ ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ\n" +" ×ÓÅÈ ÒÕËÏ×ÏÄÓÔ×.\n" +" -d, --directory=ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç Ë INFOPATH.\n" +" --dribble=æáêì ÚÁÐÉÓÁÔØ ××ÏÄÉÍÙÅ ÐÏÌØÚÏ×ÁÔÅÌÅÍ ÚÎÁËÉ × æáêì.\n" +" -f, --file=æáêì ÐÒÏÓÍÏÔÒÅÔØ ÚÁÄÁÎÎÙÊ æáêì.\n" +" -h, --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n" +" --index-search=óôòïëá ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÎÁ ËÏÔÏÒÕÀ ÓÓÙÌÁÅÔÓÑ " +"ÚÁÄÁÎÎÏÅ\n" +" óôòïëïê ×ÈÏÖÄÅÎÉÅ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ.\n" +" -n, --node=îïäá ÎÁÞÁÔØ ÐÒÏÓÍÏÔÒ Ó ÚÁÄÁÎÎÏÊ îïäù.\n" +" -o, --output=æáêì ÚÁÐÉÓÁÔØ ×ÙÂÒÁÎÎÙÅ ÎÏÄÙ × æáêì.\n" +" -R, --raw-escapes ÎÅ ÕÄÁÌÑÔØ escape-ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔÉ ÉÚ ÓÔÒÁÎÉà " +"man.\n" +" --restore=æáêì ÐÒÏÞÉÔÁÔØ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ÎÁÖÁÔÙÈ ËÌÁ×ÉÛ ÉÚ " "æáêìá.\n" -"--show-options, --usage ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ ËÏÍÁÎÄÎÏÊ " +" -O, --show-options, --usage ÐÅÒÅÊÔÉ Ë ÎÏÄÅ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ ËÏÍÁÎÄÎÏÊ " "ÓÔÒÏËÉ.\n" -"--subnodes ÒÅËÕÒÓÉ×ÎÏ ×Ù×ÏÄÉÔØ ÐÕÎËÔÙ ÍÅÎÀ.\n" -"%s --vi-keys ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÉ×ÑÚËÉ ËÌÁ×ÉÛ ËÁË × vi É " -"less.\n" -"--version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n" +"%s --subnodes ÒÅËÕÒÓÉ×ÎÏ ×Ù×ÏÄÉÔØ ÐÕÎËÔÙ ÍÅÎÀ.\n" +" --vi-keys ÉÓÐÏÌØÚÏ×ÁÔØ ÐÒÉ×ÑÚËÉ ËÌÁ×ÉÛ ËÁË × vi É less.\n" +" --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n" "\n" -"ðÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ, ÎÅ Ñ×ÌÑÀÝÉÊÓÑ ËÌÀÞÏÍ, ÉÍÑ ÎÁÞÁÌØÎÏÇÏ ÐÕÎËÔÁ ÍÅÎÀ; ÏÎ\n" -"ÉÝÅÔÓÑ ×Ï ×ÓÅÈ ÆÁÊÌÁÈ `dir' × INFOPATH. åÓÌÉ ÏÎ ÎÅ ÎÁÊÄÅÎ, info\n" -"ÏÂßÅÄÉÎÑÅÔ ×ÓÅ ÆÁÊÌÙ `dir' É ÐÏËÁÚÙ×ÁÅÔ ÒÅÚÕÌØÔÁÔ. ÷ÓÅ ÏÓÔÁÌØÎÙÅ\n" -"ÁÒÇÕÍÅÎÔÙ ÒÁÓÓÍÁÔÒÉ×ÁÀÔÓÑ ËÁË ÉÍÅÎÁ ÐÕÎËÔÏ× ÍÅÎÀ ÏÔÎÏÓÉÔÅÌØÎÏ ÐÅÒ×ÏÊ\n" -"ÐÏÓÅÝÅÎÎÏÊ ÎÏÄÙ.\n" +"ðÅÒ×ÙÊ ÎÅ Ñ×ÌÑÀÝÉÊÓÑ ËÌÀÞÏÍ ÁÒÇÕÍÅÎÔ, ÅÓÌÉ ÏÎ ÅÓÔØ, ÚÁÄÁÅÔ ÉÍÑ\n" +"ÎÁÞÁÌØÎÏÇÏ ÐÕÎËÔÁ ÍÅÎÀ; ÏÎ ÉÝÅÔÓÑ ×Ï ×ÓÅÈ ÆÁÊÌÁÈ `dir' × INFOPATH.\n" +"åÓÌÉ ÏÎ ÎÅ ÎÁÊÄÅÎ, info ÏÂßÅÄÉÎÑÅÔ ×ÓÅ ÆÁÊÌÙ `dir' É ÐÏËÁÚÙ×ÁÅÔ\n" +"ÒÅÚÕÌØÔÁÔ. ÷ÓÅ ÏÓÔÁÌØÎÙÅ ÁÒÇÕÍÅÎÔÙ ÒÁÓÓÍÁÔÒÉ×ÁÀÔÓÑ ËÁË ÉÍÅÎÁ ÐÕÎËÔÏ×\n" +"ÍÅÎÀ ÏÔÎÏÓÉÔÅÌØÎÏ ÐÅÒ×ÏÊ ÐÏÓÅÝÅÎÎÏÊ ÎÏÄÙ.\n" "\n" "ðÒÉÍÅÒÙ:\n" " info ÐÏËÁÚÁÔØ ÍÅÎÀ ËÁÔÁÌÏÇÁ ×ÅÒÈÎÅÇÏ ÕÒÏ×ÎÑ\n" @@ -331,228 +332,376 @@ msgstr "" " info emacs buffers ÎÁÞÁÔØ Ó ÎÏÄÙ buffers × ÒÕËÏ×ÏÄÓÔ×Å emacs\n" " info --show-options emacs ÎÁÞÁÔØ Ó ÎÏÄÙ, ÏÐÉÓÙ×ÁÀÝÅÊ ËÌÀÞÉ emacs\n" " info -f ./foo.info ÐÏËÁÚÁÔØ ÆÁÊÌ ./foo.info, ÎÅ ÉÓËÁÔØ dir\n" + +#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474 +#: util/install-info.c:421 util/texindex.c:286 +msgid "" "\n" -"ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ bug-texinfo@gnu.org,\n" +"Email bug reports to bug-texinfo@gnu.org,\n" +"general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" +msgstr "" +"\n" +"ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ bug-texinfo@gnu.org,\n" "ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ help-texinfo@gnu.org.\n" +"äÏÍÁÛÎÁÑ ÓÔÒÁÎÉÃÁ Texinfo: http://www.gnu.org/software/texinfo/" -#: info/info.c:604 -#, fuzzy, c-format +#: info/info.c:632 +#, c-format msgid "Cannot find node `%s'." -msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÎÏÄÕ `%s'" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `%s'." -#: info/info.c:605 -#, fuzzy, c-format +#: info/info.c:633 +#, c-format msgid "Cannot find node `(%s)%s'." -msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÎÏÄÕ `%s'" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `(%s)%s'." -#: info/info.c:606 -#, fuzzy +#: info/info.c:634 msgid "Cannot find a window!" -msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÔÏÑÎÎÏÅ ÏËÎÏ" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÏËÎÏ!" -#: info/info.c:607 +#: info/info.c:635 msgid "Point doesn't appear within this window's node!" -msgstr "" +msgstr "ôÏÞËÁ ÎÁÈÏÄÉÔÓÑ ×ÎÅ ÎÏÄÙ ÜÔÏÇÏ ÏËÎÁ!" -#: info/info.c:608 -#, fuzzy +#: info/info.c:636 msgid "Cannot delete the last window." -msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÔÏÑÎÎÏÅ ÏËÎÏ" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÅÅ ÏËÎÏ." -#: info/info.c:609 -#, fuzzy +#: info/info.c:637 msgid "No menu in this node." -msgstr "÷ ÎÏÄÅ \"%s\" ÎÅÔ ÍÅÎÀ." +msgstr "÷ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÍÅÎÀ." -#: info/info.c:610 -#, fuzzy +#: info/info.c:638 msgid "No footnotes in this node." msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË." -#: info/info.c:611 +#: info/info.c:639 msgid "No cross references in this node." msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË." -#: info/info.c:612 -#, fuzzy, c-format +#: info/info.c:640 +#, c-format msgid "No `%s' pointer for this node." -msgstr "÷ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌËÉ \"óÌÅÄÕÀÝÁÑ\"." +msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `%s'." -#: info/info.c:613 +#: info/info.c:641 #, c-format msgid "Unknown Info command `%c'; try `?' for help." -msgstr "" +msgstr "ëÏÍÁÎÄÁ Info `%c' ÎÅÉÚ×ÅÓÔÎÁ; ÐÏÐÒÏÂÕÊÔÅ `?' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÒÁ×ËÉ." -#: info/info.c:614 +#: info/info.c:642 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." msgstr "" +"ôÅÒÍÉÎÁÌ ÔÉÐÁ `%s' ÎÅ ÏÂÌÁÄÁÅÔ ÄÏÓÔÁÔÏÞÎÙÍÉ ×ÏÚÍÏÖÎÏÓÔÑÍÉ ÄÌÑ ÚÁÐÕÓËÁ Info." -#: info/info.c:615 -#, fuzzy +#: info/info.c:643 msgid "You are already at the last page of this node." -msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÎÏÄÙ" +msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ." -#: info/info.c:616 -#, fuzzy +#: info/info.c:644 msgid "You are already at the first page of this node." -msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÎÏÄÙ" +msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ." -#: info/info.c:617 +#: info/info.c:645 msgid "Only one window." -msgstr "" +msgstr "ôÏÌØËÏ ÏÄÎÏ ÏËÎÏ." -#: info/info.c:618 +#: info/info.c:646 msgid "Resulting window would be too small." -msgstr "" +msgstr "ðÏÌÕÞÉ×ÛÅÅÓÑ ÏËÎÏ ÂÙÌÏ ÂÙ ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÍ." -#: info/info.c:619 +#: info/info.c:647 msgid "Not enough room for a help window, please delete a window." msgstr "" +"îÅ È×ÁÔÁÅÔ ÍÅÓÔÁ ÄÌÑ ÓÐÒÁ×ÏÞÎÏÇÏ ÏËÎÁ, ÐÏÖÁÌÕÊÓÔÁ, ÕÄÁÌÉÔÅ ËÁËÏÅ-ÎÉÂÕÄØ ÏËÎÏ." -#: info/infodoc.c:45 -msgid "Basic Commands in Info Windows\n" -msgstr "ïÓÎÏ×ÎÙÅ ËÏÍÁÎÄÙ × ÏËÎÁÈ Info\n" - -#: info/infodoc.c:46 -msgid "******************************\n" +#: info/infodoc.c:45 info/infodoc.c:94 +msgid "" +"Basic Commands in Info Windows\n" +"******************************\n" msgstr "" +"ïÓÎÏ×ÎÙÅ ËÏÍÁÎÄÙ × ÏËÎÁÈ Info\n" +"******************************\n" #: info/infodoc.c:48 -#, c-format -msgid " %-10s Quit this help.\n" -msgstr " %-10s ðÏËÉÎÕÔØ ÜÔÕ ÓÐÒÁ×ËÕ.\n" +msgid "\\%-10[quit-help] Quit this help.\n" +msgstr " %-10[quit-help] ðÏËÉÎÕÔØ ÜÔÕ ÓÐÒÁ×ËÕ.\n" #: info/infodoc.c:49 -#, c-format -msgid " %-10s Quit Info altogether.\n" -msgstr " %-10s ðÏËÉÎÕÔØ ÔÁËÖÅ Info.\n" +msgid "\\%-10[quit] Quit Info altogether.\n" +msgstr " %-10[quit] ðÏËÉÎÕÔØ ÔÁËÖÅ Info.\n" #: info/infodoc.c:50 -#, c-format -msgid " %-10s Invoke the Info tutorial.\n" -msgstr " %-10s ÷ÙÚ×ÁÔØ ÏÂÕÞÁÀÝÅÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n" - -#: info/infodoc.c:52 -msgid "Moving within a node:\n" -msgstr "ðÅÒÅÍÅÝÅÎÉÅ ×ÎÕÔÒÉ ÎÏÄÙ:\n" +msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" +msgstr " %-10[get-info-help-node] ÷ÙÚ×ÁÔØ ÏÂÕÞÁÀÝÅÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n" -#: info/infodoc.c:53 -msgid "---------------------\n" +#: info/infodoc.c:52 info/infodoc.c:101 +msgid "" +"Selecting other nodes:\n" +"----------------------\n" msgstr "" +"÷ÙÂÏÒ ÄÒÕÇÏÊ ÎÏÄÙ:\n" +"------------------\n" #: info/infodoc.c:54 -#, c-format -msgid " %-10s Scroll forward a page.\n" -msgstr " %-10s ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n" +msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" +msgstr " %-10[next-node] ðÅÒÅÊÔÉ Ë \"ÓÌÅÄÕÀÝÅÊ\" ÎÏÄÅ.\n" #: info/infodoc.c:55 -#, c-format -msgid " %-10s Scroll backward a page.\n" -msgstr " %-10s ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n" +msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" +msgstr " %-10[prev-node] ðÅÒÅÊÔÉ Ë \"ÐÒÅÄÙÄÕÝÅÊ\" ÎÏÄÅ.\n" #: info/infodoc.c:56 -#, c-format -msgid " %-10s Go to the beginning of this node.\n" -msgstr " %-10s ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n" +msgid "\\%-10[up-node] Move \"up\" from this node.\n" +msgstr " %-10[up-node] ðÅÒÅÊÔÉ Ë ÎÏÄÅ \"××ÅÒÈ\".\n" #: info/infodoc.c:57 -#, c-format -msgid " %-10s Go to the end of this node.\n" -msgstr " %-10s ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n" - -#: info/infodoc.c:58 -#, c-format -msgid " %-10s Scroll forward 1 line.\n" -msgstr " %-10s ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n" +msgid "" +"\\%-10[menu-item] Pick menu item specified by name.\n" +" Picking a menu item causes another node to be selected.\n" +msgstr "" +"\\%-10[menu-item] ðÅÒÅÊÔÉ Ë ÐÕÎËÔÕ ÍÅÎÀ, ÚÁÄÁ×ÁÅÍÏÍÕ ÐÏ ÉÍÅÎÉ.\n" +" ðÒÉ ÐÅÒÅÈÏÄÅ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ ×ÙÂÉÒÁÅÔÓÑ ÄÒÕÇÁÑ ÎÏÄÁ.\n" #: info/infodoc.c:59 -#, c-format -msgid " %-10s Scroll backward 1 line.\n" -msgstr " %-10s ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n" +msgid "" +"\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n" +msgstr " %-10[xref-item] ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ. óÞÉÔÙ×ÁÅÔ ÉÍÑ ÓÓÙÌËÉ.\n" + +#: info/infodoc.c:60 +msgid "\\%-10[history-node] Move to the last node seen in this window.\n" +msgstr " %-10[history-node] ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÜÔÏÍ ÏËÎÅ.\n" #: info/infodoc.c:61 -msgid "Selecting other nodes:\n" -msgstr "÷ÙÂÏÒ ÄÒÕÇÏÊ ÎÏÄÙ:\n" +msgid "" +"\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n" +msgstr "" +" %-10[move-to-next-xref] ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ " +"ÎÏÄÅ.\n" #: info/infodoc.c:62 -msgid "----------------------\n" +msgid "" +"\\%-10[move-to-prev-xref] Skip to previous hypertext link within this " +"node.\n" msgstr "" +" %-10[move-to-prev-xref] ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ " +"ÎÏÄÅ.\n" #: info/infodoc.c:63 -#, fuzzy, c-format -msgid " %-10s Move to the `next' node of this node.\n" -msgstr " %-10s ðÅÒÅÊÔÉ Ë \"ÓÌÅÄÕÀÝÅÊ\" ÎÏÄÅ.\n" +msgid "" +"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" +msgstr "" +" %-10[select-reference-this-line] ðÅÒÅÊÔÉ ÐÏ ÇÉÐÅÒÓÓÙÌËÅ ÐÏÄ ËÕÒÓÏÒÏÍ.\n" #: info/infodoc.c:64 -#, fuzzy, c-format -msgid " %-10s Move to the `previous' node of this node.\n" -msgstr " %-10s ðÅÒÅÊÔÉ Ë \"ÐÒÅÄÙÄÕÝÅÊ\" ÎÏÄÅ.\n" +msgid "" +"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" +"node] (DIR)'.\n" +msgstr " %-10[dir-node] ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÎÏÄÅ. üË×É×ÁÌÅÎÔÎÏ `g (DIR)'.\n" #: info/infodoc.c:65 -#, fuzzy, c-format +msgid "" +"\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node] Top'.\n" +msgstr " %-10[top-node] ðÅÒÅÊÔÉ Ë ÎÏÄÅ Top. üË×É×ÁÌÅÎÔÎÏ `g Top'.\n" + +#: info/infodoc.c:67 info/infodoc.c:115 +msgid "" +"Moving within a node:\n" +"---------------------\n" +msgstr "" +"ðÅÒÅÍÅÝÅÎÉÅ ×ÎÕÔÒÉ ÎÏÄÙ:\n" +"------------------------\n" + +#: info/infodoc.c:69 +msgid "\\%-10[scroll-forward] Scroll forward a page.\n" +msgstr " %-10[scroll-forward] ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n" + +#: info/infodoc.c:70 +msgid "\\%-10[scroll-backward] Scroll backward a page.\n" +msgstr " %-10[scroll-backward] ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n" + +#: info/infodoc.c:71 +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" +msgstr " %-10[beginning-of-node] ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n" + +#: info/infodoc.c:72 +msgid "\\%-10[end-of-node] Go to the end of this node.\n" +msgstr " %-10[end-of-node] ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n" + +#: info/infodoc.c:73 +msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" +msgstr " %-10[scroll-forward] ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n" + +#: info/infodoc.c:74 +msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" +msgstr " %-10[scroll-backward] ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n" + +#: info/infodoc.c:76 info/infodoc.c:124 +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "" +"äÒÕÇÉÅ ËÏÍÁÎÄÙ:\n" +"---------------\n" + +#: info/infodoc.c:78 +msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" +msgstr "" +" %-10[menu-digit] ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ.\n" + +#: info/infodoc.c:79 +msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" +msgstr " %-10[last-menu-item] ÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ\n" + +#: info/infodoc.c:80 +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] éÓËÁÔØ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÁÌÆÁ×ÉÔÎÙÈ ÕËÁÚÁÔÅÌÑÈ\n" +" Info-ÆÁÊÌÁ É ×ÙÂÒÁÔØ ÎÏÄÕ ÐÏ ÐÅÒ×ÏÊ ÎÁÊÄÅÎÎÏÊ ÓÓÙÌËÅ.\n" + +#: info/infodoc.c:82 +msgid "" +"\\%-10[goto-node] Move to node specified by name.\n" +" You may include a filename as well, as in (FILENAME)NODENAME.\n" +msgstr "" +"\\%-10[goto-node] ðÅÒÅÊÔÉ Ë ÎÏÄÅ, ÚÁÄÁÎÎÏÊ ÐÏ ÉÍÅÎÉ.\n" +" ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n" + +#: info/infodoc.c:84 +msgid "" +"\\%-10[search] Search forward for a specified string\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" +"\\%-10[search] éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ É ÏÓÔÁÎÏ×ÉÔØÓÑ " +"×\n" +" ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n" + +#: info/infodoc.c:86 +msgid "" +"\\%-10[search-backward] Search backward for a specified string\n" +" and select the node in which the previous occurrence is " +"found.\n" +msgstr "" +"\\%-10[search-backward] éÓËÁÔØ ÕËÁÚÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ ×\n" +" ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n" + +#: info/infodoc.c:97 +#, c-format +msgid " %-10s Quit this help.\n" +msgstr " %-10s ðÏËÉÎÕÔØ ÜÔÕ ÓÐÒÁ×ËÕ.\n" + +#: info/infodoc.c:98 +#, c-format +msgid " %-10s Quit Info altogether.\n" +msgstr " %-10s ðÏËÉÎÕÔØ ÔÁËÖÅ Info.\n" + +#: info/infodoc.c:99 +#, c-format +msgid " %-10s Invoke the Info tutorial.\n" +msgstr " %-10s ÷ÙÚ×ÁÔØ ÏÂÕÞÁÀÝÅÅ ÒÕËÏ×ÏÄÓÔ×Ï.\n" + +#: info/infodoc.c:103 +#, c-format +msgid " %-10s Move to the `next' node of this node.\n" +msgstr " %-10s ðÅÒÅÊÔÉ Ë `ÓÌÅÄÕÀÝÅÊ' ÎÏÄÅ.\n" + +#: info/infodoc.c:104 +#, c-format +msgid " %-10s Move to the `previous' node of this node.\n" +msgstr " %-10s ðÅÒÅÊÔÉ Ë `ÐÒÅÄÙÄÕÝÅÊ' ÎÏÄÅ.\n" + +#: info/infodoc.c:105 +#, c-format msgid " %-10s Move `up' from this node.\n" -msgstr " %-10s ðÅÒÅÊÔÉ Ë ÎÏÄÅ \"××ÅÒÈ\".\n" +msgstr " %-10s ðÅÒÅÊÔÉ Ë ÎÏÄÅ `××ÅÒÈ'.\n" -#: info/infodoc.c:66 +#: info/infodoc.c:106 #, c-format msgid " %-10s Pick menu item specified by name.\n" msgstr " %-10s ðÅÒÅÊÔÉ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ.\n" -#: info/infodoc.c:67 +#: info/infodoc.c:107 msgid " Picking a menu item causes another node to be selected.\n" msgstr "" " ðÒÉ ÐÅÒÅÈÏÄÅ Ë ÚÁÄÁÎÎÏÍÕ ÐÕÎËÔÕ ÍÅÎÀ ×ÙÂÉÒÁÅÔÓÑ ÄÒÕÇÁÑ ÎÏÄÁ.\n" -#: info/infodoc.c:68 +#: info/infodoc.c:108 #, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" msgstr " %-10s ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ. óÞÉÔÙ×ÁÅÔ ÉÍÑ ÓÓÙÌËÉ.\n" -#: info/infodoc.c:69 +#: info/infodoc.c:109 #, c-format msgid " %-10s Move to the last node seen in this window.\n" msgstr " %-10s ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÜÔÏÍ ÏËÎÅ.\n" -#: info/infodoc.c:70 +#: info/infodoc.c:110 #, c-format msgid " %-10s Skip to next hypertext link within this node.\n" msgstr " %-10s ðÅÒÅÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÇÉÐÅÒÓÓÙÌËÅ × ÜÔÏÊ ÎÏÄÅ.\n" -#: info/infodoc.c:71 +#: info/infodoc.c:111 #, c-format msgid " %-10s Follow the hypertext link under cursor.\n" msgstr " %-10s ðÅÒÅÊÔÉ ÐÏ ÇÉÐÅÒÓÓÙÌËÅ ÐÏÄ ËÕÒÓÏÒÏÍ.\n" -#: info/infodoc.c:72 +#: info/infodoc.c:112 #, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" msgstr " %-10s ðÅÒÅÊÔÉ Ë ËÏÒÎÅ×ÏÊ ÎÏÄÅ. üË×É×ÁÌÅÎÔÎÏ `g (DIR)'.\n" -#: info/infodoc.c:73 +#: info/infodoc.c:113 #, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" msgstr " %-10s ðÅÒÅÊÔÉ Ë ÎÏÄÅ Top. üË×É×ÁÌÅÎÔÎÏ `g Top'.\n" -#: info/infodoc.c:75 -msgid "Other commands:\n" -msgstr "äÒÕÇÉÅ ËÏÍÁÎÄÙ:\n" +#: info/infodoc.c:117 +#, c-format +msgid " %-10s Scroll forward a page.\n" +msgstr " %-10s ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n" + +#: info/infodoc.c:118 +#, c-format +msgid " %-10s Scroll backward a page.\n" +msgstr " %-10s ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n" -#: info/infodoc.c:76 -msgid "---------------\n" -msgstr "" +#: info/infodoc.c:119 +#, c-format +msgid " %-10s Go to the beginning of this node.\n" +msgstr " %-10s ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÜÔÏÊ ÎÏÄÙ.\n" -#: info/infodoc.c:77 +#: info/infodoc.c:120 +#, c-format +msgid " %-10s Go to the end of this node.\n" +msgstr " %-10s ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÜÔÏÊ ÎÏÄÙ.\n" + +#: info/infodoc.c:121 +#, c-format +msgid " %-10s Scroll forward 1 line.\n" +msgstr " %-10s ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ×ÐÅÒÅÄ.\n" + +#: info/infodoc.c:122 +#, c-format +msgid " %-10s Scroll backward 1 line.\n" +msgstr " %-10s ðÒÏËÒÕÔÉÔØ ÎÁ ÓÔÒÁÎÉÃÕ ÎÁÚÁÄ.\n" + +#: info/infodoc.c:126 #, c-format msgid " %-10s Pick first ... ninth item in node's menu.\n" msgstr " %-10s ÷ÙÂÒÁÔØ ÐÅÒ×ÙÊ ... ÄÅ×ÑÔÙÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ.\n" -#: info/infodoc.c:78 +#: info/infodoc.c:127 #, c-format msgid " %-10s Pick last item in node's menu.\n" msgstr " %-10s ÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ\n" -#: info/infodoc.c:79 +#: info/infodoc.c:128 #, c-format msgid "" " %-10s Search for a specified string in the index entries of this Info\n" @@ -560,43 +709,42 @@ msgstr "" " %-10s ðÒÏÉÚ×ÅÓÔÉ ÐÏÉÓË ÚÁÄÁÎÎÏÊ ÓÔÒÏËÉ ÓÒÅÄÉ ×ÈÏÖÄÅÎÉÊ ÉÍÅÎÎÙÈ ÕËÁÚÁÔÅÌÅÊ " "ÜÔÏÇÏ\n" -#: info/infodoc.c:80 +#: info/infodoc.c:129 msgid "" " file, and select the node referenced by the first entry " "found.\n" msgstr " Info-ÆÁÊÌÁ É ×ÙÂÒÁÔØ ÎÏÄÕ ÐÏ ÐÅÒ×ÏÊ ÎÁÊÄÅÎÎÏÊ ÓÓÙÌËÅ.\n" -#: info/infodoc.c:81 +#: info/infodoc.c:130 #, c-format msgid " %-10s Move to node specified by name.\n" msgstr " %-10s ðÅÒÅÊÔÉ Ë ÚÁÄÁÎÎÏÊ ÎÏÄÅ.\n" -#: info/infodoc.c:82 +#: info/infodoc.c:131 msgid "" " You may include a filename as well, as in (FILENAME)NODENAME.\n" msgstr " ÷Ù ÍÏÖÅÔÅ ÚÁÄÁÔØ ÔÁËÖÅ ÉÍÑ ÆÁÊÌÁ, ÎÁÐÒÉÍÅÒ (æáêì)îïäá.\n" -#: info/infodoc.c:83 +#: info/infodoc.c:132 #, c-format -msgid "" -" %-10s Search forward through this Info file for a specified string,\n" -msgstr " %-10s îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ, É ÐÅÒÅÊÔÉ Ë\n" +msgid " %-10s Search forward for a specified string,\n" +msgstr " %-10s îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ, É ÐÅÒÅÊÔÉ Ë\n" -#: info/infodoc.c:84 info/infodoc.c:86 +#: info/infodoc.c:133 info/infodoc.c:135 msgid "" " and select the node in which the next occurrence is found.\n" msgstr " ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n" -#: info/infodoc.c:85 +#: info/infodoc.c:134 #, c-format -msgid " %-10s Search backward in this Info file for a specified string,\n" -msgstr " %-10s îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÔÅËÕÝÅÍ Info-ÆÁÊÌÅ, É ÐÅÒÅÊÔÉ Ë\n" +msgid " %-10s Search backward for a specified string\n" +msgstr " %-10s îÁÊÔÉ ÚÁÄÁÎÎÕÀ ÓÔÒÏËÕ × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ, É ÐÅÒÅÊÔÉ Ë\n" -#: info/infodoc.c:258 +#: info/infodoc.c:313 msgid "The current search path is:\n" msgstr "ôÅËÕÝÉÊ ÐÕÔØ ÐÏÉÓËÁ:\n" -#: info/infodoc.c:261 +#: info/infodoc.c:316 msgid "" "Commands available in Info windows:\n" "\n" @@ -604,7 +752,7 @@ msgstr "" "ëÏÍÁÎÄÙ, ÄÏÓÔÕÐÎÙÅ × ÏËÎÁÈ Info:\n" "\n" -#: info/infodoc.c:264 +#: info/infodoc.c:319 msgid "" "Commands available in the echo area:\n" "\n" @@ -612,108 +760,277 @@ msgstr "" "ëÏÍÁÎÄÙ, ÄÏÓÔÕÐÎÙÅ × ÜÈÏ-ÏÂÌÁÓÔÉ:\n" "\n" -#: info/infodoc.c:280 +#: info/infodoc.c:340 +#, c-format msgid "" -"The following commands can only be invoked via M-x:\n" +"The following commands can only be invoked via %s:\n" "\n" msgstr "" -"óÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ ÍÏÇÕÔ ÂÙÔØ ×ÙÚ×ÁÎÙ ÔÏÌØËÏ Ó ÐÏÍÏÝØÀ M-x:\n" +"óÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ ÍÏÇÕÔ ÂÙÔØ ×ÙÚ×ÁÎÙ ÔÏÌØËÏ Ó ÐÏÍÏÝØÀ %s:\n" "\n" -#: info/infodoc.c:301 +#: info/infodoc.c:343 +msgid "" +"The following commands cannot be invoked at all:\n" +"\n" +msgstr "" +"óÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ ×ÏÏÂÝÅ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÚ×ÁÎÙ:\n" +"\n" + +#: info/infodoc.c:367 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" msgstr "" "--- éÓÐÏÌØÚÕÊÔÅ `\\[history-node]' ÉÌÉ `\\[kill-node]' ÄÌÑ ×ÙÈÏÄÁ ---\n" -#. Create or move to the help window. -#: info/infodoc.c:411 +#: info/infodoc.c:477 msgid "Display help message" msgstr "ðÏËÁÚÁÔØ ÓÐÒÁ×ËÕ" -#. Show the Info help node. This means that the "info" file is installed -#. where it can easily be found on your system. -#: info/infodoc.c:429 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" msgstr "ïÂÒÁÔÉÔØÓÑ Ë Info-ÎÏÄÅ `(info)Help'" -#: info/infodoc.c:555 +#: info/infodoc.c:638 msgid "Print documentation for KEY" msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ëìá÷éûå" -#: info/infodoc.c:568 +#: info/infodoc.c:650 #, c-format msgid "Describe key: %s" msgstr "ïÐÉÓÁÔØ ËÌÁ×ÉÛÕ: %s" -#: info/infodoc.c:577 +#: info/infodoc.c:660 #, c-format msgid "ESC %s is undefined." msgstr "ESC %s ÎÅÏÐÒÅÄÅÌÅÎÏ." -#: info/infodoc.c:594 +#: info/infodoc.c:676 info/infodoc.c:703 #, c-format msgid "%s is undefined." msgstr "%s ÎÅÏÐÒÅÄÅÌÅÎÏ." -#: info/infodoc.c:620 +#: info/infodoc.c:724 #, c-format msgid "%s is defined to %s." msgstr "%s ÐÒÉ×ÑÚÁÎÏ Ë %s." -#: info/infodoc.c:812 +#: info/infodoc.c:1151 msgid "Show what to type to execute a given command" msgstr "ðÏËÁÚÙ×ÁÅÔ, ÞÔÏ ÎÕÖÎÏ ÎÁÐÅÞÁÔÁÔØ, ÞÔÏÂÙ ×ÙÐÏÌÎÉÔØ ÄÁÎÎÕÀ ËÏÍÁÎÄÕ" -#: info/infodoc.c:816 +#: info/infodoc.c:1155 msgid "Where is command: " msgstr "ëÏÍÁÎÄÁ: " -#: info/infodoc.c:838 +#: info/infodoc.c:1177 #, c-format msgid "`%s' is not on any keys" msgstr "`%s' ÎÅ ÐÒÉ×ÑÚÁÎÁ ÎÉ Ë ËÁËÉÍ ËÌÁ×ÉÛÁÍ" -#: info/infodoc.c:844 +#: info/infodoc.c:1183 #, c-format msgid "%s can only be invoked via %s." msgstr "%s ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÁ ÔÏÌØËÏ Ó ÐÏÍÏÝØÀ %s." -#: info/infodoc.c:847 +#: info/infodoc.c:1186 #, c-format msgid "%s can be invoked via %s." msgstr "%s ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÁ Ó ÐÏÍÏÝØÀ %s." -#: info/infodoc.c:851 +#: info/infodoc.c:1190 #, c-format msgid "There is no function named `%s'" msgstr "æÕÎËÃÉÉ Ó ÉÍÅÎÅÍ `%s' ÎÅÔ" -#: info/m-x.c:69 +#: info/infokey.c:164 +msgid "incorrect number of arguments" +msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ ÁÒÇÕÍÅÎÔÏ×" + +#: info/infokey.c:194 +#, c-format +msgid "cannot open input file `%s'" +msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'" + +#: info/infokey.c:207 +#, c-format +msgid "cannot create output file `%s'" +msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'" + +#: info/infokey.c:217 +#, c-format +msgid "error writing to `%s'" +msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ × `%s'" + +#: info/infokey.c:222 +#, c-format +msgid "error closing output file `%s'" +msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'" + +#: info/infokey.c:443 +msgid "key sequence too long" +msgstr "ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÀÞÅÊ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ" + +#: info/infokey.c:521 +msgid "missing key sequence" +msgstr "ÐÒÏÐÕÝÅÎÁ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÀÞÅÊ" + +#: info/infokey.c:600 +msgid "NUL character (\\000) not permitted" +msgstr "ÚÎÁË NUL (\\000) ÎÅÄÏÐÕÓÔÉÍ" + +#: info/infokey.c:629 +#, c-format +msgid "NUL character (^%c) not permitted" +msgstr "ÚÎÁË NUL (^%c) ÎÅÄÏÐÕÓÔÉÍ" + +#: info/infokey.c:652 +msgid "missing action name" +msgstr "ÐÒÏÐÕÝÅÎÏ ÉÍÑ ÄÅÊÓÔ×ÉÑ" + +#: info/infokey.c:667 info/infokey.c:733 +msgid "section too long" +msgstr "ÒÁÚÄÅÌ ÓÌÉÛËÏÍ ×ÅÌÉË" + +#: info/infokey.c:673 +#, c-format +msgid "unknown action `%s'" +msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÄÅÊÓÔ×ÉÅ `%s'" + +#: info/infokey.c:682 +msgid "action name too long" +msgstr "ÉÍÑ ÄÅÊÓÔ×ÉÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ" + +#: info/infokey.c:694 +#, c-format +msgid "extra characters following action `%s'" +msgstr "ÌÉÛÎÉÅ ÚÎÁËÉ ÐÏÓÌÅ ÄÅÊÓÔ×ÉÑ `%s'" + +#: info/infokey.c:704 +msgid "missing variable name" +msgstr "ÐÒÏÐÕÝÅÎÏ ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ" + +#: info/infokey.c:712 +msgid "missing `=' immediately after variable name" +msgstr "ÐÒÏÐÕÝÅÎ ÚÎÁË `=' ÓÒÁÚÕ ÐÏÓÌÅ ÉÍÅÎÉ ÐÅÒÅÍÅÎÎÏÊ" + +#: info/infokey.c:719 +msgid "variable name too long" +msgstr "ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ" + +#: info/infokey.c:741 +msgid "value too long" +msgstr "ÚÎÁÞÅÎÉÅ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ" + +#: info/infokey.c:875 +#, c-format +msgid "\"%s\", line %u: " +msgstr "\"%s\", ÓÔÒÏËÁ %u: " + +#: info/infokey.c:891 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT-FILE]\n" +"\n" +"Compile infokey source file to infokey file. Reads INPUT-FILE (default\n" +"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n" +"\n" +"Options:\n" +" --output FILE output to FILE instead of $HOME/.info\n" +" --help display this help and exit.\n" +" --version display version information and exit.\n" +msgstr "" +"éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [÷èïäîïê-æáêì]\n" +"\n" +"ëÏÍÐÉÌÉÒÕÅÔ ÉÓÈÏÄÎÙÊ ÆÁÊÌ infokey × ÆÁÊÌ infokey. óÞÉÔÙ×ÁÅÔÓÑ\n" +"÷èïäîïê-æáêì (ÐÏ ÕÍÏÌÞÁÎÉÀ $HOME/.infokey) É ÚÁÐÉÓÙ×ÁÅÔ\n" +"ÓËÏÍÐÉÌÉÒÏ×ÁÎÎÙÊ ÆÁÊÌ Ó ÐÒÉ×ÑÚËÁÍÉ ËÌÁ×ÉÛ × $HOME/.info.\n" +"\n" +"ëÌÀÞÉ:\n" +" --output éíñ-æáêìá ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ ÆÁÊÌ, Á ÎÅ × $HOME/." +"info\n" +" --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ\n" +" --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ\n" + +#: info/infomap.c:1397 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too small" +msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÆÁÊÌ infokey `%s' ÉÇÎÏÒÉÒÕÅÔÓÑ - ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÊ" + +#: info/infomap.c:1400 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too big" +msgstr "îÅÐÒÁ×ÉÌØÎÙÊ ÆÁÊÌ infokey `%s' ÉÇÎÏÒÉÒÕÅÔÓÑ - ÓÌÉÛËÏÍ ÂÏÌØÛÏÊ" + +#: info/infomap.c:1413 +#, c-format +msgid "Error reading infokey file `%s' - short read" +msgstr "ïÛÉÂËÁ ÞÔÅÎÉÑ ÆÁÊÌÁ infokey `%s' - ÞÔÅÎÉÅ ÐÒÅÒ×ÁÎÏ" + +#: info/infomap.c:1431 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" +msgstr "" +"æÁÊÌ infokey `%s' ÎÅÐÒÉÅÍÌÅÍ (ÎÅ×ÅÒÎÁÑ ÓÉÇÎÁÔÕÒÁ) -- ÚÁÐÕÓÔÉÔÅ infokey, " +"ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ" + +#: info/infomap.c:1437 +#, c-format +msgid "Your infokey file `%s' is out of date -- run infokey to update it" +msgstr "æÁÊÌ infokey `%s' ÕÓÔÁÒÅÌ -- ÚÁÐÕÓÔÉÔÅ infokey, ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ" + +#: info/infomap.c:1450 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" +msgstr "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" + +#: info/infomap.c:1470 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section code) -- run infokey to update it" +msgstr "" +"æÁÊÌ infokey `%s' ÎÅÐÒÉÅÍÌÅÍ (ÎÅ×ÅÒÎÙÊ ËÏÄ ÒÁÚÄÅÌÁ) -- ÚÁÐÕÓÔÉÔÅ infokey, " +"ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ" + +#: info/infomap.c:1608 +msgid "Bad data in infokey file -- some key bindings ignored" +msgstr "" +"ðÏ×ÒÅÖÄÅÎÎÙÅ ÄÁÎÎÙÅ × ÆÁÊÌÅ infokey -- ÎÅËÏÔÏÒÙÅ ÐÒÉ×ÑÚËÉ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ" + +#: info/infomap.c:1659 +msgid "Bad data in infokey file -- some var settings ignored" +msgstr "" +"ðÏ×ÒÅÖÄÅÎÎÙÅ ÄÁÎÎÙÅ × ÆÁÊÌÅ infokey -- ÎÅËÏÔÏÒÙÅ ÕÓÔÁÎÏ×ËÉ ÐÅÒÅÍÅÎÎÙÈ " +"ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ" + +#: info/m-x.c:70 msgid "Read the name of an Info command and describe it" msgstr "óÞÉÔÁÔØ ÉÍÑ ËÏÍÁÎÄÙ Info É ÐÏËÁÚÁÔØ ÅÅ ÏÐÉÓÁÎÉÅ" -#: info/m-x.c:73 +#: info/m-x.c:74 msgid "Describe command: " msgstr "ïÐÉÓÁÔØ ËÏÍÁÎÄÕ: " -#: info/m-x.c:96 +#: info/m-x.c:97 msgid "Read a command name in the echo area and execute it" msgstr "óÞÉÔÁÔØ ÉÍÑ ËÏÍÁÎÄÙ × ÜÈÏ-ÏÂÌÁÓÔÉ É ÉÓÐÏÌÎÉÔØ ÅÅ" -#: info/m-x.c:134 +#: info/m-x.c:141 msgid "Cannot execute an `echo-area' command here." msgstr "úÄÅÓØ ÎÅÌØÚÑ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ ÜÈÏ-ÏÂÌÁÓÔÉ." -#: info/m-x.c:150 +#: info/m-x.c:157 msgid "Set the height of the displayed window" msgstr "õÓÔÁÎÏ×ÉÔØ ×ÙÓÏÔÕ ÏÔÏÂÒÁÖÁÅÍÏÇÏ ÏËÎÁ" -#: info/m-x.c:163 +#: info/m-x.c:170 #, c-format msgid "Set screen height to (%d): " msgstr "õÓÔÁÎÏ×ÉÔØ ×ÙÓÏÔÕ ÜËÒÁÎÁ ÒÁ×ÎÏÊ (%d): " -#: info/makedoc.c:132 +#: info/makedoc.c:161 info/makedoc.c:169 msgid "" " Source files groveled to make this file include:\n" "\n" @@ -721,7 +1038,7 @@ msgstr "" " üÔÏÔ ÆÁÊÌ ×ËÌÀÞÁÅÔ:\n" "\n" -#: info/makedoc.c:465 +#: info/makedoc.c:553 #, c-format msgid "Couldn't manipulate the file %s.\n" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÂÒÁÂÏÔÁÔØ ÆÁÊÌ %s.\n" @@ -758,550 +1075,515 @@ msgstr "÷ÙÂÒÁÔØ ÒÁÎÅÅ ÐÏÓÅÝÅÎÎÕÀ ÎÏÄÕ × ×ÉÄÉÍÏÍ ÏËÎÅ" msgid "Select visited node: " msgstr "÷ÙÂÒÁÔØ ÐÏÓÅÝÅÎÎÕÀ ÒÁÎÅÅ ÎÏÄÕ: " -#: info/nodemenu.c:331 info/session.c:2146 +#: info/nodemenu.c:331 info/session.c:2235 #, c-format msgid "The reference disappeared! (%s)." msgstr "óÓÙÌËÁ ÉÓÞÅÚÌÁ! (%s)." -#: info/session.c:169 -#, fuzzy, c-format +#: info/session.c:170 +#, c-format msgid "" "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] " "for menu item." msgstr "" -"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × Info ×ÅÒÓÉÉ %s. \"\\[get-help-window]\" -- ÓÐÒÁ×ËÁ, " -"\"\\[menu-item]\" ×ÙÂÉÒÁÅÔ ÐÕÎËÔ ÍÅÎÀ." +"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × Info ×ÅÒÓÉÉ %s. \\[get-help-window] -- ÓÐÒÁ×ËÁ, \\[menu-" +"item] ×ÙÂÉÒÁÅÔ ÐÕÎËÔ ÍÅÎÀ." -#. Move WINDOW's point down to the next line if possible. -#: info/session.c:642 +#: info/session.c:643 msgid "Move down to the next line" msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ ÎÉÖÅ" -#. Move WINDOW's point up to the previous line if possible. -#: info/session.c:657 +#: info/session.c:658 msgid "Move up to the previous line" msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ ×ÙÛÅ" -#. Move WINDOW's point to the end of the true line. -#: info/session.c:672 +#: info/session.c:673 msgid "Move to the end of the line" msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÓÔÒÏËÉ" -#. Move WINDOW's point to the beginning of the true line. -#: info/session.c:692 +#: info/session.c:693 msgid "Move to the start of the line" msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ" -#: info/session.c:884 makeinfo/node.c:1092 +#: info/session.c:885 makeinfo/node.c:1357 msgid "Next" msgstr "óÌÅÄÕÀÝÁÑ" -#: info/session.c:887 +#: info/session.c:888 msgid "Following Next node..." msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"óÌÅÄÕÀÝÁÑ\"..." -#: info/session.c:904 +#: info/session.c:905 msgid "Selecting first menu item..." msgstr "÷ÙÂÉÒÁÅÔÓÑ ÐÅÒ×ÙÊ ÐÕÎËÔ ÍÅÎÀ..." -#: info/session.c:915 +#: info/session.c:916 msgid "Selecting Next node..." msgstr "÷ÙÂÉÒÁÅÔÓÑ ÎÏÄÁ \"óÌÅÄÕÀÝÁÑ\"..." -#: info/session.c:985 +#: info/session.c:986 #, c-format msgid "Moving Up %d time(s), then Next." msgstr "ðÅÒÅÍÅÝÅÎÉÅ \"÷×ÅÒÈ\" %d ÒÁÚ(Á), ÚÁÔÅÍ \"óÌÅÄÕÀÝÁÑ\"." -#: info/session.c:1009 +#: info/session.c:1010 msgid "No more nodes within this document." msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÂÏÌØÛÅ ÎÅÔ ÎÏÄ." -#: info/session.c:1033 -#, fuzzy +#: info/session.c:1034 msgid "No `Prev' for this node." -msgstr "÷ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌËÉ \"ðÒÅÄÙÄÕÝÁÑ\"." +msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `ðÒÅÄÙÄÕÝÁÑ'." -#. Move to the previous node. If this node now contains a menu, -#. and we have not inhibited movement to it, move to the node -#. corresponding to the last menu item. -#: info/session.c:1036 info/session.c:1091 +#: info/session.c:1037 info/session.c:1092 msgid "Moving Prev in this window." msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"ðÒÅÄÙÄÕÝÁÑ\" × ÜÔÏÍ ÏËÎÅ." -#: info/session.c:1050 -#, fuzzy +#: info/session.c:1051 msgid "No `Prev' or `Up' for this node within this document." -msgstr "" -"÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÎÅÔ ÓÓÙÌËÉ \"ðÒÅÄÙÄÕÝÁÑ\" ÉÌÉ \"÷×ÅÒÈ\" ÄÌÑ ÜÔÏÊ ÎÏÄÙ." +msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÎÅÔ ÓÓÙÌËÉ `ðÒÅÄÙÄÕÝÁÑ' ÉÌÉ `÷×ÅÒÈ' ÄÌÑ ÜÔÏÊ ÎÏÄÙ." -#: info/session.c:1053 +#: info/session.c:1054 msgid "Moving Up in this window." msgstr "ðÅÒÅÈÏÄ ÎÁ ÎÏÄÕ \"÷×ÅÒÈ\" × ÜÔÏÍ ÏËÎÅ." -#: info/session.c:1101 -#, fuzzy +#: info/session.c:1102 msgid "Moving to `Prev's last menu item." -msgstr "ðÅÒÅÈÏÄ ÎÁ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ ÎÏÄÙ \"ðÒÅÄÙÄÕÝÁÑ\"." +msgstr "ðÅÒÅÈÏÄ ÎÁ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ ÎÏÄÙ `ðÒÅÄÙÄÕÝÁÑ'." -#: info/session.c:1112 +#: info/session.c:1113 msgid "Move forwards or down through node structure" msgstr "ðÒÏÄ×ÉÇÁÔØÓÑ ×ÐÅÒÅÄ ÉÌÉ ×ÎÉÚ ÐÏ ÓÔÒÕËÔÕÒÅ ÎÏÄ" -#: info/session.c:1128 +#: info/session.c:1129 msgid "Move backwards or up through node structure" msgstr "ðÒÏÄ×ÉÇÁÔØÓÑ ÎÁÚÁÄ ÉÌÉ ××ÅÒÈ ÐÏ ÓÔÒÕËÔÕÒÅ ÎÏÄ" -#. Show the next screen of WINDOW's node. -#: info/session.c:1143 +#: info/session.c:1229 msgid "Scroll forward in this window" msgstr "ðÒÏËÒÕÔÉÔØ ×ÐÅÒÅÄ ÔÅËÕÝÅÅ ÏËÎÏ" -#: info/session.c:1192 +#: info/session.c:1237 msgid "Scroll forward in this window and set default window size" msgstr "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ×ÐÅÒÅÄ É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#. Show the previous screen of WINDOW's node. -#: info/session.c:1200 +#: info/session.c:1245 +msgid "Scroll forward in this window staying within node" +msgstr "ðÒÏËÒÕÔÉÔØ ×ÐÅÒÅÄ ÔÅËÕÝÅÅ ÏËÎÏ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ" + +#: info/session.c:1253 +msgid "" +"Scroll forward in this window staying within node and set default window size" +msgstr "" +"ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ×ÐÅÒÅÄ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ, É ÕÓÔÁÎÏ×ÉÔØ " +"ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" + +#: info/session.c:1261 msgid "Scroll backward in this window" msgstr "ðÒÏËÒÕÔÉÔØ ÎÁÚÁÄ ÔÅËÕÝÅÅ ÏËÎÏ" -#: info/session.c:1244 +#: info/session.c:1269 msgid "Scroll backward in this window and set default window size" msgstr "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ÎÁÚÁÄ É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" -#. Move to the beginning of the node. -#: info/session.c:1252 +#: info/session.c:1278 +msgid "Scroll backward in this window staying within node" +msgstr "ðÒÏËÒÕÔÉÔØ ÎÁÚÁÄ ÔÅËÕÝÅÅ ÏËÎÏ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ" + +#: info/session.c:1286 +msgid "" +"Scroll backward in this window staying within node and set default window " +"size" +msgstr "" +"ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ÎÁÚÁÄ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ, É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ " +"ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ" + +#: info/session.c:1294 msgid "Move to the start of this node" msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÎÏÄÙ" -#. Move to the end of the node. -#: info/session.c:1259 +#: info/session.c:1301 msgid "Move to the end of this node" msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÎÏÄÙ" -#. Scroll the window forward by N lines. -#: info/session.c:1266 +#: info/session.c:1308 msgid "Scroll down by lines" msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÎÅÓËÏÌØËÏ ÓÔÒÏË ×ÎÉÚ" -#. Scroll the window backward by N lines. -#: info/session.c:1283 +#: info/session.c:1325 msgid "Scroll up by lines" msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÎÅÓËÏÌØËÏ ÓÔÒÏË ××ÅÒÈ" -#: info/session.c:1301 +#: info/session.c:1343 msgid "Scroll down by half screen size" msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÐÏÌÜËÒÁÎÁ ×ÎÉÚ" -#: info/session.c:1327 +#: info/session.c:1369 msgid "Scroll up by half screen size" msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÐÏÌÜËÒÁÎÁ ××ÅÒÈ" -#. **************************************************************** -#. -#. Commands for Manipulating Windows -#. -#. **************************************************************** -#. Make the next window in the chain be the active window. -#: info/session.c:1356 +#: info/session.c:1398 msgid "Select the next window" msgstr "÷ÙÂÒÁÔØ ÓÌÅÄÕÀÝÅÅ ÏËÎÏ" -#. Make the previous window in the chain be the active window. -#: info/session.c:1395 +#: info/session.c:1437 msgid "Select the previous window" msgstr "÷ÙÂÒÁÔØ ÐÒÅÄÙÄÕÝÅÅ ÏËÎÏ" -#. Split WINDOW into two windows, both showing the same node. If we -#. are automatically tiling windows, re-tile after the split. -#: info/session.c:1446 +#: info/session.c:1488 msgid "Split the current window" msgstr "òÁÚÂÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ" -#. Delete WINDOW, forgetting the list of last visited nodes. If we are -#. automatically displaying footnotes, show or remove the footnotes -#. window. If we are automatically tiling windows, re-tile after the -#. deletion. -#: info/session.c:1527 +#: info/session.c:1569 msgid "Delete the current window" msgstr "õÄÁÌÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ" -#: info/session.c:1535 +#: info/session.c:1577 msgid "Cannot delete a permanent window" msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÔÏÑÎÎÏÅ ÏËÎÏ" -#. Just keep WINDOW, deleting all others. -#: info/session.c:1568 +#: info/session.c:1610 msgid "Delete all other windows" msgstr "õÄÁÌÉÔØ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÏËÎÁ" -#. Scroll the "other" window of WINDOW. -#: info/session.c:1614 +#: info/session.c:1656 msgid "Scroll the other window" msgstr "ðÒÏËÒÕÔÉÔØ ÄÒÕÇÏÅ ÏËÎÏ" -#: info/session.c:1635 +#: info/session.c:1677 msgid "Scroll the other window backward" msgstr "ðÒÏËÒÕÔÉÔØ ÄÒÕÇÏÅ ÏËÎÏ ÎÁÚÁÄ" -#. Change the size of WINDOW by AMOUNT. -#: info/session.c:1641 +#: info/session.c:1683 msgid "Grow (or shrink) this window" msgstr "õ×ÅÌÉÞÉÔØ (ÉÌÉ ÕÍÅÎØÛÉÔØ) ÔÅËÕÝÅÅ ÏËÎÏ" -#: info/session.c:1652 +#: info/session.c:1694 msgid "Divide the available screen space among the visible windows" msgstr "òÁÚÄÅÌÉÔØ ÄÏÓÔÕÐÎÏÅ ÍÅÓÔÏ ÎÁ ÜËÒÁÎÅ ÍÅÖÄÕ ×ÉÄÉÍÙÍÉ ÏËÎÁÍÉ" -#: info/session.c:1659 +#: info/session.c:1701 msgid "Toggle the state of line wrapping in the current window" msgstr "ðÅÒÅËÌÀÞÉÔØ ÒÅÖÉÍ ÒÁÚÂÉ×ÁÎÉÑ ÓÔÒÏË × ÔÅËÕÝÅÍ ÏËÎÅ" -#. Make WINDOW display the "Next:" node of the node currently being -#. displayed. -#: info/session.c:1838 +#: info/session.c:1880 msgid "Select the Next node" msgstr "ðÅÒÅÊÔÉ ÎÁ `óÌÅÄÕÀÝÕÀ' ÎÏÄÕ" -#. Make WINDOW display the "Prev:" node of the node currently being -#. displayed. -#: info/session.c:1846 +#: info/session.c:1888 msgid "Select the Prev node" msgstr "ðÅÒÅÊÔÉ ÎÁ `ðÒÅÄÙÄÕÝÕÀ' ÎÏÄÕ" -#. Make WINDOW display the "Up:" node of the node currently being -#. displayed. -#: info/session.c:1854 +#: info/session.c:1896 msgid "Select the Up node" msgstr "ðÅÒÅÊÔÉ ÎÁ `÷ÅÒÈÎÀÀ' ÎÏÄÕ" -#. Make WINDOW display the last node of this info file. -#: info/session.c:1861 +#: info/session.c:1903 msgid "Select the last node in this file" msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÆÁÊÌÅ" -#: info/session.c:1888 info/session.c:1921 +#: info/session.c:1930 info/session.c:1963 msgid "This window has no additional nodes" msgstr "üÔÏ ÏËÎÏ ÎÅ ÉÍÅÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÎÏÄ" -#. Make WINDOW display the first node of this info file. -#: info/session.c:1894 +#: info/session.c:1936 msgid "Select the first node in this file" msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÅÒ×ÕÀ ÎÏÄÕ × ÆÁÊÌÅ" -#: info/session.c:1928 +#: info/session.c:1970 msgid "Select the last item in this node's menu" msgstr "÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ" -#. Use KEY (a digit) to select the Nth menu item in WINDOW->node. -#: info/session.c:1934 +#: info/session.c:1976 msgid "Select this menu item" msgstr "÷ÙÂÒÁÔØ ÚÁÄÁÎÎÙÊ ÐÕÎËÔ ÍÅÎÀ" -#: info/session.c:1963 +#: info/session.c:2005 #, c-format msgid "There aren't %d items in this menu." msgstr "÷ ÜÔÏÍ ÍÅÎÀ ÎÅÔ %d ÐÕÎËÔÏ×." -#: info/session.c:2094 +#: info/session.c:2148 #, c-format msgid "Menu item (%s): " msgstr "ðÕÎËÔ ÍÅÎÀ (%s): " -#: info/session.c:2096 +#: info/session.c:2150 msgid "Menu item: " msgstr "ðÕÎËÔ ÍÅÎÀ: " -#: info/session.c:2101 +#: info/session.c:2155 #, c-format msgid "Follow xref (%s): " msgstr "ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ (%s): " -#: info/session.c:2103 +#: info/session.c:2157 msgid "Follow xref: " msgstr "ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ: " -#. Read a line (with completion) which is the name of a menu item, -#. and select that item. -#: info/session.c:2191 +#: info/session.c:2280 msgid "Read a menu item and select its node" msgstr "óÞÉÔÁÔØ ÉÍÑ ÐÕÎËÔÁ ÍÅÎÀ É ÐÅÒÅÊÔÉ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÎÏÄÅ" -#: info/session.c:2199 +#: info/session.c:2288 msgid "Read a footnote or cross reference and select its node" msgstr "óÞÉÔÁÔØ ÉÍÑ ÓÓÙÌËÉ ÉÌÉ ÓÎÏÓËÉ É ÐÅÒÅÊÔÉ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÎÏÄÅ" -#. Position the cursor at the start of this node's menu. -#: info/session.c:2205 +#: info/session.c:2294 msgid "Move to the start of this node's menu" msgstr "óÍÅÓÔÉÔØÓÑ Ë ÎÁÞÁÌÕ ÍÅÎÀ ÔÅËÕÝÅÊ ÎÏÄÙ" -#: info/session.c:2229 +#: info/session.c:2318 msgid "Visit as many menu items at once as possible" msgstr "ðÒÏÓÍÏÔÒÅÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ ËÁË ÍÏÖÎÏ ÂÏÌØÛÅ ÎÏÄ" -#. Read a line of input which is a node name, and go to that node. -#: info/session.c:2257 +#: info/session.c:2346 msgid "Read a node name and select it" msgstr "óÞÉÔÁÔØ ÉÍÑ ÎÏÄÙ É ÐÅÒÅÊÔÉ Ë ÎÅÊ" -#: info/session.c:2312 info/session.c:2316 +#: info/session.c:2401 info/session.c:2405 msgid "Goto node: " msgstr "ðÅÒÅÊÔÉ Ë ÎÏÄÅ: " -#: info/session.c:2382 -#, fuzzy, c-format +#: info/session.c:2471 +#, c-format msgid "No menu in node `%s'." -msgstr "÷ ÎÏÄÅ \"%s\" ÎÅÔ ÍÅÎÀ." +msgstr "÷ ÎÏÄÅ `%s' ÎÅÔ ÍÅÎÀ." -#: info/session.c:2422 -#, fuzzy, c-format +#: info/session.c:2516 +#, c-format msgid "No menu item `%s' in node `%s'." -msgstr "ðÕÎËÔ ÍÅÎÀ \"%s\" ÏÔÓÕÔÓÔ×ÕÅÔ × ÎÏÄÅ \"%s\"." +msgstr "ðÕÎËÔ ÍÅÎÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ × ÎÏÄÅ `%s'." -#: info/session.c:2452 -#, fuzzy, c-format +#: info/session.c:2546 +#, c-format msgid "Unable to find node referenced by `%s' in `%s'." -msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ ÐÏ ÓÓÙÌËÅ \"%s\" × \"%s\"." +msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ ÐÏ ÓÓÙÌËÅ `%s' × `%s'." -#: info/session.c:2503 +#: info/session.c:2597 msgid "Read a list of menus starting from dir and follow them" msgstr "óÞÉÔÁÔØ ÓÐÉÓÏË ÍÅÎÀ, ÎÁÞÉÎÁÀÝÉÊÓÑ Ó dir É ÐÒÏÓÌÅÄÏ×ÁÔØ ÐÏ ÎÉÍ" -#: info/session.c:2505 +#: info/session.c:2599 msgid "Follow menus: " msgstr "ðÒÏÓÌÅÄÏ×ÁÔØ ÐÏ ÍÅÎÀ: " -#: info/session.c:2703 +#: info/session.c:2797 msgid "Find the node describing program invocation" msgstr "îÁÈÏÄÉÔ ÎÏÄÕ, ÒÁÓÓËÁÚÙ×ÁÀÝÕÀ, ËÁË ×ÙÚÙ×ÁÔØ ÐÒÏÇÒÁÍÍÕ" -#: info/session.c:2705 +#: info/session.c:2799 #, c-format msgid "Find Invocation node of [%s]: " msgstr "îÁÊÔÉ ÎÏÄÕ Invocation ÄÌÑ [%s]: " -#: info/session.c:2743 +#: info/session.c:2837 msgid "Read a manpage reference and select it" msgstr "óÞÉÔÁÔØ ÉÍÑ manpage É ÐÅÒÅÊÔÉ Ë ÎÅÊ" -#: info/session.c:2747 +#: info/session.c:2841 msgid "Get Manpage: " msgstr "ðÒÏÓÍÏÔÒÅÔØ manpage: " -#. Move to the "Top" node in this file. -#: info/session.c:2777 +#: info/session.c:2871 msgid "Select the node `Top' in this file" msgstr "ðÅÒÅÊÔÉ ÎÁ `ðÅÒ×ÕÀ' ÎÏÄÕ" -#. Move to the node "(dir)Top". -#: info/session.c:2783 +#: info/session.c:2877 msgid "Select the node `(dir)'" msgstr "ðÅÒÅÊÔÉ ÎÁ ÎÏÄÕ `(dir)'" -#: info/session.c:2803 +#: info/session.c:2897 #, c-format msgid "Kill node (%s): " msgstr "õÄÁÌÉÔØ ÎÏÄÕ (%s): " -#: info/session.c:2857 +#: info/session.c:2951 #, c-format msgid "Cannot kill node `%s'" msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÎÏÄÕ `%s'" -#: info/session.c:2867 +#: info/session.c:2961 msgid "Cannot kill the last node" msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ" -#: info/session.c:2953 +#: info/session.c:3047 msgid "Select the most recently selected node" msgstr "ðÅÒÅÊÔÉ Ë ÐÏÓÌÅÄÎÅÊ ×ÙÂÒÁÎÎÏÊ ÎÏÄÅ" -#. Kill named node. -#: info/session.c:2959 +#: info/session.c:3053 msgid "Kill this node" msgstr "õÄÁÌÉÔØ ÔÅËÕÝÕÀ ÎÏÄÕ" -#. Read the name of a file and select the entire file. -#: info/session.c:2967 +#: info/session.c:3061 msgid "Read the name of a file and select it" msgstr "óÞÉÔÁÔØ ÉÍÑ ÆÁÊÌÁ É ÐÅÒÅÊÔÉ Ë ÎÅÍÕ" -#: info/session.c:2971 +#: info/session.c:3065 msgid "Find file: " msgstr "ïÂÒÁÔÉÔØÓÑ Ë ÆÁÊÌÕ: " -#: info/session.c:2988 -#, fuzzy, c-format +#: info/session.c:3082 +#, c-format msgid "Cannot find `%s'." -msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ \"%s\"." +msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ `%s'." -#: info/session.c:3033 info/session.c:3154 -#, fuzzy, c-format +#: info/session.c:3127 info/session.c:3248 +#, c-format msgid "Could not create output file `%s'." -msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ \"%s\"." +msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'." -#: info/session.c:3046 info/session.c:3171 info/session.c:3232 +#: info/session.c:3140 info/session.c:3265 info/session.c:3326 msgid "Done." msgstr "úÁ×ÅÒÛÅÎÏ." -#. Maybe we should print some information about the node being output. -#: info/session.c:3102 -#, fuzzy, c-format +#: info/session.c:3196 +#, c-format msgid "Writing node %s..." -msgstr "úÁÐÉÓØ ÎÏÄÙ \"%s\"..." +msgstr "úÁÐÉÓØ ÎÏÄÙ %s..." -#: info/session.c:3180 +#: info/session.c:3274 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" msgstr "îÁÐÒÁ×ÉÔØ ÓÏÄÅÒÖÉÍÏÅ ÜÔÏÊ ÎÏÄÙ ÎÁ ×ÈÏÄ ËÏÍÁÎÄÙ INFO_PRINT_COMMAND" -#: info/session.c:3216 -#, fuzzy, c-format +#: info/session.c:3310 +#, c-format msgid "Cannot open pipe to `%s'." -msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÎÁÌ Ë \"%s\"." +msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÎÁÌ Ë `%s'." -#. Maybe we should print some information about the node being output. -#: info/session.c:3222 -#, fuzzy, c-format +#: info/session.c:3316 +#, c-format msgid "Printing node %s..." -msgstr "ðÅÞÁÔØ ÎÏÄÙ \"%s\"..." +msgstr "ðÅÞÁÔØ ÎÏÄÙ %s..." -#: info/session.c:3464 -#, fuzzy, c-format +#: info/session.c:3558 +#, c-format msgid "Searching subfile %s ..." -msgstr "ðÏÉÓË × ÆÁÊÌÅ \"%s\"..." +msgstr "ðÏÉÓË ÆÁÊÌÁ %s ..." -#: info/session.c:3516 +#: info/session.c:3610 msgid "Read a string and search for it case-sensitively" msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÒÅÇÉÓÔÒÏÚÁ×ÉÓÉÍÙÊ ÐÏÉÓË" -#: info/session.c:3523 +#: info/session.c:3617 msgid "Read a string and search for it" msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÐÏÉÓË" -#: info/session.c:3531 +#: info/session.c:3625 msgid "Read a string and search backward for it" msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÐÏÉÓË × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ" -#: info/session.c:3573 +#: info/session.c:3667 #, c-format msgid "%s%sfor string [%s]: " msgstr "%s%s ÓÔÒÏËÉ [%s]: " -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search backward" msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search" msgstr "ðÏÉÓË" -#: info/session.c:3575 +#: info/session.c:3669 msgid " case-sensitively " msgstr " c ÕÞÅÔÏÍ ÒÅÇÉÓÔÒÁ " -#: info/session.c:3575 +#: info/session.c:3669 msgid " " -msgstr "" +msgstr " " -#: info/session.c:3615 +#: info/session.c:3709 msgid "Search failed." msgstr "îÅ ÎÁÊÄÅÎÏ" -#: info/session.c:3633 +#: info/session.c:3727 msgid "Repeat last search in the same direction" msgstr "ðÏ×ÔÏÒÉÔØ ÐÏÓÌÅÄÎÉÊ ÐÏÉÓË × ÔÏÍ ÖÅ ÎÁÐÒÁ×ÌÅÎÉÉ" -#: info/session.c:3636 info/session.c:3646 +#: info/session.c:3730 info/session.c:3740 msgid "No previous search string" msgstr "îÅÔ ÓÔÒÏËÉ ÐÒÅÄÙÄÕÝÅÇÏ ÐÏÉÓËÁ" -#: info/session.c:3643 +#: info/session.c:3737 msgid "Repeat last search in the reverse direction" msgstr "ðÏ×ÔÏÒÉÔØ ÐÏÓÌÅÄÎÉÊ ÐÏÉÓË × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ" -#: info/session.c:3661 info/session.c:3667 +#: info/session.c:3755 info/session.c:3761 msgid "Search interactively for a string as you type it" msgstr "úÁÐÕÓÔÉÔØ ÉÎÔÅÒÁËÔÉ×ÎÙÊ ÎÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË" -#: info/session.c:3761 +#: info/session.c:3855 msgid "I-search backward: " msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÏÂÒÁÔÎÙÊ ÐÏÉÓË: " -#: info/session.c:3763 +#: info/session.c:3857 msgid "I-search: " msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË: " -#: info/session.c:3788 +#: info/session.c:3882 msgid "Failing " msgstr "îÅ ÎÁÊÄÅÎÏ. " -#: info/session.c:4244 +#: info/session.c:4340 msgid "Move to the previous cross reference" msgstr "óÍÅÓÔÉÔØÓÑ Ë ÐÒÅÄÙÄÕÝÅÊ ÓÓÙÌËÅ" -#: info/session.c:4253 +#: info/session.c:4349 msgid "Move to the next cross reference" msgstr "óÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÓÓÙÌËÅ" -#: info/session.c:4263 +#: info/session.c:4359 msgid "Select reference or menu item appearing on this line" msgstr "÷ÙÂÒÁÔØ ÓÓÙÌËÕ ÉÌÉ ÐÕÎËÔ ÍÅÎÀ, ÎÁÈÏÄÑÝÉÊÓÑ ÎÁ ÄÁÎÎÏÊ ÓÔÒÏËÅ" -#. **************************************************************** -#. -#. Miscellaneous Info Commands -#. -#. **************************************************************** -#. What to do when C-g is pressed in a window. -#: info/session.c:4285 +#: info/session.c:4381 msgid "Cancel current operation" msgstr "ïÔÍÅÎÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÔÅËÕÝÅÊ ËÏÍÁÎÄÙ" -#: info/session.c:4292 +#: info/session.c:4388 msgid "Quit" msgstr "÷ÙÈÏÄ" -#: info/session.c:4301 +#: info/session.c:4397 msgid "Move the cursor to a specific line of the window" msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÕÒÓÏÒ Ë ÚÁÄÁÎÎÏÊ ÓÔÒÏËÅ ÏËÎÁ" -#. Clear the screen and redraw its contents. Given a numeric argument, -#. move the line the cursor is on to the COUNT'th line of the window. -#: info/session.c:4333 +#: info/session.c:4429 msgid "Redraw the display" msgstr "ðÅÒÅÒÉÓÏ×ÁÔØ ÜËÒÁÎ" -#. This command does nothing. It is the fact that a key is bound to it -#. that has meaning. See the code at the top of info_session (). -#: info/session.c:4370 +#: info/session.c:4466 msgid "Quit using Info" msgstr "÷ÙÊÔÉ ÉÚ Info" -#: info/session.c:4393 +#: info/session.c:4479 +msgid "Run command bound to this key's lowercase variant" +msgstr "úÁÐÕÓÔÉÔØ ËÏÍÁÎÄÕ, ÐÒÉ×ÑÚÁÎÎÕÀ Ë ÜÔÏÊ ËÌÁ×ÉÛÅ × ÎÉÖÎÅÍ ÒÅÇÉÓÔÒÅ" + +#: info/session.c:4491 #, c-format msgid "Unknown command (%s)." msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ (%s)." -#: info/session.c:4396 +#: info/session.c:4494 msgid "\"\" is invalid" msgstr "\"\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ" -#: info/session.c:4397 +#: info/session.c:4495 #, c-format msgid "\"%s\" is invalid" msgstr "\"%s\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ" -#: info/session.c:4620 +#: info/session.c:4713 msgid "Add this digit to the current numeric argument" msgstr "äÏÂÁ×ÌÑÅÔ ÃÉÆÒÕ Ë ÔÅËÕÝÅÍÕ ÞÉÓÌÏ×ÏÍÕ ÁÒÇÕÍÅÎÔÕ" -#: info/session.c:4629 +#: info/session.c:4722 msgid "Start (or multiply by 4) the current numeric argument" msgstr "îÁÞÁÔØ (ÉÌÉ ÕÍÎÏÖÉÔØ ÎÁ 4) ÔÅËÕÝÉÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ" -#: info/session.c:4644 +#: info/session.c:4737 msgid "Internally used by \\[universal-argument]" msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÆÕÎËÃÉÅÊ \\[universal-argument]" @@ -1309,432 +1591,472 @@ msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÆÕÎËÃÉÅÊ \\[universal-argument]" msgid "readline: Out of virtual memory!\n" msgstr "readline: ÷ÉÒÔÕÁÌØÎÁÑ ÐÁÍÑÔØ ÉÓÞÅÒÐÁÎÁ!\n" -#: info/variables.c:40 +#: info/variables.c:37 msgid "When \"On\", footnotes appear and disappear automatically" msgstr "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), ÓÎÏÓËÉ ÐÏÑ×ÌÑÀÔÓÑ É ÉÓÞÅÚÁÀÔ Á×ÔÏÍÁÔÉÞÅÓËÉ" -#: info/variables.c:44 +#: info/variables.c:41 msgid "When \"On\", creating or deleting a window resizes other windows" msgstr "" "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), ÓÏÚÄÁÎÉÅ ÉÌÉ ÕÄÁÌÅÎÉÅ ÏËÎÁ ÉÚÍÅÎÑÅÔ ÒÁÚÍÅÒ ÄÒÕÇÉÈ " "ÏËÏÎ" -#: info/variables.c:48 +#: info/variables.c:45 msgid "When \"On\", flash the screen instead of ringing the bell" msgstr "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), ×ÍÅÓÔÏ Ú×ÕËÏ×ÏÇÏ ÓÉÇÎÁÌÁ ÍÉÇÁÅÔ ÜËÒÁÎ" -#: info/variables.c:52 +#: info/variables.c:49 msgid "When \"On\", errors cause the bell to ring" msgstr "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), ÏÛÉÂËÉ ×ÙÚÙ×ÁÀÔ Ú×ÕËÏ×ÏÊ ÓÉÇÎÁÌ" -#: info/variables.c:56 +#: info/variables.c:53 msgid "When \"On\", Info garbage collects files which had to be uncompressed" msgstr "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), ÐÒÏÉÚ×ÏÄÉÔØ ÓÂÏÒËÕ ÍÕÓÏÒÁ ÄÌÑ ÓÖÁÔÙÈ ÆÁÊÌÏ×" -#: info/variables.c:59 +#: info/variables.c:56 msgid "When \"On\", the portion of the matched search string is highlighted" msgstr "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), ×ÙÄÅÌÑÔØ ÐÒÉ ÐÏÉÓËÅ ÓÏ×ÐÁ×ÛÕÀ ÓÔÒÏËÕ" -#: info/variables.c:63 +#: info/variables.c:60 msgid "Controls what happens when scrolling is requested at the end of a node" msgstr "ïÐÒÅÄÅÌÑÅÔ ÐÏ×ÅÄÅÎÉÅ ÐÒÏËÒÕÔËÉ × ËÏÎÃÅ ÎÏÄÙ" -#: info/variables.c:67 +#: info/variables.c:64 msgid "The number lines to scroll when the cursor moves out of the window" msgstr "þÉÓÌÏ ÐÒÏËÒÕÞÉ×ÁÅÍÙÈ ÓÔÒÏË, ËÏÇÄÁ ËÕÒÓÏÒ ÐÅÒÅÍÅÝÁÅÔÓÑ ÚÁ ÐÒÅÄÅÌÙ ÏËÎÁ" -#: info/variables.c:71 +#: info/variables.c:68 msgid "When \"On\", Info accepts and displays ISO Latin characters" msgstr "åÓÌÉ ÕÓÔÁÎÏ×ÌÅÎÏ (\"On\"), Info ÏÔÏÂÒÁÖÁÅÔ ÓÉÍ×ÏÌÙ ISO Latin" -#: info/variables.c:77 +#: info/variables.c:74 msgid "Explain the use of a variable" msgstr "ïÐÉÓÁÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ ÐÅÒÅÍÅÎÎÏÊ" -#. Get the variable's name. -#: info/variables.c:83 +#: info/variables.c:80 msgid "Describe variable: " msgstr "ïÐÉÓÁÔØ ÐÅÒÅÍÅÎÎÕÀ: " -#: info/variables.c:102 +#: info/variables.c:99 msgid "Set the value of an Info variable" msgstr "õÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ ÐÅÒÅÍÅÎÎÏÊ" -#. Get the variable's name and value. -#: info/variables.c:108 +#: info/variables.c:105 msgid "Set variable: " msgstr "õÓÔÁÎÏ×ÉÔØ ÐÅÒÅÍÅÎÎÕÀ: " -#: info/variables.c:126 +#: info/variables.c:123 #, c-format msgid "Set %s to value (%d): " msgstr "õÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ %s ÒÁ×ÎÙÍ (%d): " -#: info/variables.c:167 +#: info/variables.c:164 #, c-format msgid "Set %s to value (%s): " msgstr "õÓÔÁÎÏ×ÉÔØ ÚÎÁÞÅÎÉÅ %s ÒÁ×ÎÙÍ (%s): " -#: info/window.c:1101 +#: info/window.c:1164 msgid "--*** Tags out of Date ***" msgstr "--*** ôÅÇÉ ÕÓÔÁÒÅÌÉ ***" -#. strlen (location_indicator). -#. 10 for the decimal representation of the number of lines in this -#. node, and the remainder of the text that can appear in the line. -#: info/window.c:1112 +#: info/window.c:1175 msgid "-----Info: (), lines ----, " msgstr "-----Info: (), ÓÔÒÏË ----, " -#: info/window.c:1119 +#: info/window.c:1182 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "-%s---Info: %s, ÓÔÒÏË: %d --%s--" -#: info/window.c:1123 +#: info/window.c:1186 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "-%s%s-Info: (%s)%s, ÓÔÒÏË: %d --%s--" -#: info/window.c:1130 +#: info/window.c:1193 #, c-format msgid " Subfile: %s" msgstr " æÁÊÌ: %s" -#: lib/getopt.c:680 +#: lib/getopt.c:675 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `%s'\n" -#: lib/getopt.c:704 +#: lib/getopt.c:700 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `--%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:709 +#: lib/getopt.c:705 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `%c%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: lib/getopt.c:726 lib/getopt.c:899 +#: lib/getopt.c:723 lib/getopt.c:896 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "%s: ËÌÀÞ `%s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" -#. --option -#: lib/getopt.c:755 +#: lib/getopt.c:752 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n" -#. +option or -option -#: lib/getopt.c:759 +#: lib/getopt.c:756 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `%c%s'\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:785 +#: lib/getopt.c:782 #, c-format msgid "%s: illegal option -- %c\n" msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n" -#: lib/getopt.c:788 +#: lib/getopt.c:785 #, c-format msgid "%s: invalid option -- %c\n" msgstr "%s: ÎÅ×ÅÒÎÙÊ ËÌÀÞ -- %c\n" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:818 lib/getopt.c:948 +#: lib/getopt.c:815 lib/getopt.c:945 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "%s: ËÌÀÞ %c ÄÏÌÖÅÎ ÂÙ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ\n" -#: lib/getopt.c:865 +#: lib/getopt.c:862 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "%s: ÎÅÏÄÎÏÚÎÁÞÎÙÊ ËÌÀÞ `-W %s'\n" -#: lib/getopt.c:883 +#: lib/getopt.c:880 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "%s: ËÌÀÞ `-W %s' ÄÏÌÖÅÎ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ ÂÅÚ ÁÒÇÕÍÅÎÔÁ\n" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "January" msgstr "ÑÎ×ÁÒÑ" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "February" msgstr "ÆÅ×ÒÁÌÑ" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "March" msgstr "ÍÁÒÔÁ" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "April" msgstr "ÁÐÒÅÌÑ" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "May" msgstr "ÍÁÑ" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "June" msgstr "ÉÀÎÑ" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "July" msgstr "ÉÀÌÑ" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "August" msgstr "Á×ÇÕÓÔÁ" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "September" msgstr "ÓÅÎÔÑÂÒÑ" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "October" msgstr "ÏËÔÑÂÒÑ" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "November" msgstr "ÎÏÑÂÒÑ" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "December" msgstr "ÄÅËÁÂÒÑ" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:658 #, c-format msgid "unlikely character %c in @var" msgstr "ÍÁÌÏ×ÅÒÏÑÔÎÙÊ ÚÎÁË %c × @var" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:701 msgid "@sc argument all uppercase, thus no effect" msgstr "×ÅÓØ ÁÒÇÕÍÅÎÔ @sc ÎÁÂÒÁÎ ÚÁÇÌÁ×ÎÙÍÉ ÂÕË×ÁÍÉ, ÒÅÚÕÌØÔÁÔÁ ÎÅ ÂÕÄÅÔ" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:759 +#, c-format +msgid "`{' expected, but saw `%c'" +msgstr "ÏÖÉÄÁÌÏÓØ `{', ×ÓÔÒÅÞÅÎÏ `%c'" + +#: makeinfo/cmds.c:789 +msgid "end of file inside verb block" +msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ" + +#: makeinfo/cmds.c:797 +#, c-format +msgid "`}' expected, but saw `%c'" +msgstr "ÏÖÉÄÁÌÏÓØ `}', ×ÓÔÒÅÞÅÎÏ `%c'" + +#: makeinfo/cmds.c:942 #, c-format msgid "%c%s is obsolete" msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ" -#: makeinfo/cmds.c:814 +#: makeinfo/cmds.c:1014 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "ËÏÍÁÎÄÅ @sp ÎÕÖÎÏ ÕËÁÚÁÔØ ÐÏÌÏÖÉÔÅÌØÎÙÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ, Á ÎÅ `%s'" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %c%s" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140 msgid "asis" -msgstr "" +msgstr "asis" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142 msgid "none" -msgstr "" +msgstr "none" -#: makeinfo/defun.c:83 +#: makeinfo/defun.c:85 msgid "Missing `}' in @def arg" msgstr "÷ ÁÒÇÕÍÅÎÔÅ @def ÐÒÏÐÕÝÅÎÁ `}'" -#: makeinfo/defun.c:358 +#: makeinfo/defun.c:363 msgid "Function" msgstr "æÕÎËÃÉÑ" -#: makeinfo/defun.c:361 +#: makeinfo/defun.c:366 msgid "Macro" msgstr "íÁËÒÏ" -#: makeinfo/defun.c:364 +#: makeinfo/defun.c:369 msgid "Special Form" msgstr "óÐÅÃÉÁÌØÎÁÑ ÆÏÒÍÁ" -#: makeinfo/defun.c:368 +#: makeinfo/defun.c:373 msgid "Variable" msgstr "ðÅÒÅÍÅÎÎÁÑ" -#: makeinfo/defun.c:371 +#: makeinfo/defun.c:376 msgid "User Option" msgstr "ðÏÌØÚÏ×ÁÔÅÌØÓËÉÊ ÐÁÒÁÍÅÔÒ" -#: makeinfo/defun.c:375 +#: makeinfo/defun.c:380 msgid "Instance Variable" msgstr "ðÅÒÅÍÅÎÎÁÑ ÜËÚÅÍÐÌÑÒÁ" -#: makeinfo/defun.c:379 +#: makeinfo/defun.c:384 msgid "Method" msgstr "íÅÔÏÄ" -#: makeinfo/defun.c:450 makeinfo/defun.c:454 makeinfo/defun.c:556 -#: makeinfo/defun.c:570 makeinfo/defun.c:610 +#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615 +#: makeinfo/defun.c:631 makeinfo/defun.c:671 msgid "of" msgstr "ÉÚ" -#: makeinfo/defun.c:458 makeinfo/defun.c:462 makeinfo/defun.c:466 -#: makeinfo/defun.c:564 makeinfo/defun.c:615 +#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482 +#: makeinfo/defun.c:624 makeinfo/defun.c:676 msgid "on" msgstr "ÎÁÄ" -#: makeinfo/defun.c:656 +#: makeinfo/defun.c:717 #, c-format msgid "Must be in `%s' insertion to use `%sx'" msgstr "ëÏÍÁÎÄÕ `%sx' ÍÏÖÎÏ ÉÓÐÏÌØÚÏ×ÁÔØ ÔÏÌØËÏ ×Ï ×ÓÔÁ×ËÅ `%s'" -#: makeinfo/files.c:460 +#: makeinfo/files.c:448 #, c-format msgid "%s: getwd: %s, %s\n" -msgstr "" +msgstr "%s: getwd: %s, %s\n" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" msgstr "`%c%s' ÔÒÅÂÕÅÔ ÁÒÇÕÍÅÎÔ `{...}', Á ÎÅ ÐÒÏÓÔÏ `%s'" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" msgstr "äÌÑ ÓÎÏÓËÉ `%s' ÎÅÔ ÚÁËÒÙ×ÁÀÝÅÊ ÆÉÇÕÒÎÏÊ ÓËÏÂËÉ" -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" msgstr "óÎÏÓËÁ ÏÐÒÅÄÅÌÅÎÁ ÂÅÚ ÒÏÄÉÔÅÌØÓËÏÊ ÎÏÄÙ" -#: makeinfo/footnote.c:278 +#: makeinfo/footnote.c:210 +msgid "Footnotes inside footnotes are not allowed" +msgstr "óÎÏÓËÉ ÉÚ ÓÎÏÓÏË ÚÁÐÒÅÝÅÎÙ" + +#: makeinfo/footnote.c:298 msgid "Footnotes" msgstr "óÎÏÓËÉ" -#. The <title> should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:42 msgid "Untitled" msgstr "âÅÚ ÚÁÇÏÌÏ×ËÁ" -#: makeinfo/index.c:212 +#: makeinfo/html.c:298 +#, c-format +msgid "Invalid node name: `%s'" +msgstr "îÅ×ÅÒÎÏÅ ÉÍÑ ÎÏÄÙ: `%s'" + +#: makeinfo/index.c:213 #, c-format msgid "Unknown index `%s'" msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÎÅÉÚ×ÅÓÔÅÎ" -#: makeinfo/index.c:382 +#: makeinfo/index.c:238 +#, c-format +msgid "Info cannot handle `:' in index entry `%s'" +msgstr "" +"Info ÎÅ ÍÏÖÅÔ ÏÂÒÁÂÏÔÁÔØ ÚÎÁË `:' ×Ï ×ÈÏÖÄÅÎÉÉ ÁÌÆÁ×ÉÔÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s'" + +#: makeinfo/index.c:396 #, c-format msgid "Index `%s' already exists" msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ" -#: makeinfo/index.c:425 +#: makeinfo/index.c:439 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' É/ÉÌÉ `%s' × @synindex" -#: makeinfo/index.c:642 +#: makeinfo/index.c:666 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' × @printindex" -#: makeinfo/index.c:680 +#: makeinfo/index.c:709 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "÷ÈÏÖÄÅÎÉÅ ÄÌÑ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s' ×ÎÅ ÎÏÄÙ" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:712 makeinfo/index.c:751 msgid "(outside of any node)" msgstr "(×ÎÅ ËÁËÏÊ-ÌÉÂÏ ÎÏÄÙ)" -#: makeinfo/insertion.c:192 +#: makeinfo/insertion.c:198 msgid "Broken-Type in insertion_type_pname" msgstr "Broken-Type × insertion_type_pname" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:271 msgid "Enumeration stack overflow" msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÓÔÅËÁ ÐÅÒÅÞÉÓÌÅÎÉÑ" -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:303 #, c-format msgid "lettering overflow, restarting at %c" msgstr "ÚÁËÏÎÞÉÌÓÑ ÁÌÆÁ×ÉÔ, ×ÏÚ×ÒÁÔ ÎÁ %c" -#: makeinfo/insertion.c:481 +#: makeinfo/insertion.c:538 #, c-format msgid "%s requires an argument: the formatter for %citem" msgstr "%s ÄÏÌÖÎÁ ÉÓÐÏÌØÚÏ×ÁÔØÓÑ c ÁÒÇÕÍÅÎÔÏÍ: ÆÏÒÍÁÔÏÍ ÄÌÑ %citem" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:693 #, c-format msgid "`@end' expected `%s', but saw `%s'" msgstr "ÏÖÉÄÁÌÏÓØ `@end' Ó `%s', ×ÓÔÒÅÞÅÎÏ `%s'" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:931 #, c-format msgid "No matching `%cend %s'" msgstr "îÅÔ ÐÁÒÎÏÊ `%cend %s'" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:1084 #, c-format msgid "%s requires letter or digit" msgstr "%s ÔÒÅÂÕÅÔ ÂÕË×Ù ÉÌÉ ÃÉÆÒÙ" -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1158 +msgid "end of file inside verbatim block" +msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ" + +#: makeinfo/insertion.c:1318 msgid "@menu seen before first @node, creating `Top' node" msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1319 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" "×ÅÒÏÑÔÎÏ, ×ÁÛÁ ÎÏÄÁ @top ÄÏÌÖÎÁ ÂÙÔØ × ÂÌÏËÅ @ifnottex, Á ÎÅ × @ifinfo?" -#. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1331 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "@detailmenu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'" -#: makeinfo/insertion.c:1074 +#: makeinfo/insertion.c:1346 #, c-format msgid "Unmatched `%c%s'" msgstr "îÅÐÁÒÎÁÑ `%c%s'" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1353 #, c-format msgid "`%c%s' needs something after it" msgstr "ðÏÓÌÅ `%c%s' ÄÏÌÖÎÏ ÞÔÏ-ÔÏ ÉÄÔÉ" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1359 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ `%s', `%s', ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ `%s'" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1453 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `@%s'" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1462 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "@itemx ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ `%s'" -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1646 #, c-format msgid "%c%s found outside of an insertion block" msgstr "%c%s ×ÓÔÒÅÞÅÎÁ ×ÎÅ ÂÌÏËÁ ×ÓÔÁ×ËÉ" -#: makeinfo/lang.c:199 +#: makeinfo/lang.c:331 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ÑÚÙËÁ ÉÚ ISO 639" -#. This error message isn't perfect if the argument is multiple -#. characters, but it doesn't seem worth getting right. -#: makeinfo/lang.c:406 +#: makeinfo/lang.c:384 +#, c-format +msgid "unrecogized encoding name `%s'" +msgstr "ÉÍÑ ËÏÄÉÒÏ×ËÉ `%s' ÎÅÒÁÓÐÏÚÎÁÎÏ" + +#: makeinfo/lang.c:387 +#, c-format +msgid "sorry, encoding `%s' not supported" +msgstr "ÉÚ×ÉÎÉÔÅ, ËÏÄÉÒÏ×ËÁ `%s' ÎÅ ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ" + +#: makeinfo/lang.c:414 +#, c-format +msgid "invalid encoded character `%s'" +msgstr "ÎÅÐÒÁ×ÉÌØÎÏ ÚÁËÏÄÉÒÏ×ÁÎÎÙÊ ÚÎÁË `%s'" + +#: makeinfo/lang.c:502 +#, c-format +msgid "%s is an invalid ISO code, using %c" +msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ISO, ÉÓÐÏÌØÚÕÅÔÓÑ %c" + +#: makeinfo/lang.c:687 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ `i' ÉÌÉ `j', Á ÎÅ `%c'" -#: makeinfo/lang.c:410 +#: makeinfo/lang.c:691 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ÏÄÉÎ ÓÉÍ×ÏÌ `i' ÉÌÉ `j'" @@ -1759,228 +2081,319 @@ msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ \\ ÉÌÉ ÉÍÑ ÐÁÒÁÍÅÔÒÁ" msgid "Macro `%s' called on line %d with too many args" msgstr "íÁËÒÏ `%s' ×ÙÚ×ÁÎÏ ÎÁ ÓÔÒÏËÅ %d Ó ÉÚÌÉÛÎÉÍÉ ÁÒÇÕÍÅÎÔÁÍÉ" -#: makeinfo/macro.c:595 +#: makeinfo/macro.c:594 #, c-format msgid "%cend macro not found" msgstr "ÎÅ ×ÓÔÒÅÞÅÎÏ %cend macro" -#: makeinfo/macro.c:634 +#: makeinfo/macro.c:632 msgid "@quote-arg only useful for single-argument macros" msgstr "@quote-arg ÐÏÌÅÚÎÁ, ÔÏÌØËÏ ÅÓÌÉ ÍÁËÒÏ ÐÒÉÎÉÍÁÅÔ ÏÄÉÎ ÁÒÇÕÍÅÎÔ" -#: makeinfo/macro.c:670 +#: makeinfo/macro.c:668 #, c-format msgid "mismatched @end %s with @%s" msgstr "ÎÅÐÁÒÎÙÅ @end %s É @%s" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:316 #, c-format msgid "%s:%d: warning: " msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: " -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:339 msgid "Too many errors! Gave up.\n" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË! ïÓÔÁÎÏ×ËÁ.\n" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026 #, c-format msgid "Misplaced %c" msgstr "úÄÅÓØ ÎÅ ÄÏÌÖÎÏ ÂÙÔØ %c" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:370 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n" -#: makeinfo/makeinfo.c:365 +#: makeinfo/makeinfo.c:373 #, c-format +msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" +msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n" + +#: makeinfo/makeinfo.c:376 msgid "" -"Usage: %s [OPTION]... TEXINFO-FILE...\n" -"\n" -"Translate Texinfo source documentation to various other formats:\n" -"Info files suitable for reading online with Emacs or standalone GNU Info\n" -"(by default); plain text (with --no-headers); or HTML (with --html).\n" -"\n" -"Options:\n" -" --commands-in-node-names allow @ commands in node names.\n" -" -D VAR define a variable, as with @set.\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" --error-limit=NUM quit after NUM errors (default %d).\n" -" --fill-column=NUM break Info lines at NUM characters (default %d).\n" -" --footnote-style=STYLE output footnotes according to STYLE:\n" -" `separate' to place footnotes in their own " -"node,\n" -" `end' to place the footnotes at the end of the\n" -" node in which they are defined (the default).\n" -" --force preserve output even if errors.\n" -" --help display this help and exit.\n" -" --html output HTML rather than Info format;\n" -" -I DIR append DIR to the @include search path.\n" -" --ifhtml process @ifhtml and @html text even when not\n" -" generating HTML.\n" -" --ifinfo process @ifinfo text even when generating HTML.\n" -" --iftex process @iftex and @tex text.\n" -" implies --no-split.\n" -msgstr "" - -#: makeinfo/makeinfo.c:391 -#, fuzzy, c-format +"Translate Texinfo source documentation to various other formats, by default\n" +"Info files suitable for reading online with Emacs or standalone GNU Info.\n" +msgstr "" +"ðÒÅÏÂÒÁÚÕÅÔ ÄÏËÕÍÅÎÔÁÃÉÀ × ÆÏÒÍÁÔÅ Texinfo × ÄÒÕÇÉÅ ÆÏÒÍÁÔÙ, ÐÏ\n" +"ÕÍÏÌÞÁÎÉÀ × Info-ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÞÉÔÁÔØ Ó ÐÏÍÏÝØÀ Emacs ÉÌÉ\n" +"ÏÔÄÅÌØÎÏÊ ÐÒÏÇÒÁÍÍÙ GNU Info.\n" + +#: makeinfo/makeinfo.c:380 +#, c-format +msgid "" +"General options:\n" +" --error-limit=NUM quit after NUM errors (default %d).\n" +" --force preserve output even if errors.\n" +" --help display this help and exit.\n" +" --no-validate suppress node cross-reference validation.\n" +" --no-warn suppress warnings (but not errors).\n" +" --reference-limit=NUM warn about at most NUM references (default %" +"d).\n" +" -v, --verbose explain what is being done.\n" +" --version display version information and exit.\n" +msgstr "" +"ïÂÝÉÅ ËÌÀÞÉ:\n" +" --error-limit=þéóìï ÏÓÔÁÎÏ×ÉÔØÓÑ ÐÏÓÌÅ þéóìá ÏÛÉÂÏË (ÐÏ " +"ÕÍÏÌÞÁÎÉÀ %d).\n" +" --force ÓÏÈÒÁÎÑÔØ ×Ù×ÏÄ, ÄÁÖÅ ÅÓÌÉ ÂÙÌÉ ÏÛÉÂËÉ.\n" +" --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n" +" --no-validate ÎÅ ÐÒÏÉÚ×ÏÄÉÔØ ÐÒÏ×ÅÒËÕ ÐÅÒÅËÒÅÓÔÎÙÈ " +"ÓÓÙÌÏË.\n" +" --no-warn ÎÅ ÐÏËÁÚÙ×ÁÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ (ÎÏ ÎÅ " +"ÏÛÉÂËÉ).\n" +" --reference-limit=î ÍÁËÓÉÍÁÌØÎÏÅ ÞÉÓÌÏ ÓÓÙÌÏË, ÎÅ ×ÙÚÙ×ÁÀÝÅÅ\n" +" ×Ù×ÏÄ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ (ÐÏ ÕÍÏÌÞÁÎÉÀ %d).\n" +" -v, --verbose ÐÏÑÓÎÑÔØ ÄÅÊÓÔ×ÉÑ.\n" +" --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n" + +#: makeinfo/makeinfo.c:394 +#, no-wrap +msgid "" +"Output format selection (default is to produce Info):\n" +" --docbook output DocBook rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output XML (TexinfoML) rather than Info.\n" +msgstr "" +"÷ÙÂÏÒ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ (ÐÏ ÕÍÏÌÞÁÎÉÀ ×Ù×ÏÄÉÔÓÑ Info):\n" +" --docbook ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ DocBook, Á ÎÅ Info.\n" +" --html ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ HTML, Á ÎÅ Info.\n" +" --xml ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ XML (TexinfoML), Á ÎÅ × Info.\n" + +#: makeinfo/makeinfo.c:401 msgid "" -" --no-headers suppress Info node separators and Node: lines " -"and\n" -" write to standard output without --output.\n" -" --no-ifhtml do not process @ifhtml and @html text.\n" -" --no-ifinfo do not process @ifinfo text.\n" -" --no-iftex do not process @iftex and @tex text.\n" -" --no-split suppress splitting of large Info output files or\n" -" generation of one HTML file per node.\n" -" --no-validate suppress node cross-reference validation.\n" -" --no-warn suppress warnings (but not errors).\n" -" --number-sections include chapter, section, etc. numbers in " -"output.\n" -" -o, --output=FILE output to FILE, ignoring any @setfilename.\n" -" -P DIR prepend DIR to the @include search path.\n" -" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " -"%d).\n" -" if VAL is `none', do not indent;\n" -" if VAL is `asis', preserve existing " -"indentation.\n" -" --reference-limit=NUM warn about at most NUM references (default %d).\n" -" -U VAR undefine a variable, as with @clear.\n" -" -v, --verbose explain what is being done.\n" -" --version display version information and exit.\n" -msgstr "" -" --ifhtml ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É " -"@html,\n" -" ÄÁÖÅ ÐÒÉ ×Ù×ÏÄÅ ÎÅ × ÆÏÒÍÁÔÅ HTML.\n" -" --ifinfo ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifinfo, ÄÁÖÅ " -"ÐÒÉ\n" -" ×Ù×ÏÄÅ × ÆÏÒÍÁÔÅ HTML.\n" -" --iftex ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É @tex.\n" -" --macro-expand, -E æáêì ×Ù×ÅÓÔÉ × æáêì ÐÅÒ×ÏÎÁÞÁÌØÎÙÊ Texinfo-ÆÁÊÌ Ó\n" -" ÒÁÓËÒÙÔÙÍÉ ÍÁËÒÏÓÁÍÉ.\n" -" --no-headers ÎÅ ×Ù×ÏÄÉÔØ ÒÁÚÄÅÌÉÔÅÌÉ ÎÏÄ Info É ÓÔÒÏËÉ Node:;\n" -" ÐÉÓÁÔØ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ, ÅÓÌÉ ÎÅ ÚÁÄÁÎ " -"ËÌÀÞ\n" -" --output.\n" -" --no-ifhtml ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É " -"@html.\n" -" --no-ifinfo ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifinfo.\n" -" --no-iftex ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É " -"@tex.\n" -" --no-split ÐÏÄÁ×ÉÔØ ÒÁÚÂÉÅÎÉÅ ÂÏÌØÛÉÈ Info-ÆÁÊÌÏ× ÉÌÉ " -"ÓÏÚÄÁÎÉÅ\n" -" ÏÄÎÏÇÏ HTML-ÆÁÊÌÁ ÎÁ ËÁÖÄÕÀ ÎÏÄÕ.\n" -" --no-validate ÎÅ ÐÒÏÉÚ×ÏÄÉÔØ ÐÒÏ×ÅÒËÕ ÐÅÒÅËÒÅÓÔÎÙÈ ÓÓÙÌÏË.\n" -" --no-warn ÎÅ ÐÏËÁÚÙ×ÁÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ (ÎÏ ÎÅ ÏÛÉÂËÉ).\n" -" --number-sections ×ËÌÀÞÁÔØ × ×Ù×ÏÄ ÎÏÍÅÒÁ ÇÌÁ×, ÒÁÚÄÅÌÏ× É " +"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" +msgstr "" +"ïÂÝÉÅ ËÌÀÞÉ, ÕÐÒÁ×ÌÑÀÝÉÅ ×Ù×ÏÄÏÍ:\n" +" -E, --macro-expand æáêì ×Ù×ÅÓÔÉ × æáêì ÐÅÒ×ÏÎÁÞÁÌØÎÙÊ Texinfo-ÆÁÊÌ Ó\n" +" ÒÁÓËÒÙÔÙÍÉ ÍÁËÒÏÓÁÍÉ.\n" +" --no-headers ×Ù×ÏÄÉÔØ ÐÒÏÓÔÏÊ ÔÅËÓÔ, ÐÒÏÐÕÓËÁÑ ÒÁÚÄÅÌÉÔÅÌÉ " +"ÎÏÄ\n" +" Info É ÓÔÒÏËÉ Node:; ÐÉÓÁÔØ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ " +"×Ù×ÏÄ,\n" +" ÅÓÌÉ ÎÅ ÚÁÄÁÎ ËÌÀÞ --output.\n" +" --no-split ÐÏÄÁ×ÉÔØ ÒÁÚÂÉÅÎÉÅ ÂÏÌØÛÉÈ Info- ÉÌÉ HTML-" +"ÆÁÊÌÏ×,\n" +" ÓÏÚÄÁ×ÁÔØ ÔÏÌØËÏ ÏÄÉÎ ×ÙÈÏÄÎÏÊ ÆÁÊÌ.\n" +" --number-sections ×ËÌÀÞÁÔØ × ×Ù×ÏÄ ÎÏÍÅÒÁ ÇÌÁ×, ÒÁÚÄÅÌÏ× É " "ÐÒÉÌÏÖÅÎÉÊ.\n" -" --output=æáêì, -o æáêì ×Ù×ÏÄÉÔØ × æáêì, ÉÇÎÏÒÉÒÕÑ @setfilename.\n" -" --paragraph-indent=î ÄÅÌÁÔØ ÏÔÓÔÕÐÙ ÛÉÒÉÎÏÊ î ÐÒÏÂÅÌÏ× (ÐÏ ÕÍÏÌÞÁÎÉÀ " -"%d).\n" -" åÓÌÉ î ÒÁ×ÎÏ `none', ÎÅ ÄÅÌÁÔØ ÏÔÓÔÕÐÙ, ÅÓÌÉ\n" -" `asis', ÓÏÈÒÁÎÑÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÏÔÓÔÕÐÙ.\n" -" --reference-limit=î ÍÁËÓÉÍÁÌØÎÏÅ ÞÉÓÌÏ ÓÓÙÌÏË, ÎÅ ×ÙÚÙ×ÁÀÝÅÅ\n" -" ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ (ÐÏ ÕÍÏÌÞÁÎÉÀ %d).\n" -" -v, --verbose ÐÏÑÓÎÑÔØ ÄÅÊÓÔ×ÉÑ.\n" -" --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n" +" -o, --output=æáêì ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì (ËÁÔÁÌÏÇ ÄÌÑ HTML Ó \n" +" ÒÁÚÂÉÅÎÉÅÍ).\n" #: makeinfo/makeinfo.c:415 +#, 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" +" --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" +" If VAL is `none', do not indent; if VAL is\n" +" `asis', preserve existing indentation.\n" +" --split-size=NUM split Info files at size NUM (default %d).\n" +msgstr "" +"ëÌÀÞÉ ÄÌÑ Info É ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ:\n" +" --enable-encoding ×Ù×ÏÄÉÔØ ÚÎÁËÉ Ó ÁËÃÅÎÔÁÍÉ É ÓÐÅÃÉÁÌØÎÙÅ " +"ÚÎÁËÉ,\n" +" ÏÓÎÏ×Ù×ÁÑÓØ ÎÁ @documentencoding.\n" +" --fill-column=þéóìï ÒÁÚÂÉ×ÁÔØ ÓÔÒÏËÉ ÄÌÉÎÎÅÅ þéóìá ÚÎÁËÏ× (ÐÏ\n" +" ÕÍÏÌÞÁÎÉÀ %d).\n" +" --footnote-style=óôéìø ×Ù×ÏÄÉÔØ ÓÎÏÓËÉ ÏÄÎÉÍ ÉÚ óôéìåê:\n" +" `separate' -- ÐÏÍÅÝÁÔØ ÓÎÏÓËÉ × ÏÔÄÅÌØÎÕÀ " +"ÎÏÄÕ,\n" +" `end' -- ÐÏÍÅÝÁÔØ ÓÎÏÓËÉ × ËÏÎÅà ÎÏÄÙ, ÇÄÅ " +"ÏÎÉ ÂÙÌÉ\n" +" ÏÐÒÅÄÅÌÅÎÙ (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n" +" --paragraph-indent=î ÄÅÌÁÔØ ÏÔÓÔÕÐÙ ÛÉÒÉÎÏÊ î ÐÒÏÂÅÌÏ× (ÐÏ " +"ÕÍÏÌÞÁÎÉÀ %d).\n" +" åÓÌÉ î ÒÁ×ÎÏ `none', ÎÅ ÄÅÌÁÔØ ÏÔÓÔÕÐÙ, " +"ÅÓÌÉ\n" +" `asis', ÓÏÈÒÁÎÑÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ÏÔÓÔÕÐÙ.\n" +" --split-size=òáúíåò ÒÁÚÂÉ×ÁÔØ ÎÁ ÆÁÊÌÙ ÚÁÄÁÎÎÏÇÏ òáúíåòá (ÐÏ\n" +" ÕÍÏÌÞÁÎÉÀ %d).\n" + +#: makeinfo/makeinfo.c:433 +msgid "" +"Input file options:\n" +" --commands-in-node-names allow @ commands in node names.\n" +" -D VAR define the variable VAR, as with @set.\n" +" -I DIR append DIR to the @include search path.\n" +" -P DIR prepend DIR to the @include search path.\n" +" -U VAR undefine the variable VAR, as with @clear.\n" +msgstr "" +"ëÌÀÞÉ, ÕÐÒÁ×ÌÑÀÝÉÅ ×ÈÏÄÎÙÍÉ ÆÁÊÌÁÍÉ:\n" +" --commands-in-node-names ÐÏÚ×ÏÌÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ @-ËÏÍÁÎÄ × ÉÍÅÎÁÈ " +"ÎÏÄ.\n" +" -D ðåòåíåîîáñ ÏÐÒÅÄÅÌÉÔØ ÐÅÒÅÍÅÎÎÕÀ, ÁÎÁÌÏÇÉÞÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ " +"@set.\n" +" -I ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç × ËÏÎÅà ÓÐÉÓËÁ ÐÏÉÓËÁ ×ËÌÀÞÁÅÍÙÈ\n" +" ÆÁÊÌÏ×.\n" +" -P ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç × ÎÁÞÁÌÏ ÓÐÉÓËÁ ÐÏÉÓËÁ ×ËÌÀÞÁÅÍÙÈ\n" +" ÆÁÊÌÏ×.\n" +" -U ðåòåíåîîáñ ÓÄÅÌÁÔØ ÐÅÒÅÍÅÎÎÕÀ ÎÅÏÐÒÅÄÅÌÅÎÎÏÊ, ÁÎÁÌÏÇÉÞÎÏ\n" +" ÉÓÐÏÌØÚÏ×ÁÎÉÀ @clear.\n" + +#: makeinfo/makeinfo.c:442 +#, fuzzy +msgid "" +"Conditional processing in input:\n" +" --ifhtml process @ifhtml and @html even if not generating HTML.\n" +" --ifinfo process @ifinfo even if not generating Info.\n" +" --ifplaintext process @ifplaintext even if not generating plain text.\n" +" --iftex process @iftex and @tex; implies --no-split.\n" +" --no-ifhtml do not process @ifhtml and @html text.\n" +" --no-ifinfo do not process @ifinfo text.\n" +" --no-ifplaintext do not process @ifplaintext text.\n" +" --no-iftex do not process @iftex and @tex text.\n" +msgstr "" +"õÓÌÏ×ÎÁÑ ÏÂÒÁÂÏÔËÁ ÉÓÈÏÄÎÏÇÏ ÔÅËÓÔÁ:\n" +" --ifhtml ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É @html,\n" +" ÖÅ ÐÒÉ ×Ù×ÏÄÅ ÎÅ × ÆÏÒÍÁÔÅ HTML.\n" +" --ifinfo ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifinfo, ÄÁÖÅ ÐÒÉ\n" +" ×Ù×ÏÄÅ × ÆÏÒÍÁÔÅ HTML.\n" +" --iftex ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É @tex,\n" +" ÐÏÄÒÁÚÕÍÅ×ÁÅÔ --no-split.\n" +" --no-ifhtml ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifhtml É @html.\n" +" --no-ifinfo ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @ifinfo.\n" +" --no-iftex ÎÅ ÏÂÒÁÂÁÔÙ×ÁÔØ ÔÅËÓÔ ×ÎÕÔÒÉ ÂÌÏËÏ× @iftex É @tex.\n" + +#: makeinfo/makeinfo.c:454 +#, fuzzy +msgid "" +" The defaults for the @if... conditionals depend on the output format:\n" +" if generating HTML, --ifhtml is on and the others are off;\n" +" if generating Info, --ifinfo is on and the others are off;\n" +" if generating plain text, --ifplaintext is on and the others are off;\n" +msgstr "" +" ïÂÒÁÂÏÔËÁ ÕÓÌÏ×ÎÙÈ ËÏÍÁÎÄ @if... ÚÁ×ÉÓÉÔ ÏÔ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ:\n" +" ÐÒÉ ×Ù×ÏÄÅ HTML ×ËÌÀÞÅÎ --ifhtml, Á ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ;\n" +" ÐÒÉ ×Ù×ÏÄÅ Info ÉÌÉ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ ×ËÌÀÞÅÎ --ifinfo, Á ÏÓÔÁÌØÎÙÅ " +"×ÙËÌÀÞÅÎÙ.\n" + +#: makeinfo/makeinfo.c:461 msgid "" -"\n" -"The defaults for the @if... conditionals depend on the output format:\n" -"if generating HTML, --ifhtml is on and the others are off;\n" -"if generating Info or plain text, --ifinfo is on and the others are off.\n" -"\n" "Examples:\n" -" makeinfo foo.texi write Info to foo's @setfilename\n" -" makeinfo --html foo.texi write HTML to foo's @setfilename\n" -" makeinfo --no-headers -o - foo.texi write plain text to standard output\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 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" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org." +" 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 "" -"\n" -"ðÏ ÕÍÏÌÞÁÎÉÀ ÏÂÒÁÂÏÔËÁ ÕÓÌÏ×ÎÙÈ ËÏÍÁÎÄ @if... ÚÁ×ÉÓÉÔ ÏÔ ×ÙÈÏÄÎÏÇÏ ÆÏÒÍÁÔÁ: " -"ÐÒÉ\n" -"×Ù×ÏÄÅ × ÆÏÒÍÁÔÅ HTML ×ËÌÀÞÅÎ --ifhtml É ×ÙËÌÀÞÅÎÙ ÏÓÔÁÌØÎÙÅ; ÐÒÉ ×Ù×ÏÄÅ ×\n" -"ÆÏÒÍÁÔÅ Info ÉÌÉ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ, ×ËÌÀÞÅÎ --ifinfo É ×ÙËÌÀÞÅÎÙ ÏÓÔÁÌØÎÙÅ.\n" -"\n" "ðÒÉÍÅÒÙ:\n" " makeinfo foo.texi ÚÁÐÉÓÁÔØ Info × @setfilename ÉÚ foo\n" " makeinfo --html foo.texi ÚÁÐÉÓÁÔØ HTML × @setfilename ÉÚ foo\n" +" makeinfo --xml foo.texi ÚÁÐÉÓÁÔØ XML × @setfilename\n" +" makeinfo --docbook foo.texi ÚÁÐÉÓÁÔØ DocBook XML × @setfilename\n" " makeinfo --no-headers -o - foo.texi ÚÁÐÉÓÁÔØ ÐÒÏÓÔÏÊ ÔÅËÓÔ ÎÁ " "ÓÔÁÎÄÁÒÔÎÙÊ\n" " ×Ù×ÏÄ\n" +"\n" +" makeinfo --html --no-headers foo.texi ÚÁÐÉÓÁÔØ HTML ÂÅÚ ÍÅÎÀ É ÓÔÒÏË ÎÏÄÙ\n" " makeinfo --number-sections foo.texi ÚÁÐÉÓÁÔØ Info Ó ÎÕÍÅÒÏ×ÁÎÎÙÍÉ " "ÒÁÚÄÅÌÁÍÉ\n" " makeinfo --no-split foo.texi ÚÁÐÉÓÁÔØ ÏÄÉÎ ÂÏÌØÛÏÊ Info\n" -"\n" -"ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ bug-texinfo@gnu.org,\n" -"ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ help-texinfo@gnu.org." -#: makeinfo/makeinfo.c:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655 +#: makeinfo/makeinfo.c:676 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n" -#: makeinfo/makeinfo.c:521 +#: makeinfo/makeinfo.c:583 #, c-format msgid "Couldn't open macro expansion output `%s'" msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:586 msgid "Cannot specify more than one macro expansion output" msgstr "íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:624 #, 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:602 +#: makeinfo/makeinfo.c:665 #, 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:647 +#: makeinfo/makeinfo.c:723 #, c-format msgid "%s: missing file argument.\n" msgstr "%s: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ, ÚÁÄÁÀÝÉÊ ÆÁÊÌ.\n" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:898 #, c-format msgid "Expected `%s'" msgstr "ïÖÉÄÁÅÔÓÑ `%s'" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1365 +msgid "File exists, but is not a directory" +msgstr "æÁÊÌ ÓÕÝÅÓÔ×ÕÅÔ, ÎÏ ÎÅ Ñ×ÌÑÅÔÓÑ ËÁÔÁÌÏÇÏÍ" + +#: makeinfo/makeinfo.c:1366 +#, c-format +msgid "Can't create directory `%s': %s" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s" + +#: makeinfo/makeinfo.c:1414 #, c-format msgid "No `%s' found in `%s'" msgstr "`%s' ÎÅ ÎÁÊÄÅÎ × `%s'" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1496 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" "%s: òÁÓËÒÙÔÉÅ ÍÁËÒÏÓÏ× × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ,\n" "ÔÁË ËÁË ÔÕÄÁ ÎÁÐÒÁ×ÌÅÎ ×Ù×ÏÄ × ÆÏÒÍÁÔÅ Info.\n" -#: makeinfo/makeinfo.c:1327 +#: makeinfo/makeinfo.c:1526 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "óÏÚÄÁÎÉÅ %s-ÆÁÊÌÁ `%s' ÉÚ `%s'.\n" -#: makeinfo/makeinfo.c:1358 +#: makeinfo/makeinfo.c:1561 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "üÔÏ %s, ÓÏÚÄÁÎÎÙÊ makeinfo ×ÅÒÓÉÉ %s ÉÚ %s.\n" -#: makeinfo/makeinfo.c:1377 +#: makeinfo/makeinfo.c:1583 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" @@ -1988,262 +2401,308 @@ msgstr "" "%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÊ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n" "ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n" -#. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1627 #, 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:1635 +#: makeinfo/makeinfo.c:1853 #, c-format msgid "Unknown command `%s'" msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'" -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1875 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" "éÓÐÏÌØÚÕÊÔÅ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ, ÞÔÏÂÙ ÐÅÒÅÄÁÔØ @%s ËÏÍÁÎÄÕ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ" -#: makeinfo/makeinfo.c:1838 +#: makeinfo/makeinfo.c:2068 #, c-format msgid "%c%s expected `{...}'" msgstr "%c%s ÐÏÄÒÁÚÕÍÅ×ÁÅÔ `{...}'" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:2098 msgid "Unmatched }" msgstr "îÅÐÁÒÎÁÑ }" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:2148 msgid "NO_NAME!" msgstr "âåú_éíåîé!" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:2169 #, c-format msgid "%c%s missing close brace" msgstr "%c%s ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÓËÏÂËÁ" -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 +#: makeinfo/makeinfo.c:2958 +msgid "First argument to cross-reference may not be empty" +msgstr "ðÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ ÐÅÒÅËÒÅÓÔÎÏÊ ÓÓÙÌËÉ ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÕÓÔÙÍ" + +#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340 msgid "see " msgstr "ÓÍÏÔÒÉÔÅ " -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:3018 msgid "See " msgstr "óÍÏÔÒÉÔÅ " -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:3164 #, c-format msgid "`.' or `,' must follow cross reference, not %c" msgstr "ÐÏÓÌÅ ÓÓÙÌËÉ ÄÏÌÖÎÙ ÓÌÅÄÏ×ÁÔØ `.' ÉÌÉ `,', ×ÓÔÒÅÞÅÎÏ %c" -#: makeinfo/makeinfo.c:3026 +#: makeinfo/makeinfo.c:3212 +msgid "First argument to @inforef may not be empty" +msgstr "ðÅÒ×ÙÊ ÁÒÇÕÍÅÎÔ @inforef ÎÅ ÍÏÖÅÔ ÂÙÔØ ÐÕÓÔÙÍ" + +#: makeinfo/makeinfo.c:3427 #, c-format -msgid "No .png or .jpg for `%s'" -msgstr "äÌÑ `%s' ÎÅ ÎÁÊÄÅÎ .png ÉÌÉ .jpg" +msgid "@image file `%s' (for HTML) not readable: %s" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ HTML): %s" -#: makeinfo/makeinfo.c:3063 +#: makeinfo/makeinfo.c:3440 #, c-format -msgid "@image file `%s' unreadable: %s" -msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s" +msgid "No `%s.png' or `.jpg', and no extension supplied" +msgstr "îÅ ÎÁÊÄÅÎ ÆÁÊÌ `%s.png' ÉÌÉ `.jpg', Á ÒÁÓÛÉÒÅÎÉÅ ÎÅ ÚÁÄÁÎÏ" + +#: makeinfo/makeinfo.c:3490 +#, c-format +msgid "@image file `%s' (for text) unreadable: %s" +msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ ÔÅËÓÔÁ): %s" -#: makeinfo/makeinfo.c:3070 +#: makeinfo/makeinfo.c:3497 msgid "@image missing filename argument" msgstr "ÐÏÓÌÅ @image ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ ÚÁÄÁÀÝÉÊ ÆÁÊÌ " -#: makeinfo/makeinfo.c:3259 +#: makeinfo/makeinfo.c:3690 #, c-format msgid "{No value for `%s'}" msgstr "{úÎÁÞÅÎÉÅ `%s' ÎÅ ÚÁÄÁÎÏ}" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3744 #, c-format msgid "%c%s requires a name" msgstr "ËÏÍÁÎÄÅ %c%s ÎÕÖÎÏ ÕËÁÚÁÔØ ÉÍÑ" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3850 #, c-format msgid "Reached eof before matching @end %s" msgstr "ëÏÎÅà ÆÁÊÌÁ ÒÁÎØÛÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ËÏÍÁÎÄÙ @end %s" -#: makeinfo/multi.c:208 +#: makeinfo/makeinfo.c:4081 +#, c-format +msgid "`%.40s...' is too long for expansion; not expanded" +msgstr "`%.40s...' ÓÌÉÛËÏÍ ×ÅÌÉËÏ; ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ" + +#: makeinfo/multi.c:226 msgid "Missing } in @multitable template" msgstr "÷ ÛÁÂÌÏÎÅ @multitable ÐÒÏÐÕÝÅÎÁ `}'" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:302 #, c-format msgid "ignoring stray text `%s' after @multitable" msgstr "ÔÅËÓÔ `%s' ÐÏÓÌÅ @multitable ÉÇÎÏÒÉÒÏ×ÁÎ" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:375 #, c-format msgid "Too many columns in multitable item (max %d)" msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ËÏÌÏÎÏË × ÜÌÅÍÅÎÔÅ ÔÁÂÌÉÃÙ (ÍÁËÓÉÍÕÍ %d)" -#: makeinfo/multi.c:401 +#: makeinfo/multi.c:426 #, c-format msgid "Cannot select column #%d in multitable" msgstr "îÅ×ÏÚÍÏÖÎÏ ×ÙÂÒÁÔØ ËÏÌÏÎËÕ %d × ÔÁÂÌÉÃÅ" -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:529 msgid "ignoring @tab outside of multitable" msgstr "@tab ×ÎÅ ÔÁÂÌÉÃÙ ÉÇÎÏÒÉÒÏ×ÁÎ" # ??? -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:565 msgid "** Multicolumn output from last row:\n" msgstr "á ÚÁÞÅÍ Ñ ÄÏÌÖÅÎ ÜÔÏ ÐÅÒÅ×ÏÄÉÔØ?\n" -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:568 #, c-format msgid "* column #%d: output = %s\n" msgstr "* ËÏÌÏÎËÁ %d: ×Ù×ÏÄ = %s\n" -#: makeinfo/node.c:250 +#: makeinfo/node.c:276 #, c-format msgid "Node `%s' previously defined at line %d" msgstr "îÏÄÁ `%s' ÂÙÌÁ ÒÁÎÅÅ ÏÐÒÅÄÅÌÅÎÁ × ÓÔÒÏËÅ %d" -#: makeinfo/node.c:514 +#: makeinfo/node.c:594 #, c-format msgid "Formatting node %s...\n" msgstr "æÏÒÍÁÔÉÒÏ×ÁÎÉÅ ÎÏÄÙ %s...\n" -#: makeinfo/node.c:559 +#: makeinfo/node.c:655 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" msgstr "äÌÑ ÎÏÄÙ `%s' ÔÒÅÂÕÅÔÓÑ ËÏÍÁÎÄÁ ÏÐÉÓÁÎÉÑ ÓÔÒÕËÔÕÒÙ ÇÌÁ× (e.g. %c%s)" -#: makeinfo/node.c:719 +#: makeinfo/node.c:815 #, c-format msgid "No node name specified for `%c%s' command" msgstr "äÌÑ ËÏÍÁÎÄÙ `%c%s' ÎÅ ÚÁÄÁÎÏ ÉÍÑ ÎÏÄÙ" -#: makeinfo/node.c:774 +#: makeinfo/node.c:856 makeinfo/node.c:1075 +#, c-format +msgid "Anchor `%s' and node `%s' map to the same file name" +msgstr "íÁÒËÅÒ `%s' É ÎÏÄÁ `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ" + +#: makeinfo/node.c:859 +msgid "This @anchor command ignored; references to it will not work" +msgstr "äÁÎÎÁÑ ËÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ" + +#: makeinfo/node.c:861 makeinfo/node.c:1078 +msgid "Rename this anchor or use the `--no-split' option" +msgstr "ðÅÒÅÉÍÅÎÕÊÔÅ ÜÔÏÔ ÍÁÒËÅÒ ÉÌÉ ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ `--no-split'" + +#: makeinfo/node.c:891 +#, c-format +msgid "Unexpected string at end of split-HTML file `%s'" +msgstr "îÅÏÖÉÄÁÎÎÁÑ ÓÔÒÏËÁ × ËÏÎÃÅ ÒÁÚÂÉÔÏÇÏ HTML-ÆÁÊÌÁ `%s'" + +#: makeinfo/node.c:920 msgid "Node:" msgstr "óÌÅÄÕÀÝÁÑ:" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 +#: makeinfo/node.c:930 msgid "Next:" msgstr "óÌÅÄÕÀÝÁÑ:" -#: makeinfo/node.c:793 +#: makeinfo/node.c:940 msgid "Previous:" msgstr "ðÒÅÄÙÄÕÝÁÑ:" -#: makeinfo/node.c:803 +#: makeinfo/node.c:950 msgid "Up:" msgstr "÷×ÅÒÈ:" +#: makeinfo/node.c:1072 +#, c-format +msgid "Anchors `%s' and `%s' map to the same file name" +msgstr "íÁÒËÅÒÙ `%s' É `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ" + +#: makeinfo/node.c:1077 +msgid "@anchor command ignored; references to it will not work" +msgstr "ëÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ" + # ÚÄÅÓØ %s ÍÏÖÅÔ ÂÙÔØ `cross' ÉÌÉ `menu' -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1277 #, c-format msgid "%s reference to nonexistent node `%s'" msgstr "%s ÎÁ ÎÅÓÕÝÅÓÔ×ÕÀÝÕÀ ÎÏÄÕ `%s'" -#: makeinfo/node.c:1029 +#: makeinfo/node.c:1294 msgid "Menu" msgstr "óÓÙÌËÁ ÉÚ ÍÅÎÀ" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1296 msgid "Cross" msgstr "ðÅÒÅËÒÅÓÔÎÁÑ ÓÓÙÌËÁ" -#: makeinfo/node.c:1115 +#: makeinfo/node.c:1380 #, c-format msgid "Next field of node `%s' not pointed to" msgstr "îÁ ÐÏÌÅ Next ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1383 #, c-format msgid "This node (%s) has the bad Prev" msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Prev" -#: makeinfo/node.c:1133 +#: makeinfo/node.c:1395 msgid "Prev" msgstr "ðÒÅÄÙÄÕÝÁÑ" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1438 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "îÁ ÐÏÌÅ Prev ÎÏÄÙ `%s' ÎÅÔ ÓÓÙÌÏË" -#: makeinfo/node.c:1180 +#: makeinfo/node.c:1442 #, c-format msgid "This node (%s) has the bad Next" msgstr "÷ ÜÔÏÊ ÎÏÄÅ (%s) ÎÅÐÒÁ×ÉÌØÎÙÊ ÕËÁÚÁÔÅÌØ Next" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1454 #, c-format msgid "`%s' has no Up field" msgstr "÷ ÎÏÄÅ `%s' ÎÅÔ ÐÏÌÑ Up" -#: makeinfo/node.c:1197 +#: makeinfo/node.c:1457 msgid "Up" msgstr "÷×ÅÒÈ" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1523 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "îÏÄÁ `%s' ÎÅ ÉÍÅÅÔ ÐÕÎËÔÁ ÍÅÎÀ ÄÌÑ `%s', ÈÏÔÑ ÎÁ ÎÅÅ ÓÓÙÌÁÅÔÓÑ ÐÏÌÅ Up" -#: makeinfo/node.c:1296 +#: makeinfo/node.c:1552 #, c-format msgid "node `%s' has been referenced %d times" msgstr "ÎÁ ÎÏÄÕ `%s' ÐÏÑ×ÉÌÏÓØ %d ÓÓÙÌÏË" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1566 #, c-format msgid "unreferenced node `%s'" msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " msgstr "ðÒÉÌÏÖÅÎÉÅ %c " -#. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" msgstr "÷ÎÕÔÒÅÎÎÑÑ ÏÛÉÂËÁ (search_sectioning) \"%s\"!" -#: makeinfo/sectioning.c:468 +#: makeinfo/sectioning.c:502 #, c-format msgid "%c%s is obsolete; use %c%s instead" msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ; ÉÓÐÏÌØÚÕÊÔÅ ×ÍÅÓÔÏ ÎÅÅ %c%s" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:518 #, c-format msgid "Node with %ctop as a section already exists" msgstr "îÏÄÁ Ó %ctop × ËÁÞÅÓÔ×Å ÒÁÚÄÅÌÁ ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ" -#: makeinfo/sectioning.c:496 +#: makeinfo/sectioning.c:526 #, c-format msgid "Here is the %ctop node" msgstr "úÄÅÓØ ÎÁÈÏÄÉÔÓÑ ÎÏÄÁ %ctop" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:543 #, c-format msgid "%ctop used before %cnode, defaulting to %s" msgstr "%ctop ×ÓÔÒÅÞÅÎÁ ÐÅÒÅÄ %cnode, ÐÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ %s" -#. in case we are writing stdout -#: makeinfo/toc.c:212 makeinfo/toc.c:261 makeinfo/toc.c:262 +#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299 msgid "Table of Contents" msgstr "óÏÄÅÒÖÁÎÉÅ" -#. in case we are writing stdout -#: makeinfo/toc.c:292 makeinfo/toc.c:319 makeinfo/toc.c:320 +#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367 msgid "Short Contents" msgstr "ëÒÁÔËÏÅ ÓÏÄÅÒÖÁÎÉÅ" -#: makeinfo/toc.c:354 +#: makeinfo/toc.c:406 #, c-format msgid "%s: TOC should be here, but it was not found" msgstr "%s: ÚÄÅÓØ ÄÏÌÖÎÏ ÂÙÔØ ÓÏÄÅÒÁÖÁÎÉÅ, ÎÏ ÏÎÏ ÎÅ ÎÁÊÄÅÎÏ" +#: makeinfo/xml.c:1108 +#, c-format +msgid "@image file `%s' unreadable: %s" +msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s" + #: util/install-info.c:151 #, c-format msgid "%s: warning: " @@ -2298,9 +2757,6 @@ msgid "" " If you don't specify any sections, they are determined\n" " from information in the Info file itself.\n" " --version display version information and exit.\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... [INFO-æáêì [DIR-æáêì]]\n" "\n" @@ -2308,41 +2764,38 @@ msgstr "" "ÆÁÊÌÁ-ËÁÔÁÌÏÇÁ Info DIR-æáêì.\n" "\n" "ëÌÀÞÉ:\n" -"--delete ÕÄÁÌÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ×ÈÏÖÄÅÎÉÑ ÄÌÑ INFO-æáêìá ÉÚ " -"DIR-æáêìá;\n" -" ÎÅ ×ÓÔÁ×ÌÑÔØ ÎÏ×ÙÅ ×ÈÏÖÄÅÎÉÑ.\n" -"--dir-file=éíñ ÚÁÄÁÅÔ ÉÍÑ ËÁÔÁÌÏÇÅ Info,\n" -" ÜË×É×ÁÌÅÎÔÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÁÒÇÕÍÅÎÔÁ DIR-æáêì.\n" -"--entry=ôåëóô ×ÓÔÁ×ÉÔØ ôåëóô × ËÁÞÅÓÔ×Å ×ÈÏÖÄÅÎÉÑ ËÁÔÁÌÏÇÁ Info.\n" -" ôÅËÓÔ ÄÏÌÖÅÎ ÉÍÅÔØ ÆÏÒÍÕ ÐÕÎËÔÁ ÍÅÎÀ ÐÌÀÓ (×ÏÚÍÏÖÎÏ)\n" -" ÎÅÓËÏÌØËÏ ÓÔÒÏË, ÎÁÞÉÎÁÀÝÉÈÓÑ ÐÒÏÂÅÌØÎÙÍÉ ÓÉÍ×ÏÌÁÍÉ. åÓÌÉ " -"×Ù\n" -" ÚÁÄÁÄÉÔÅ ÎÅÓËÏÌØËÏ ×ÈÏÖÄÅÎÉÊ, ×ÓÅ ÏÎÉ ÂÕÄÕÔ ×ÓÔÁ×ÌÅÎÙ. " +" --delete ÕÄÁÌÉÔØ ÓÕÝÅÓÔ×ÕÀÝÉÅ ×ÈÏÖÄÅÎÉÑ ÄÌÑ INFO-æáêìá ÉÚ DIR-" +"æáêìá;\n" +" ÎÅ ×ÓÔÁ×ÌÑÔØ ÎÏ×ÙÅ ×ÈÏÖÄÅÎÉÑ.\n" +" --dir-file=éíñ ÚÁÄÁÅÔ ÉÍÑ ËÁÔÁÌÏÇÅ Info,\n" +" ÜË×É×ÁÌÅÎÔÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÁÒÇÕÍÅÎÔÁ DIR-æáêì.\n" +" --entry=ôåëóô ×ÓÔÁ×ÉÔØ ôåëóô × ËÁÞÅÓÔ×Å ×ÈÏÖÄÅÎÉÑ ËÁÔÁÌÏÇÁ Info.\n" +" ôÅËÓÔ ÄÏÌÖÅÎ ÉÍÅÔØ ÆÏÒÍÕ ÐÕÎËÔÁ ÍÅÎÀ ÐÌÀÓ (×ÏÚÍÏÖÎÏ)\n" +" ÎÅÓËÏÌØËÏ ÓÔÒÏË, ÎÁÞÉÎÁÀÝÉÈÓÑ ÐÒÏÂÅÌØÎÙÍÉ ÓÉÍ×ÏÌÁÍÉ. " +"åÓÌÉ ×Ù\n" +" ÚÁÄÁÄÉÔÅ ÎÅÓËÏÌØËÏ ×ÈÏÖÄÅÎÉÊ, ×ÓÅ ÏÎÉ ÂÕÄÕÔ ×ÓÔÁ×ÌÅÎÙ. " "åÓÌÉ\n" -" ×Ù ÎÅ ÚÁÄÁÄÉÔÅ ×ÈÏÖÄÅÎÉÊ, ÂÕÄÅÔ ×ÓÔÁ×ÌÅÎ ÔÅËÓÔ ÉÚ " -"Info-ÆÁÊÌÁ.\n" -"--help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n" -"--info-file=æáêì ÚÁÄÁÅÔ ÉÍÑ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÏÇÏ Info-ÆÁÊÌÁ,\n" -" ÜË×É×ÁÌÅÎÔÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÁÒÇÕÍÅÎÔÁ INFO-æáêì.\n" -"--info-dir=éíñ ÓÉÎÏÎÉÍ --dir-file=éíñ/dir.\n" -"--item=ôåëóô ÓÉÎÏÎÉÍ --entry ôåëóô.\n" -" ÷ÈÏÖÄÅÎÉÅ ËÁÔÁÌÏÇÁ Info ÎÁ ÓÁÍÏÍ ÄÅÌÅ Ñ×ÌÑÅÔÓÑ ÐÕÎËÔÏÍ " +" ×Ù ÎÅ ÚÁÄÁÄÉÔÅ ×ÈÏÖÄÅÎÉÊ, ÂÕÄÅÔ ×ÓÔÁ×ÌÅÎ ÔÅËÓÔ ÉÚ Info-" +"ÆÁÊÌÁ.\n" +" --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n" +" --info-file=æáêì ÚÁÄÁÅÔ ÉÍÑ ÕÓÔÁÎÁ×ÌÉ×ÁÅÍÏÇÏ Info-ÆÁÊÌÁ,\n" +" ÜË×É×ÁÌÅÎÔÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ ÁÒÇÕÍÅÎÔÁ INFO-æáêì.\n" +" --info-dir=éíñ ÓÉÎÏÎÉÍ --dir-file=éíñ/dir.\n" +" --item=ôåëóô ÓÉÎÏÎÉÍ --entry ôåëóô.\n" +" ÷ÈÏÖÄÅÎÉÅ ËÁÔÁÌÏÇÁ Info ÎÁ ÓÁÍÏÍ ÄÅÌÅ Ñ×ÌÑÅÔÓÑ ÐÕÎËÔÏÍ " "ÍÅÎÀ.\n" -"--quiet ÎÅ ×Ù×ÏÄÉÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ.\n" -"--remove ÓÉÎÏÎÉÍ --delete.\n" -"--section=óåë ÐÏÍÅÓÔÉÔØ ×ÈÏÖÄÅÎÉÑ × ÚÁÄÁÎÎÕÀ ÓÅËÃÉÀ ËÁÔÁÌÏÇÁ.\n" -" åÓÌÉ ×Ù ÚÁÄÁÄÉÔÅ ÎÅÓËÏÌØËÏ ÓÅËÃÉÊ, ×ÈÏÖÄÅÎÉÑ ÂÕÄÕÔ " +" --quiet ÎÅ ×Ù×ÏÄÉÔØ ÐÒÅÄÕÐÒÅÖÄÅÎÉÑ.\n" +" --remove ÓÉÎÏÎÉÍ --delete.\n" +" --section=óåë ÐÏÍÅÓÔÉÔØ ×ÈÏÖÄÅÎÉÑ × ÚÁÄÁÎÎÕÀ ÓÅËÃÉÀ ËÁÔÁÌÏÇÁ.\n" +" åÓÌÉ ×Ù ÚÁÄÁÄÉÔÅ ÎÅÓËÏÌØËÏ ÓÅËÃÉÊ, ×ÈÏÖÄÅÎÉÑ ÂÕÄÕÔ " "×ÓÔÁ×ÌÅÎÙ ×\n" -" ËÁÖÄÕÀ. åÓÌÉ ×Ù ÎÅ ÚÁÄÁÄÉÔÅ ÓÅËÃÉÊ, ×ÈÏÖÄÅÎÉÑ ÂÕÄÕÔ " +" ËÁÖÄÕÀ. åÓÌÉ ×Ù ÎÅ ÚÁÄÁÄÉÔÅ ÓÅËÃÉÊ, ×ÈÏÖÄÅÎÉÑ ÂÕÄÕÔ " "×ÓÔÁ×ÌÅÎÙ\n" -" × ÓÅËÃÉÉ, ÚÁÄÁÎÎÙÅ × Info-ÆÁÊÌÅ.\n" -"--version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n" -"\n" -"ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ <bug-texinfo@gnu.org>,\n" -"ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ <help-texinfo@gnu.org>.\n" +" × ÓÅËÃÉÉ, ÚÁÄÁÎÎÙÅ × Info-ÆÁÊÌÅ.\n" +" --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n" -#: util/install-info.c:442 -#, fuzzy, c-format +#: util/install-info.c:444 +#, c-format msgid "" "This is the file .../info/dir, which contains the\n" "topmost node of the Info hierarchy, called (dir)Top.\n" @@ -2363,7 +2816,7 @@ msgstr "" "üÔÏ ÆÁÊÌ .../info/dir, ÓÏÄÅÒÖÁÝÉÊ ËÏÒÎÅ×ÕÀ ÎÏÄÕ ÉÅÒÁÒÈÉÉ Info,\n" "ÎÁÚÙ×ÁÅÍÕÀ (dir)Top. ðÒÉ ×ÙÚÏ×Å Info ×Ù ×ÉÄÉÔÅ ÜÔÕ ÎÏÄÕ.\n" " \n" -"File: dir,\tNode: Top,\tüÔÏ ËÏÒÎÅ×ÁÑ ÎÏÄÁ ÉÅÒÁÒÈÉÉ Info\n" +"%s üÔÏ ËÏÒÎÅ×ÁÑ ÎÏÄÁ ÉÅÒÁÒÈÉÉ Info\n" "\n" " úÄÅÓØ (× ËÁÔÁÌÏÇÅ Info) ÐÒÅÄÓÔÁ×ÌÅÎÏ ÍÅÎÀ ÐÏ ÏÓÎÏ×ÎÙÍ ÔÅÍÁÍ.\n" " îÁÖÍÉÔÅ \"q\" ÞÔÏÂÙ ×ÙÊÔÉ, \"?\" ÞÔÏÂÙ ÐÏÓÍÏÔÒÅÔØ ×ÓÅ ËÏÍÁÎÄÙ Info,\n" @@ -2376,109 +2829,103 @@ msgstr "" "\n" "* Menu:\n" -#: util/install-info.c:465 +#: util/install-info.c:467 #, c-format msgid "%s: could not read (%s) and could not create (%s)\n" msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ (%s) É ÓÏÚÄÁÔØ (%s)\n" -#: util/install-info.c:549 +#: util/install-info.c:551 #, c-format msgid "%s: empty file" msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ" -#: util/install-info.c:864 util/install-info.c:904 +#: util/install-info.c:866 util/install-info.c:906 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY" msgstr "START-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ END-INFO-DIR-ENTRY" -#: util/install-info.c:899 +#: util/install-info.c:901 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY" msgstr "END-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ START-INFO-DIR-ENTRY" -#: util/install-info.c:1147 util/install-info.c:1157 +#: util/install-info.c:1150 util/install-info.c:1160 #, c-format msgid "%s: Specify the Info directory only once.\n" msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ ËÁÔÁÌÏÇ Info.\n" -#: util/install-info.c:1192 +#: util/install-info.c:1195 #, c-format msgid "%s: Specify the Info file only once.\n" msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ Info-ÆÁÊÌ.\n" -#: util/install-info.c:1241 +#: util/install-info.c:1244 #, c-format msgid "excess command line argument `%s'" msgstr "ÉÚÌÉÛÎÉÊ ÁÒÇÕÍÅÎÔ `%s'" -#: util/install-info.c:1245 +#: util/install-info.c:1248 msgid "No input file specified; try --help for more information." msgstr "" "îÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ.\n" "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ." -#: util/install-info.c:1247 +#: util/install-info.c:1251 msgid "No dir file specified; try --help for more information." msgstr "" "îÅ ÚÁÄÁÎ ÆÁÊÌ ËÁÔÁÌÏÇÁ.\n" "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ." -#. No need to abort here, the original info file may not -#. have the requisite Texinfo commands. This is not -#. something an installer should have to correct (it's a -#. problem for the maintainer), and there's no need to cause -#. subsequent parts of `make install' to fail. -#: util/install-info.c:1269 +#: util/install-info.c:1273 #, c-format msgid "no info dir entry in `%s'" msgstr "× `%s' ÎÅÔ ×ÈÏÖÄÅÎÉÑ ÄÌÑ ËÁÔÁÌÏÇÁ Info" -#: util/install-info.c:1384 +#: util/install-info.c:1388 #, c-format msgid "menu item `%s' already exists, for file `%s'" msgstr "ÐÕÎËÔ ÍÅÎÀ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ, ÄÌÑ ÆÁÊÌÁ `%s'" -#: util/install-info.c:1407 +#: util/install-info.c:1411 #, c-format msgid "no entries found for `%s'; nothing deleted" msgstr "ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ ÄÌÑ `%s'; ÎÉÞÅÇÏ ÎÅ ÕÄÁÌÅÎÏ" -#: util/texindex.c:244 +#: util/texindex.c:245 msgid "display this help and exit" msgstr "ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ" -#: util/texindex.c:246 +#: util/texindex.c:247 msgid "keep temporary files around after processing" msgstr "ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ ÐÏÓÌÅ ÒÁÂÏÔÙ" -#: util/texindex.c:248 +#: util/texindex.c:249 msgid "do not keep temporary files around after processing (default)" msgstr "ÎÅ ÓÏÈÒÁÎÑÔØ ×ÒÅÍÅÎÎÙÅ ÆÁÊÌÙ (ÐÏ ÕÍÏÌÞÁÎÉÀ)" -#: util/texindex.c:250 +#: util/texindex.c:251 msgid "send output to FILE" msgstr "ÚÁÐÉÓÁÔØ ×Ù×ÏÄ × æáêì" -#: util/texindex.c:252 +#: util/texindex.c:253 msgid "display version information and exit" msgstr "ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ" -#: util/texindex.c:263 +#: util/texindex.c:264 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... æáêì...\n" -#: util/texindex.c:264 +#: util/texindex.c:265 msgid "Generate a sorted index for each TeX output FILE.\n" msgstr "" "óÏÚÄÁÅÔ ÓÏÒÔÉÒÏ×ÁÎÎÙÊ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ ÄÌÑ\n" "ËÁÖÄÏÇÏ ×ÙÈÏÄÎÏÇÏ TeX-ÆÁÊÌÁ.\n" -#: util/texindex.c:267 +#: util/texindex.c:268 #, c-format msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n" msgstr "æáêì... ÄÌÑ ÄÏËÕÍÅÎÔÁ `foo.texi' ÏÂÙÞÎÏ ÚÁÄÁÅÔÓÑ ËÁË `foo.%c%c'.\n" -#. avoid trigraph in cat-id-tbl.c -#: util/texindex.c:269 +#: util/texindex.c:270 msgid "" "\n" "Options:\n" @@ -2486,104 +2933,28 @@ msgstr "" "\n" "ëÌÀÞÉ:\n" -#: util/texindex.c:285 -msgid "" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" -msgstr "" -"\n" -"ï ÏÛÉÂËÁÈ ÓÏÏÂÝÁÊÔÅ ÐÏ ÁÄÒÅÓÕ bug-texinfo@gnu.org,\n" -"ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ help-texinfo@gnu.org.\n" - -#: util/texindex.c:885 util/texindex.c:919 util/texindex.c:995 -#: util/texindex.c:1023 +#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997 +#: util/texindex.c:1025 #, c-format msgid "%s: not a texinfo index file" msgstr "%s: ÎÅ texinfo-ÆÁÊÌ Ó ÁÌÆÁ×ÉÔÎÙÍ ÕËÁÚÁÔÅÌÅÍ" -#: util/texindex.c:980 +#: util/texindex.c:982 #, c-format msgid "failure reopening %s" msgstr "ÏÛÉÂËÁ ÐÏ×ÔÏÒÎÏÇÏ ÏÔËÒÙÔÉÑ %s" -#: util/texindex.c:1222 +#: util/texindex.c:1224 #, c-format msgid "No page number in %s" msgstr "÷ %s ÎÅÔ ÎÏÍÅÒÁ ÓÔÒÁÎÉÃÙ" -#: util/texindex.c:1293 +#: util/texindex.c:1295 #, c-format msgid "entry %s follows an entry with a secondary name" msgstr "ÚÁ ×ÈÏÖÄÅÎÉÅÍ %s ÓÌÅÄÕÅÔ ×ÈÏÖÄÅÎÉÅ Ó ×ÔÏÒÉÞÎÙÍ ÉÍÅÎÅÍ" -#: util/texindex.c:1631 +#: util/texindex.c:1633 #, c-format msgid "%s; for file `%s'.\n" msgstr "%s; ÄÌÑ ÆÁÊÌÁ `%s'.\n" - -#~ msgid "" -#~ "---------- Footnotes ----------\n" -#~ "\n" -#~ msgstr "" -#~ "---------- óÎÏÓËÉ ----------\n" -#~ "\n" - -#~ msgid "" -#~ "Usage: %s [OPTION]... TEXINFO-FILE...\n" -#~ "\n" -#~ "Translate Texinfo source documentation to various other formats:\n" -#~ "Info files suitable for reading online with Emacs or standalone GNU Info\n" -#~ "(by default); plain text (with --no-headers); or HTML (with --html).\n" -#~ "\n" -#~ "Options:\n" -#~ " -D VAR define a variable, as with @set.\n" -#~ " -I DIR append DIR to the @include search path.\n" -#~ " -P DIR prepend DIR to the @include search path.\n" -#~ " -U VAR undefine a variable, as with @clear.\n" -#~ " --commands-in-node-names allow @ commands in node names.\n" -#~ " --error-limit=NUM quit after NUM errors (default %d).\n" -#~ " --fill-column=NUM break Info lines at NUM characters (default %d).\n" -#~ " --footnote-style=STYLE output footnotes according to STYLE:\n" -#~ " `separate' to place footnotes in their own " -#~ "node,\n" -#~ " `end' to place the footnotes at the end of the\n" -#~ " node in which they are defined (the default).\n" -#~ " --force preserve output even if errors.\n" -#~ " --help display this help and exit.\n" -#~ " --html output HTML rather than Info format;\n" -#~ " implies --no-split.\n" -#~ msgstr "" -#~ "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n" -#~ "\n" -#~ "ðÒÅÏÂÒÁÚÕÅÔ ÉÓÈÏÄÎÙÅ Texinfo-ÆÁÊÌÙ × ÒÁÚÌÉÞÎÙÅ ÄÒÕÇÉÅ ÆÏÒÍÁÔÙ: × " -#~ "Info-ÆÁÊÌÙ,\n" -#~ "ËÏÔÏÒÙÅ ÍÏÖÎÏ ÞÉÔÁÔØ × Emacs ÉÌÉ × ÓÁÍÏÓÔÏÑÔÅÌØÎÏÊ ÐÒÏÇÒÁÍÍÅ GNU Info (ÐÏ\n" -#~ "ÕÍÏÌÞÁÎÉÀ), ÐÒÏÓÔÏÊ ÔÅËÓÔ (Ó ËÌÀÞÏÍ --no-headers) ÉÌÉ HTML (Ó --html).\n" -#~ "\n" -#~ "ëÌÀÞÉ:\n" -#~ " -D ðåòåíåîîáñ ÏÐÒÅÄÅÌÉÔØ ÐÅÒÅÍÅÎÎÕÀ, ÁÎÁÌÏÇÉÞÎÏ ÉÓÐÏÌØÚÏ×ÁÎÉÀ " -#~ "@set.\n" -#~ " -I ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç × ËÏÎÅà ÓÐÉÓËÁ ÐÏÉÓËÁ " -#~ "×ËÌÀÞÁÅÍÙÈ\n" -#~ " ÆÁÊÌÏ×.\n" -#~ " -P ëáôáìïç ÄÏÂÁ×ÉÔØ ëáôáìïç × ÎÁÞÁÌÏ ÓÐÉÓËÁ ÐÏÉÓËÁ " -#~ "×ËÌÀÞÁÅÍÙÈ\n" -#~ " ÆÁÊÌÏ×.\n" -#~ " -U ðåòåíåîîáñ ÓÄÅÌÁÔØ ÐÅÒÅÍÅÎÎÕÀ ÎÅÏÐÒÅÄÅÌÅÎÎÏÊ, ÁÎÁÌÏÇÉÞÎÏ\n" -#~ " ÉÓÐÏÌØÚÏ×ÁÎÉÀ @clear.\n" -#~ " --commands-in-node-names ÐÏÚ×ÏÌÉÔØ ÉÓÐÏÌØÚÏ×ÁÎÉÅ @-ËÏÍÁÎÄ × ÉÍÅÎÁÈ ÎÏÄ.\n" -#~ " --error-limit=þéóìï ÏÓÔÁÎÏ×ÉÔØÓÑ ÐÏÓÌÅ þéóìá ÏÛÉÂÏË (ÐÏ ÕÍÏÌÞÁÎÉÀ " -#~ "%d).\n" -#~ " --fill-column=þéóìï ÒÁÚÂÉ×ÁÔØ ÓÔÒÏËÉ ÄÌÉÎÎÅÅ þéóìá ÓÉÍ×ÏÌÏ× (ÐÏ\n" -#~ " ÕÍÏÌÞÁÎÉÀ %d).\n" -#~ " --footnote-style=óôéìø ×Ù×ÏÄÉÔØ ÓÎÏÓËÉ ÏÄÎÉÍ ÉÚ óôéìåê:\n" -#~ " `separate' ÐÏÍÅÝÁÔØ ÓÎÏÓËÉ × ÏÔÄÅÌØÎÕÀ ÎÏÄÕ,\n" -#~ " `end' ÐÏÍÅÝÁÔØ ÓÎÏÓËÉ × ËÏÎÅà ÎÏÄÙ, ÇÄÅ ÏÎÉ " -#~ "ÂÙÌÉ\n" -#~ " ÏÐÒÅÄÅÌÅÎÙ (ÐÏ ÕÍÏÌÞÁÎÉÀ)\n" -#~ " --force ÓÏÈÒÁÎÑÔØ ×Ù×ÏÄ, ÄÁÖÅ ÅÓÌÉ ÂÙÌÉ ÏÛÉÂËÉ.\n" -#~ " --help ÐÏËÁÚÁÔØ ÜÔÕ ÓÐÒÁ×ËÕ É ×ÙÊÔÉ.\n" -#~ " --html ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ HTML, Á ÎÅ Info; " -#~ "ÐÏÄÒÁÚÕÍÅ×ÁÅÔ\n" -#~ " --no-split\n" diff --git a/gnu/usr.bin/texinfo/po/texinfo.pot b/gnu/usr.bin/texinfo/po/texinfo.pot index dc6b949f3b5..7e27b4f93d1 100644 --- a/gnu/usr.bin/texinfo/po/texinfo.pot +++ b/gnu/usr.bin/texinfo/po/texinfo.pot @@ -1,30 +1,25 @@ # SOME DESCRIPTIVE TITLE. # Copyright (C) YEAR Free Software Foundation, Inc. +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-09-25 12:11-0400\n" +"POT-Creation-Date: 2002-04-01 06:10-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" - -#. **************************************************************** -#. -#. Echo Area Movement Commands -#. -#. **************************************************************** -#: info/echo-area.c:283 info/session.c:711 +"Content-Transfer-Encoding: 8bit\n" + +#: info/echo-area.c:283 info/session.c:712 msgid "Move forward a character" msgstr "" -#. Move point backward in the node. -#: info/echo-area.c:295 info/session.c:727 +#: info/echo-area.c:295 info/session.c:728 msgid "Move backward a character" msgstr "" @@ -36,12 +31,11 @@ msgstr "" msgid "Move to the end of this line" msgstr "" -#. Move forward a word in the input line. -#: info/echo-area.c:320 info/session.c:745 +#: info/echo-area.c:320 info/session.c:746 msgid "Move forward a word" msgstr "" -#: info/echo-area.c:360 info/session.c:794 +#: info/echo-area.c:360 info/session.c:795 msgid "Move backward a word" msgstr "" @@ -73,8 +67,6 @@ msgstr "" msgid "Insert a TAB character" msgstr "" -#. Transpose the characters at point. If point is at the end of the line, -#. then transpose the characters before point. #: info/echo-area.c:504 msgid "Transpose characters at point" msgstr "" @@ -87,14 +79,10 @@ msgstr "" msgid "Kill ring is empty" msgstr "" -#. If the last command was yank, or yank_pop, and the text just before -#. point is identical to the current kill item, then delete that text -#. from the line, rotate the index down, and yank back some other text. #: info/echo-area.c:575 msgid "Yank back a previous kill" msgstr "" -#. Delete the text from point to end of line. #: info/echo-area.c:608 msgid "Kill to the end of the line" msgstr "" @@ -103,7 +91,6 @@ msgstr "" msgid "Kill to the beginning of the line" msgstr "" -#. Delete from point to the end of the current word. #: info/echo-area.c:633 msgid "Kill the word following the cursor" msgstr "" @@ -112,43 +99,40 @@ msgstr "" msgid "Kill the word preceding the cursor" msgstr "" -#: info/echo-area.c:871 -msgid "Not complete" +#: info/echo-area.c:872 info/echo-area.c:932 +msgid "No completions" msgstr "" -#: info/echo-area.c:916 -msgid "List possible completions" +#: info/echo-area.c:874 +msgid "Not complete" msgstr "" -#: info/echo-area.c:929 -msgid "No completions" +#: info/echo-area.c:919 +msgid "List possible completions" msgstr "" -#: info/echo-area.c:933 +#: info/echo-area.c:936 msgid "Sole completion" msgstr "" -#: info/echo-area.c:942 +#: info/echo-area.c:945 msgid "One completion:\n" msgstr "" -#: info/echo-area.c:943 +#: info/echo-area.c:946 #, c-format msgid "%d completions:\n" msgstr "" -#: info/echo-area.c:1089 +#: info/echo-area.c:1092 msgid "Insert completion" msgstr "" -#: info/echo-area.c:1222 +#: info/echo-area.c:1225 msgid "Building completions..." msgstr "" -#. Scroll the "other" window. If there is a window showing completions, scroll -#. that one, otherwise scroll the window which was active on entering the read -#. function. -#: info/echo-area.c:1320 +#: info/echo-area.c:1342 msgid "Scroll the completions window" msgstr "" @@ -160,6 +144,10 @@ msgstr "" msgid "Show the footnotes associated with this node in another window" msgstr "" +#: info/footnotes.h:26 +msgid "---------- Footnotes ----------" +msgstr "" + #: info/indices.c:175 msgid "Look up a string in the index for this file" msgstr "" @@ -212,6 +200,11 @@ msgstr "" msgid "Scanning indices of \"%s\"..." msgstr "" +#: info/indices.c:603 +#, c-format +msgid "No available info files have \"%s\" in their indices." +msgstr "" + #: info/indices.c:632 msgid "Grovel all known info file's indices for a string and build a menu" msgstr "" @@ -227,12 +220,12 @@ msgid "" "* Menu: Nodes whoses indices contain \"%s\":\n" msgstr "" -#: info/info.c:248 +#: info/info.c:260 info/infokey.c:884 msgid "Try --help for more information.\n" msgstr "" -#: info/info.c:267 makeinfo/makeinfo.c:616 util/install-info.c:1221 -#: util/texindex.c:336 +#: info/info.c:279 info/infokey.c:139 makeinfo/makeinfo.c:689 +#: util/install-info.c:1224 util/texindex.c:338 #, c-format msgid "" "Copyright (C) %s Free Software Foundation, Inc.\n" @@ -241,12 +234,16 @@ msgid "" "For more information about these matters, see the files named COPYING.\n" msgstr "" -#: info/info.c:461 +#: info/info.c:462 #, c-format msgid "no index entries found for `%s'\n" msgstr "" -#: info/info.c:530 +#: info/info.c:555 +msgid " -b, --speech-friendly be friendly to speech synthesizers.\n" +msgstr "" + +#: info/info.c:562 #, c-format msgid "" "Usage: %s [OPTION]... [MENU-ITEM...]\n" @@ -254,19 +251,21 @@ msgid "" "Read documentation in Info format.\n" "\n" "Options:\n" -" --apropos=SUBJECT look up SUBJECT in all indices of all manuals.\n" -" --directory=DIR add DIR to INFOPATH.\n" -" --dribble=FILENAME remember user keystrokes in FILENAME.\n" -" --file=FILENAME specify Info file to visit.\n" -" --help display this help and exit.\n" -" --index-search=STRING go to node pointed by index entry STRING.\n" -" --node=NODENAME specify nodes in first visited Info file.\n" -" --output=FILENAME output selected nodes to FILENAME.\n" -" --restore=FILENAME read initial keystrokes from FILENAME.\n" -" --show-options, --usage go to command-line options node.\n" -" --subnodes recursively output menu items.\n" -"%s --vi-keys use vi-like and less-like key bindings.\n" -" --version display version information and exit.\n" +" --apropos=STRING look up STRING in all indices of all " +"manuals.\n" +" -d, --directory=DIR add DIR to INFOPATH.\n" +" --dribble=FILENAME remember user keystrokes in FILENAME.\n" +" -f, --file=FILENAME specify Info file to visit.\n" +" -h, --help display this help and exit.\n" +" --index-search=STRING go to node pointed by index entry STRING.\n" +" -n, --node=NODENAME specify nodes in first visited Info file.\n" +" -o, --output=FILENAME output selected nodes to FILENAME.\n" +" -R, --raw-escapes don't remove ANSI escapes from man pages.\n" +" --restore=FILENAME read initial keystrokes from FILENAME.\n" +" -O, --show-options, --usage go to command-line options node.\n" +"%s --subnodes recursively output menu items.\n" +" --vi-keys use vi-like and less-like key bindings.\n" +" --version display version information and exit.\n" "\n" "The first non-option argument, if present, is the menu entry to start from;\n" "it is searched for in all `dir' files along INFOPATH.\n" @@ -280,380 +279,650 @@ msgid "" " info emacs buffers start at buffers node within emacs manual\n" " info --show-options emacs start at node with emacs' command line options\n" " info -f ./foo.info show file ./foo.info, not searching dir\n" +msgstr "" + +#: info/info.c:598 info/infokey.c:903 makeinfo/makeinfo.c:474 +#: util/install-info.c:421 util/texindex.c:286 +msgid "" "\n" "Email bug reports to bug-texinfo@gnu.org,\n" "general questions and discussion to help-texinfo@gnu.org.\n" +"Texinfo home page: http://www.gnu.org/software/texinfo/" msgstr "" -#: info/info.c:604 +#: info/info.c:632 #, c-format msgid "Cannot find node `%s'." msgstr "" -#: info/info.c:605 +#: info/info.c:633 #, c-format msgid "Cannot find node `(%s)%s'." msgstr "" -#: info/info.c:606 +#: info/info.c:634 msgid "Cannot find a window!" msgstr "" -#: info/info.c:607 +#: info/info.c:635 msgid "Point doesn't appear within this window's node!" msgstr "" -#: info/info.c:608 +#: info/info.c:636 msgid "Cannot delete the last window." msgstr "" -#: info/info.c:609 +#: info/info.c:637 msgid "No menu in this node." msgstr "" -#: info/info.c:610 +#: info/info.c:638 msgid "No footnotes in this node." msgstr "" -#: info/info.c:611 +#: info/info.c:639 msgid "No cross references in this node." msgstr "" -#: info/info.c:612 +#: info/info.c:640 #, c-format msgid "No `%s' pointer for this node." msgstr "" -#: info/info.c:613 +#: info/info.c:641 #, c-format msgid "Unknown Info command `%c'; try `?' for help." msgstr "" -#: info/info.c:614 +#: info/info.c:642 #, c-format msgid "Terminal type `%s' is not smart enough to run Info." msgstr "" -#: info/info.c:615 +#: info/info.c:643 msgid "You are already at the last page of this node." msgstr "" -#: info/info.c:616 +#: info/info.c:644 msgid "You are already at the first page of this node." msgstr "" -#: info/info.c:617 +#: info/info.c:645 msgid "Only one window." msgstr "" -#: info/info.c:618 +#: info/info.c:646 msgid "Resulting window would be too small." msgstr "" -#: info/info.c:619 +#: info/info.c:647 msgid "Not enough room for a help window, please delete a window." msgstr "" -#: info/infodoc.c:45 -msgid "Basic Commands in Info Windows\n" -msgstr "" - -#: info/infodoc.c:46 -msgid "******************************\n" +#: info/infodoc.c:45 info/infodoc.c:94 +msgid "" +"Basic Commands in Info Windows\n" +"******************************\n" msgstr "" #: info/infodoc.c:48 -#, c-format -msgid " %-10s Quit this help.\n" +msgid "\\%-10[quit-help] Quit this help.\n" msgstr "" #: info/infodoc.c:49 -#, c-format -msgid " %-10s Quit Info altogether.\n" +msgid "\\%-10[quit] Quit Info altogether.\n" msgstr "" #: info/infodoc.c:50 -#, c-format -msgid " %-10s Invoke the Info tutorial.\n" +msgid "\\%-10[get-info-help-node] Invoke the Info tutorial.\n" msgstr "" -#: info/infodoc.c:52 -msgid "Moving within a node:\n" -msgstr "" - -#: info/infodoc.c:53 -msgid "---------------------\n" +#: info/infodoc.c:52 info/infodoc.c:101 +msgid "" +"Selecting other nodes:\n" +"----------------------\n" msgstr "" #: info/infodoc.c:54 -#, c-format -msgid " %-10s Scroll forward a page.\n" +msgid "\\%-10[next-node] Move to the \"next\" node of this node.\n" msgstr "" #: info/infodoc.c:55 -#, c-format -msgid " %-10s Scroll backward a page.\n" +msgid "\\%-10[prev-node] Move to the \"previous\" node of this node.\n" msgstr "" #: info/infodoc.c:56 -#, c-format -msgid " %-10s Go to the beginning of this node.\n" +msgid "\\%-10[up-node] Move \"up\" from this node.\n" msgstr "" #: info/infodoc.c:57 -#, c-format -msgid " %-10s Go to the end of this node.\n" +msgid "" +"\\%-10[menu-item] Pick menu item specified by name.\n" +" Picking a menu item causes another node to be selected.\n" msgstr "" -#: info/infodoc.c:58 -#, c-format -msgid " %-10s Scroll forward 1 line.\n" +#: info/infodoc.c:59 +msgid "" +"\\%-10[xref-item] Follow a cross reference. Reads name of reference.\n" msgstr "" -#: info/infodoc.c:59 -#, c-format -msgid " %-10s Scroll backward 1 line.\n" +#: info/infodoc.c:60 +msgid "\\%-10[history-node] Move to the last node seen in this window.\n" msgstr "" #: info/infodoc.c:61 -msgid "Selecting other nodes:\n" +msgid "" +"\\%-10[move-to-next-xref] Skip to next hypertext link within this node.\n" msgstr "" #: info/infodoc.c:62 -msgid "----------------------\n" +msgid "" +"\\%-10[move-to-prev-xref] Skip to previous hypertext link within this " +"node.\n" msgstr "" #: info/infodoc.c:63 +msgid "" +"\\%-10[select-reference-this-line] Follow the hypertext link under cursor.\n" +msgstr "" + +#: info/infodoc.c:64 +msgid "" +"\\%-10[dir-node] Move to the `directory' node. Equivalent to `\\[goto-" +"node] (DIR)'.\n" +msgstr "" + +#: info/infodoc.c:65 +msgid "" +"\\%-10[top-node] Move to the Top node. Equivalent to `\\[goto-node] Top'.\n" +msgstr "" + +#: info/infodoc.c:67 info/infodoc.c:115 +msgid "" +"Moving within a node:\n" +"---------------------\n" +msgstr "" + +#: info/infodoc.c:69 +msgid "\\%-10[scroll-forward] Scroll forward a page.\n" +msgstr "" + +#: info/infodoc.c:70 +msgid "\\%-10[scroll-backward] Scroll backward a page.\n" +msgstr "" + +#: info/infodoc.c:71 +msgid "\\%-10[beginning-of-node] Go to the beginning of this node.\n" +msgstr "" + +#: info/infodoc.c:72 +msgid "\\%-10[end-of-node] Go to the end of this node.\n" +msgstr "" + +#: info/infodoc.c:73 +msgid "\\%-10[scroll-forward] Scroll forward 1 line.\n" +msgstr "" + +#: info/infodoc.c:74 +msgid "\\%-10[scroll-backward] Scroll backward 1 line.\n" +msgstr "" + +#: info/infodoc.c:76 info/infodoc.c:124 +msgid "" +"Other commands:\n" +"---------------\n" +msgstr "" + +#: info/infodoc.c:78 +msgid "\\%-10[menu-digit] Pick first ... ninth item in node's menu.\n" +msgstr "" + +#: info/infodoc.c:79 +msgid "\\%-10[last-menu-item] Pick last item in node's menu.\n" +msgstr "" + +#: info/infodoc.c:80 +msgid "" +"\\%-10[index-search] Search for a specified string in the index entries of " +"this Info\n" +" file, and select the node referenced by the first entry " +"found.\n" +msgstr "" + +#: info/infodoc.c:82 +msgid "" +"\\%-10[goto-node] Move to node specified by name.\n" +" You may include a filename as well, as in (FILENAME)NODENAME.\n" +msgstr "" + +#: info/infodoc.c:84 +msgid "" +"\\%-10[search] Search forward for a specified string\n" +" and select the node in which the next occurrence is found.\n" +msgstr "" + +#: info/infodoc.c:86 +msgid "" +"\\%-10[search-backward] Search backward for a specified string\n" +" and select the node in which the previous occurrence is " +"found.\n" +msgstr "" + +#: info/infodoc.c:97 +#, c-format +msgid " %-10s Quit this help.\n" +msgstr "" + +#: info/infodoc.c:98 +#, c-format +msgid " %-10s Quit Info altogether.\n" +msgstr "" + +#: info/infodoc.c:99 +#, c-format +msgid " %-10s Invoke the Info tutorial.\n" +msgstr "" + +#: info/infodoc.c:103 #, c-format msgid " %-10s Move to the `next' node of this node.\n" msgstr "" -#: info/infodoc.c:64 +#: info/infodoc.c:104 #, c-format msgid " %-10s Move to the `previous' node of this node.\n" msgstr "" -#: info/infodoc.c:65 +#: info/infodoc.c:105 #, c-format msgid " %-10s Move `up' from this node.\n" msgstr "" -#: info/infodoc.c:66 +#: info/infodoc.c:106 #, c-format msgid " %-10s Pick menu item specified by name.\n" msgstr "" -#: info/infodoc.c:67 +#: info/infodoc.c:107 msgid " Picking a menu item causes another node to be selected.\n" msgstr "" -#: info/infodoc.c:68 +#: info/infodoc.c:108 #, c-format msgid " %-10s Follow a cross reference. Reads name of reference.\n" msgstr "" -#: info/infodoc.c:69 +#: info/infodoc.c:109 #, c-format msgid " %-10s Move to the last node seen in this window.\n" msgstr "" -#: info/infodoc.c:70 +#: info/infodoc.c:110 #, c-format msgid " %-10s Skip to next hypertext link within this node.\n" msgstr "" -#: info/infodoc.c:71 +#: info/infodoc.c:111 #, c-format msgid " %-10s Follow the hypertext link under cursor.\n" msgstr "" -#: info/infodoc.c:72 +#: info/infodoc.c:112 #, c-format msgid " %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n" msgstr "" -#: info/infodoc.c:73 +#: info/infodoc.c:113 #, c-format msgid " %-10s Move to the Top node. Equivalent to `g Top'.\n" msgstr "" -#: info/infodoc.c:75 -msgid "Other commands:\n" +#: info/infodoc.c:117 +#, c-format +msgid " %-10s Scroll forward a page.\n" msgstr "" -#: info/infodoc.c:76 -msgid "---------------\n" +#: info/infodoc.c:118 +#, c-format +msgid " %-10s Scroll backward a page.\n" msgstr "" -#: info/infodoc.c:77 +#: info/infodoc.c:119 +#, c-format +msgid " %-10s Go to the beginning of this node.\n" +msgstr "" + +#: info/infodoc.c:120 +#, c-format +msgid " %-10s Go to the end of this node.\n" +msgstr "" + +#: info/infodoc.c:121 +#, c-format +msgid " %-10s Scroll forward 1 line.\n" +msgstr "" + +#: info/infodoc.c:122 +#, c-format +msgid " %-10s Scroll backward 1 line.\n" +msgstr "" + +#: info/infodoc.c:126 #, c-format msgid " %-10s Pick first ... ninth item in node's menu.\n" msgstr "" -#: info/infodoc.c:78 +#: info/infodoc.c:127 #, c-format msgid " %-10s Pick last item in node's menu.\n" msgstr "" -#: info/infodoc.c:79 +#: info/infodoc.c:128 #, c-format msgid "" " %-10s Search for a specified string in the index entries of this Info\n" msgstr "" -#: info/infodoc.c:80 +#: info/infodoc.c:129 msgid "" " file, and select the node referenced by the first entry " "found.\n" msgstr "" -#: info/infodoc.c:81 +#: info/infodoc.c:130 #, c-format msgid " %-10s Move to node specified by name.\n" msgstr "" -#: info/infodoc.c:82 +#: info/infodoc.c:131 msgid "" " You may include a filename as well, as in (FILENAME)NODENAME.\n" msgstr "" -#: info/infodoc.c:83 +#: info/infodoc.c:132 #, c-format -msgid "" -" %-10s Search forward through this Info file for a specified string,\n" +msgid " %-10s Search forward for a specified string,\n" msgstr "" -#: info/infodoc.c:84 info/infodoc.c:86 +#: info/infodoc.c:133 info/infodoc.c:135 msgid "" " and select the node in which the next occurrence is found.\n" msgstr "" -#: info/infodoc.c:85 +#: info/infodoc.c:134 #, c-format -msgid " %-10s Search backward in this Info file for a specified string,\n" +msgid " %-10s Search backward for a specified string\n" msgstr "" -#: info/infodoc.c:258 +#: info/infodoc.c:313 msgid "The current search path is:\n" msgstr "" -#: info/infodoc.c:261 +#: info/infodoc.c:316 msgid "" "Commands available in Info windows:\n" "\n" msgstr "" -#: info/infodoc.c:264 +#: info/infodoc.c:319 msgid "" "Commands available in the echo area:\n" "\n" msgstr "" -#: info/infodoc.c:280 +#: info/infodoc.c:340 +#, c-format msgid "" -"The following commands can only be invoked via M-x:\n" +"The following commands can only be invoked via %s:\n" "\n" msgstr "" -#: info/infodoc.c:301 +#: info/infodoc.c:343 +msgid "" +"The following commands cannot be invoked at all:\n" +"\n" +msgstr "" + +#: info/infodoc.c:367 msgid "--- Use `\\[history-node]' or `\\[kill-node]' to exit ---\n" msgstr "" -#. Create or move to the help window. -#: info/infodoc.c:411 +#: info/infodoc.c:477 msgid "Display help message" msgstr "" -#. Show the Info help node. This means that the "info" file is installed -#. where it can easily be found on your system. -#: info/infodoc.c:429 +#: info/infodoc.c:495 msgid "Visit Info node `(info)Help'" msgstr "" -#: info/infodoc.c:555 +#: info/infodoc.c:638 msgid "Print documentation for KEY" msgstr "" -#: info/infodoc.c:568 +#: info/infodoc.c:650 #, c-format msgid "Describe key: %s" msgstr "" -#: info/infodoc.c:577 +#: info/infodoc.c:660 #, c-format msgid "ESC %s is undefined." msgstr "" -#: info/infodoc.c:594 +#: info/infodoc.c:676 info/infodoc.c:703 #, c-format msgid "%s is undefined." msgstr "" -#: info/infodoc.c:620 +#: info/infodoc.c:724 #, c-format msgid "%s is defined to %s." msgstr "" -#: info/infodoc.c:812 +#: info/infodoc.c:1151 msgid "Show what to type to execute a given command" msgstr "" -#: info/infodoc.c:816 +#: info/infodoc.c:1155 msgid "Where is command: " msgstr "" -#: info/infodoc.c:838 +#: info/infodoc.c:1177 #, c-format msgid "`%s' is not on any keys" msgstr "" -#: info/infodoc.c:844 +#: info/infodoc.c:1183 #, c-format msgid "%s can only be invoked via %s." msgstr "" -#: info/infodoc.c:847 +#: info/infodoc.c:1186 #, c-format msgid "%s can be invoked via %s." msgstr "" -#: info/infodoc.c:851 +#: info/infodoc.c:1190 #, c-format msgid "There is no function named `%s'" msgstr "" -#: info/m-x.c:69 +#: info/infokey.c:164 +msgid "incorrect number of arguments" +msgstr "" + +#: info/infokey.c:194 +#, c-format +msgid "cannot open input file `%s'" +msgstr "" + +#: info/infokey.c:207 +#, c-format +msgid "cannot create output file `%s'" +msgstr "" + +#: info/infokey.c:217 +#, c-format +msgid "error writing to `%s'" +msgstr "" + +#: info/infokey.c:222 +#, c-format +msgid "error closing output file `%s'" +msgstr "" + +#: info/infokey.c:443 +msgid "key sequence too long" +msgstr "" + +#: info/infokey.c:521 +msgid "missing key sequence" +msgstr "" + +#: info/infokey.c:600 +msgid "NUL character (\\000) not permitted" +msgstr "" + +#: info/infokey.c:629 +#, c-format +msgid "NUL character (^%c) not permitted" +msgstr "" + +#: info/infokey.c:652 +msgid "missing action name" +msgstr "" + +#: info/infokey.c:667 info/infokey.c:733 +msgid "section too long" +msgstr "" + +#: info/infokey.c:673 +#, c-format +msgid "unknown action `%s'" +msgstr "" + +#: info/infokey.c:682 +msgid "action name too long" +msgstr "" + +#: info/infokey.c:694 +#, c-format +msgid "extra characters following action `%s'" +msgstr "" + +#: info/infokey.c:704 +msgid "missing variable name" +msgstr "" + +#: info/infokey.c:712 +msgid "missing `=' immediately after variable name" +msgstr "" + +#: info/infokey.c:719 +msgid "variable name too long" +msgstr "" + +#: info/infokey.c:741 +msgid "value too long" +msgstr "" + +#: info/infokey.c:875 +#, c-format +msgid "\"%s\", line %u: " +msgstr "" + +#: info/infokey.c:891 +#, c-format +msgid "" +"Usage: %s [OPTION]... [INPUT-FILE]\n" +"\n" +"Compile infokey source file to infokey file. Reads INPUT-FILE (default\n" +"$HOME/.infokey) and writes compiled key file to (by default) $HOME/.info.\n" +"\n" +"Options:\n" +" --output FILE output to FILE instead of $HOME/.info\n" +" --help display this help and exit.\n" +" --version display version information and exit.\n" +msgstr "" + +#: info/infomap.c:1397 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too small" +msgstr "" + +#: info/infomap.c:1400 +#, c-format +msgid "Ignoring invalid infokey file `%s' - too big" +msgstr "" + +#: info/infomap.c:1413 +#, c-format +msgid "Error reading infokey file `%s' - short read" +msgstr "" + +#: info/infomap.c:1431 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad magic numbers) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1437 +#, c-format +msgid "Your infokey file `%s' is out of date -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1450 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section length) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1470 +#, c-format +msgid "" +"Invalid infokey file `%s' (bad section code) -- run infokey to update it" +msgstr "" + +#: info/infomap.c:1608 +msgid "Bad data in infokey file -- some key bindings ignored" +msgstr "" + +#: info/infomap.c:1659 +msgid "Bad data in infokey file -- some var settings ignored" +msgstr "" + +#: info/m-x.c:70 msgid "Read the name of an Info command and describe it" msgstr "" -#: info/m-x.c:73 +#: info/m-x.c:74 msgid "Describe command: " msgstr "" -#: info/m-x.c:96 +#: info/m-x.c:97 msgid "Read a command name in the echo area and execute it" msgstr "" -#: info/m-x.c:134 +#: info/m-x.c:141 msgid "Cannot execute an `echo-area' command here." msgstr "" -#: info/m-x.c:150 +#: info/m-x.c:157 msgid "Set the height of the displayed window" msgstr "" -#: info/m-x.c:163 +#: info/m-x.c:170 #, c-format msgid "Set screen height to (%d): " msgstr "" -#: info/makedoc.c:132 +#: info/makedoc.c:161 info/makedoc.c:169 msgid "" " Source files groveled to make this file include:\n" "\n" msgstr "" -#: info/makedoc.c:465 +#: info/makedoc.c:553 #, c-format msgid "Couldn't manipulate the file %s.\n" msgstr "" @@ -684,544 +953,509 @@ msgstr "" msgid "Select visited node: " msgstr "" -#: info/nodemenu.c:331 info/session.c:2146 +#: info/nodemenu.c:331 info/session.c:2235 #, c-format msgid "The reference disappeared! (%s)." msgstr "" -#: info/session.c:169 +#: info/session.c:170 #, c-format msgid "" "Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] " "for menu item." msgstr "" -#. Move WINDOW's point down to the next line if possible. -#: info/session.c:642 +#: info/session.c:643 msgid "Move down to the next line" msgstr "" -#. Move WINDOW's point up to the previous line if possible. -#: info/session.c:657 +#: info/session.c:658 msgid "Move up to the previous line" msgstr "" -#. Move WINDOW's point to the end of the true line. -#: info/session.c:672 +#: info/session.c:673 msgid "Move to the end of the line" msgstr "" -#. Move WINDOW's point to the beginning of the true line. -#: info/session.c:692 +#: info/session.c:693 msgid "Move to the start of the line" msgstr "" -#: info/session.c:884 makeinfo/node.c:1092 +#: info/session.c:885 makeinfo/node.c:1357 msgid "Next" msgstr "" -#: info/session.c:887 +#: info/session.c:888 msgid "Following Next node..." msgstr "" -#: info/session.c:904 +#: info/session.c:905 msgid "Selecting first menu item..." msgstr "" -#: info/session.c:915 +#: info/session.c:916 msgid "Selecting Next node..." msgstr "" -#: info/session.c:985 +#: info/session.c:986 #, c-format msgid "Moving Up %d time(s), then Next." msgstr "" -#: info/session.c:1009 +#: info/session.c:1010 msgid "No more nodes within this document." msgstr "" -#: info/session.c:1033 +#: info/session.c:1034 msgid "No `Prev' for this node." msgstr "" -#. Move to the previous node. If this node now contains a menu, -#. and we have not inhibited movement to it, move to the node -#. corresponding to the last menu item. -#: info/session.c:1036 info/session.c:1091 +#: info/session.c:1037 info/session.c:1092 msgid "Moving Prev in this window." msgstr "" -#: info/session.c:1050 +#: info/session.c:1051 msgid "No `Prev' or `Up' for this node within this document." msgstr "" -#: info/session.c:1053 +#: info/session.c:1054 msgid "Moving Up in this window." msgstr "" -#: info/session.c:1101 +#: info/session.c:1102 msgid "Moving to `Prev's last menu item." msgstr "" -#: info/session.c:1112 +#: info/session.c:1113 msgid "Move forwards or down through node structure" msgstr "" -#: info/session.c:1128 +#: info/session.c:1129 msgid "Move backwards or up through node structure" msgstr "" -#. Show the next screen of WINDOW's node. -#: info/session.c:1143 +#: info/session.c:1229 msgid "Scroll forward in this window" msgstr "" -#: info/session.c:1192 +#: info/session.c:1237 msgid "Scroll forward in this window and set default window size" msgstr "" -#. Show the previous screen of WINDOW's node. -#: info/session.c:1200 +#: info/session.c:1245 +msgid "Scroll forward in this window staying within node" +msgstr "" + +#: info/session.c:1253 +msgid "" +"Scroll forward in this window staying within node and set default window size" +msgstr "" + +#: info/session.c:1261 msgid "Scroll backward in this window" msgstr "" -#: info/session.c:1244 +#: info/session.c:1269 msgid "Scroll backward in this window and set default window size" msgstr "" -#. Move to the beginning of the node. -#: info/session.c:1252 +#: info/session.c:1278 +msgid "Scroll backward in this window staying within node" +msgstr "" + +#: info/session.c:1286 +msgid "" +"Scroll backward in this window staying within node and set default window " +"size" +msgstr "" + +#: info/session.c:1294 msgid "Move to the start of this node" msgstr "" -#. Move to the end of the node. -#: info/session.c:1259 +#: info/session.c:1301 msgid "Move to the end of this node" msgstr "" -#. Scroll the window forward by N lines. -#: info/session.c:1266 +#: info/session.c:1308 msgid "Scroll down by lines" msgstr "" -#. Scroll the window backward by N lines. -#: info/session.c:1283 +#: info/session.c:1325 msgid "Scroll up by lines" msgstr "" -#: info/session.c:1301 +#: info/session.c:1343 msgid "Scroll down by half screen size" msgstr "" -#: info/session.c:1327 +#: info/session.c:1369 msgid "Scroll up by half screen size" msgstr "" -#. **************************************************************** -#. -#. Commands for Manipulating Windows -#. -#. **************************************************************** -#. Make the next window in the chain be the active window. -#: info/session.c:1356 +#: info/session.c:1398 msgid "Select the next window" msgstr "" -#. Make the previous window in the chain be the active window. -#: info/session.c:1395 +#: info/session.c:1437 msgid "Select the previous window" msgstr "" -#. Split WINDOW into two windows, both showing the same node. If we -#. are automatically tiling windows, re-tile after the split. -#: info/session.c:1446 +#: info/session.c:1488 msgid "Split the current window" msgstr "" -#. Delete WINDOW, forgetting the list of last visited nodes. If we are -#. automatically displaying footnotes, show or remove the footnotes -#. window. If we are automatically tiling windows, re-tile after the -#. deletion. -#: info/session.c:1527 +#: info/session.c:1569 msgid "Delete the current window" msgstr "" -#: info/session.c:1535 +#: info/session.c:1577 msgid "Cannot delete a permanent window" msgstr "" -#. Just keep WINDOW, deleting all others. -#: info/session.c:1568 +#: info/session.c:1610 msgid "Delete all other windows" msgstr "" -#. Scroll the "other" window of WINDOW. -#: info/session.c:1614 +#: info/session.c:1656 msgid "Scroll the other window" msgstr "" -#: info/session.c:1635 +#: info/session.c:1677 msgid "Scroll the other window backward" msgstr "" -#. Change the size of WINDOW by AMOUNT. -#: info/session.c:1641 +#: info/session.c:1683 msgid "Grow (or shrink) this window" msgstr "" -#: info/session.c:1652 +#: info/session.c:1694 msgid "Divide the available screen space among the visible windows" msgstr "" -#: info/session.c:1659 +#: info/session.c:1701 msgid "Toggle the state of line wrapping in the current window" msgstr "" -#. Make WINDOW display the "Next:" node of the node currently being -#. displayed. -#: info/session.c:1838 +#: info/session.c:1880 msgid "Select the Next node" msgstr "" -#. Make WINDOW display the "Prev:" node of the node currently being -#. displayed. -#: info/session.c:1846 +#: info/session.c:1888 msgid "Select the Prev node" msgstr "" -#. Make WINDOW display the "Up:" node of the node currently being -#. displayed. -#: info/session.c:1854 +#: info/session.c:1896 msgid "Select the Up node" msgstr "" -#. Make WINDOW display the last node of this info file. -#: info/session.c:1861 +#: info/session.c:1903 msgid "Select the last node in this file" msgstr "" -#: info/session.c:1888 info/session.c:1921 +#: info/session.c:1930 info/session.c:1963 msgid "This window has no additional nodes" msgstr "" -#. Make WINDOW display the first node of this info file. -#: info/session.c:1894 +#: info/session.c:1936 msgid "Select the first node in this file" msgstr "" -#: info/session.c:1928 +#: info/session.c:1970 msgid "Select the last item in this node's menu" msgstr "" -#. Use KEY (a digit) to select the Nth menu item in WINDOW->node. -#: info/session.c:1934 +#: info/session.c:1976 msgid "Select this menu item" msgstr "" -#: info/session.c:1963 +#: info/session.c:2005 #, c-format msgid "There aren't %d items in this menu." msgstr "" -#: info/session.c:2094 +#: info/session.c:2148 #, c-format msgid "Menu item (%s): " msgstr "" -#: info/session.c:2096 +#: info/session.c:2150 msgid "Menu item: " msgstr "" -#: info/session.c:2101 +#: info/session.c:2155 #, c-format msgid "Follow xref (%s): " msgstr "" -#: info/session.c:2103 +#: info/session.c:2157 msgid "Follow xref: " msgstr "" -#. Read a line (with completion) which is the name of a menu item, -#. and select that item. -#: info/session.c:2191 +#: info/session.c:2280 msgid "Read a menu item and select its node" msgstr "" -#: info/session.c:2199 +#: info/session.c:2288 msgid "Read a footnote or cross reference and select its node" msgstr "" -#. Position the cursor at the start of this node's menu. -#: info/session.c:2205 +#: info/session.c:2294 msgid "Move to the start of this node's menu" msgstr "" -#: info/session.c:2229 +#: info/session.c:2318 msgid "Visit as many menu items at once as possible" msgstr "" -#. Read a line of input which is a node name, and go to that node. -#: info/session.c:2257 +#: info/session.c:2346 msgid "Read a node name and select it" msgstr "" -#: info/session.c:2312 info/session.c:2316 +#: info/session.c:2401 info/session.c:2405 msgid "Goto node: " msgstr "" -#: info/session.c:2382 +#: info/session.c:2471 #, c-format msgid "No menu in node `%s'." msgstr "" -#: info/session.c:2422 +#: info/session.c:2516 #, c-format msgid "No menu item `%s' in node `%s'." msgstr "" -#: info/session.c:2452 +#: info/session.c:2546 #, c-format msgid "Unable to find node referenced by `%s' in `%s'." msgstr "" -#: info/session.c:2503 +#: info/session.c:2597 msgid "Read a list of menus starting from dir and follow them" msgstr "" -#: info/session.c:2505 +#: info/session.c:2599 msgid "Follow menus: " msgstr "" -#: info/session.c:2703 +#: info/session.c:2797 msgid "Find the node describing program invocation" msgstr "" -#: info/session.c:2705 +#: info/session.c:2799 #, c-format msgid "Find Invocation node of [%s]: " msgstr "" -#: info/session.c:2743 +#: info/session.c:2837 msgid "Read a manpage reference and select it" msgstr "" -#: info/session.c:2747 +#: info/session.c:2841 msgid "Get Manpage: " msgstr "" -#. Move to the "Top" node in this file. -#: info/session.c:2777 +#: info/session.c:2871 msgid "Select the node `Top' in this file" msgstr "" -#. Move to the node "(dir)Top". -#: info/session.c:2783 +#: info/session.c:2877 msgid "Select the node `(dir)'" msgstr "" -#: info/session.c:2803 +#: info/session.c:2897 #, c-format msgid "Kill node (%s): " msgstr "" -#: info/session.c:2857 +#: info/session.c:2951 #, c-format msgid "Cannot kill node `%s'" msgstr "" -#: info/session.c:2867 +#: info/session.c:2961 msgid "Cannot kill the last node" msgstr "" -#: info/session.c:2953 +#: info/session.c:3047 msgid "Select the most recently selected node" msgstr "" -#. Kill named node. -#: info/session.c:2959 +#: info/session.c:3053 msgid "Kill this node" msgstr "" -#. Read the name of a file and select the entire file. -#: info/session.c:2967 +#: info/session.c:3061 msgid "Read the name of a file and select it" msgstr "" -#: info/session.c:2971 +#: info/session.c:3065 msgid "Find file: " msgstr "" -#: info/session.c:2988 +#: info/session.c:3082 #, c-format msgid "Cannot find `%s'." msgstr "" -#: info/session.c:3033 info/session.c:3154 +#: info/session.c:3127 info/session.c:3248 #, c-format msgid "Could not create output file `%s'." msgstr "" -#: info/session.c:3046 info/session.c:3171 info/session.c:3232 +#: info/session.c:3140 info/session.c:3265 info/session.c:3326 msgid "Done." msgstr "" -#. Maybe we should print some information about the node being output. -#: info/session.c:3102 +#: info/session.c:3196 #, c-format msgid "Writing node %s..." msgstr "" -#: info/session.c:3180 +#: info/session.c:3274 msgid "Pipe the contents of this node through INFO_PRINT_COMMAND" msgstr "" -#: info/session.c:3216 +#: info/session.c:3310 #, c-format msgid "Cannot open pipe to `%s'." msgstr "" -#. Maybe we should print some information about the node being output. -#: info/session.c:3222 +#: info/session.c:3316 #, c-format msgid "Printing node %s..." msgstr "" -#: info/session.c:3464 +#: info/session.c:3558 #, c-format msgid "Searching subfile %s ..." msgstr "" -#: info/session.c:3516 +#: info/session.c:3610 msgid "Read a string and search for it case-sensitively" msgstr "" -#: info/session.c:3523 +#: info/session.c:3617 msgid "Read a string and search for it" msgstr "" -#: info/session.c:3531 +#: info/session.c:3625 msgid "Read a string and search backward for it" msgstr "" -#: info/session.c:3573 +#: info/session.c:3667 #, c-format msgid "%s%sfor string [%s]: " msgstr "" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search backward" msgstr "" -#: info/session.c:3574 +#: info/session.c:3668 msgid "Search" msgstr "" -#: info/session.c:3575 +#: info/session.c:3669 msgid " case-sensitively " msgstr "" -#: info/session.c:3575 +#: info/session.c:3669 msgid " " msgstr "" -#: info/session.c:3615 +#: info/session.c:3709 msgid "Search failed." msgstr "" -#: info/session.c:3633 +#: info/session.c:3727 msgid "Repeat last search in the same direction" msgstr "" -#: info/session.c:3636 info/session.c:3646 +#: info/session.c:3730 info/session.c:3740 msgid "No previous search string" msgstr "" -#: info/session.c:3643 +#: info/session.c:3737 msgid "Repeat last search in the reverse direction" msgstr "" -#: info/session.c:3661 info/session.c:3667 +#: info/session.c:3755 info/session.c:3761 msgid "Search interactively for a string as you type it" msgstr "" -#: info/session.c:3761 +#: info/session.c:3855 msgid "I-search backward: " msgstr "" -#: info/session.c:3763 +#: info/session.c:3857 msgid "I-search: " msgstr "" -#: info/session.c:3788 +#: info/session.c:3882 msgid "Failing " msgstr "" -#: info/session.c:4244 +#: info/session.c:4340 msgid "Move to the previous cross reference" msgstr "" -#: info/session.c:4253 +#: info/session.c:4349 msgid "Move to the next cross reference" msgstr "" -#: info/session.c:4263 +#: info/session.c:4359 msgid "Select reference or menu item appearing on this line" msgstr "" -#. **************************************************************** -#. -#. Miscellaneous Info Commands -#. -#. **************************************************************** -#. What to do when C-g is pressed in a window. -#: info/session.c:4285 +#: info/session.c:4381 msgid "Cancel current operation" msgstr "" -#: info/session.c:4292 +#: info/session.c:4388 msgid "Quit" msgstr "" -#: info/session.c:4301 +#: info/session.c:4397 msgid "Move the cursor to a specific line of the window" msgstr "" -#. Clear the screen and redraw its contents. Given a numeric argument, -#. move the line the cursor is on to the COUNT'th line of the window. -#: info/session.c:4333 +#: info/session.c:4429 msgid "Redraw the display" msgstr "" -#. This command does nothing. It is the fact that a key is bound to it -#. that has meaning. See the code at the top of info_session (). -#: info/session.c:4370 +#: info/session.c:4466 msgid "Quit using Info" msgstr "" -#: info/session.c:4393 +#: info/session.c:4479 +msgid "Run command bound to this key's lowercase variant" +msgstr "" + +#: info/session.c:4491 #, c-format msgid "Unknown command (%s)." msgstr "" -#: info/session.c:4396 +#: info/session.c:4494 msgid "\"\" is invalid" msgstr "" -#: info/session.c:4397 +#: info/session.c:4495 #, c-format msgid "\"%s\" is invalid" msgstr "" -#: info/session.c:4620 +#: info/session.c:4713 msgid "Add this digit to the current numeric argument" msgstr "" -#: info/session.c:4629 +#: info/session.c:4722 msgid "Start (or multiply by 4) the current numeric argument" msgstr "" -#: info/session.c:4644 +#: info/session.c:4737 msgid "Internally used by \\[universal-argument]" msgstr "" @@ -1229,429 +1463,468 @@ msgstr "" msgid "readline: Out of virtual memory!\n" msgstr "" -#: info/variables.c:40 +#: info/variables.c:37 msgid "When \"On\", footnotes appear and disappear automatically" msgstr "" -#: info/variables.c:44 +#: info/variables.c:41 msgid "When \"On\", creating or deleting a window resizes other windows" msgstr "" -#: info/variables.c:48 +#: info/variables.c:45 msgid "When \"On\", flash the screen instead of ringing the bell" msgstr "" -#: info/variables.c:52 +#: info/variables.c:49 msgid "When \"On\", errors cause the bell to ring" msgstr "" -#: info/variables.c:56 +#: info/variables.c:53 msgid "When \"On\", Info garbage collects files which had to be uncompressed" msgstr "" -#: info/variables.c:59 +#: info/variables.c:56 msgid "When \"On\", the portion of the matched search string is highlighted" msgstr "" -#: info/variables.c:63 +#: info/variables.c:60 msgid "Controls what happens when scrolling is requested at the end of a node" msgstr "" -#: info/variables.c:67 +#: info/variables.c:64 msgid "The number lines to scroll when the cursor moves out of the window" msgstr "" -#: info/variables.c:71 +#: info/variables.c:68 msgid "When \"On\", Info accepts and displays ISO Latin characters" msgstr "" -#: info/variables.c:77 +#: info/variables.c:74 msgid "Explain the use of a variable" msgstr "" -#. Get the variable's name. -#: info/variables.c:83 +#: info/variables.c:80 msgid "Describe variable: " msgstr "" -#: info/variables.c:102 +#: info/variables.c:99 msgid "Set the value of an Info variable" msgstr "" -#. Get the variable's name and value. -#: info/variables.c:108 +#: info/variables.c:105 msgid "Set variable: " msgstr "" -#: info/variables.c:126 +#: info/variables.c:123 #, c-format msgid "Set %s to value (%d): " msgstr "" -#: info/variables.c:167 +#: info/variables.c:164 #, c-format msgid "Set %s to value (%s): " msgstr "" -#: info/window.c:1101 +#: info/window.c:1164 msgid "--*** Tags out of Date ***" msgstr "" -#. strlen (location_indicator). -#. 10 for the decimal representation of the number of lines in this -#. node, and the remainder of the text that can appear in the line. -#: info/window.c:1112 +#: info/window.c:1175 msgid "-----Info: (), lines ----, " msgstr "" -#: info/window.c:1119 +#: info/window.c:1182 #, c-format msgid "-%s---Info: %s, %d lines --%s--" msgstr "" -#: info/window.c:1123 +#: info/window.c:1186 #, c-format msgid "-%s%s-Info: (%s)%s, %d lines --%s--" msgstr "" -#: info/window.c:1130 +#: info/window.c:1193 #, c-format msgid " Subfile: %s" msgstr "" -#: lib/getopt.c:680 +#: lib/getopt.c:675 #, c-format msgid "%s: option `%s' is ambiguous\n" msgstr "" -#: lib/getopt.c:704 +#: lib/getopt.c:700 #, c-format msgid "%s: option `--%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:709 +#: lib/getopt.c:705 #, c-format msgid "%s: option `%c%s' doesn't allow an argument\n" msgstr "" -#: lib/getopt.c:726 lib/getopt.c:899 +#: lib/getopt.c:723 lib/getopt.c:896 #, c-format msgid "%s: option `%s' requires an argument\n" msgstr "" -#. --option -#: lib/getopt.c:755 +#: lib/getopt.c:752 #, c-format msgid "%s: unrecognized option `--%s'\n" msgstr "" -#. +option or -option -#: lib/getopt.c:759 +#: lib/getopt.c:756 #, c-format msgid "%s: unrecognized option `%c%s'\n" msgstr "" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:785 +#: lib/getopt.c:782 #, c-format msgid "%s: illegal option -- %c\n" msgstr "" -#: lib/getopt.c:788 +#: lib/getopt.c:785 #, c-format msgid "%s: invalid option -- %c\n" msgstr "" -#. 1003.2 specifies the format of this message. -#: lib/getopt.c:818 lib/getopt.c:948 +#: lib/getopt.c:815 lib/getopt.c:945 #, c-format msgid "%s: option requires an argument -- %c\n" msgstr "" -#: lib/getopt.c:865 +#: lib/getopt.c:862 #, c-format msgid "%s: option `-W %s' is ambiguous\n" msgstr "" -#: lib/getopt.c:883 +#: lib/getopt.c:880 #, c-format msgid "%s: option `-W %s' doesn't allow an argument\n" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "January" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "February" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "March" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "April" msgstr "" -#: makeinfo/cmds.c:447 +#: makeinfo/cmds.c:515 msgid "May" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "June" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "July" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "August" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "September" msgstr "" -#: makeinfo/cmds.c:448 +#: makeinfo/cmds.c:516 msgid "October" msgstr "" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "November" msgstr "" -#: makeinfo/cmds.c:449 +#: makeinfo/cmds.c:517 msgid "December" msgstr "" -#: makeinfo/cmds.c:571 +#: makeinfo/cmds.c:658 #, c-format msgid "unlikely character %c in @var" msgstr "" -#: makeinfo/cmds.c:605 +#: makeinfo/cmds.c:701 msgid "@sc argument all uppercase, thus no effect" msgstr "" -#: makeinfo/cmds.c:754 +#: makeinfo/cmds.c:759 +#, c-format +msgid "`{' expected, but saw `%c'" +msgstr "" + +#: makeinfo/cmds.c:789 +msgid "end of file inside verb block" +msgstr "" + +#: makeinfo/cmds.c:797 +#, c-format +msgid "`}' expected, but saw `%c'" +msgstr "" + +#: makeinfo/cmds.c:942 #, c-format msgid "%c%s is obsolete" msgstr "" -#: makeinfo/cmds.c:814 +#: makeinfo/cmds.c:1014 #, c-format msgid "@sp requires a positive numeric argument, not `%s'" msgstr "" -#: makeinfo/cmds.c:1092 makeinfo/cmds.c:1118 makeinfo/footnote.c:80 +#: makeinfo/cmds.c:1348 makeinfo/cmds.c:1374 makeinfo/footnote.c:81 #, c-format msgid "Bad argument to %c%s" msgstr "" -#: makeinfo/cmds.c:1102 makeinfo/makeinfo.c:3678 +#: makeinfo/cmds.c:1358 makeinfo/makeinfo.c:4140 msgid "asis" msgstr "" -#: makeinfo/cmds.c:1104 makeinfo/makeinfo.c:3680 +#: makeinfo/cmds.c:1360 makeinfo/makeinfo.c:4142 msgid "none" msgstr "" -#: makeinfo/defun.c:83 +#: makeinfo/defun.c:85 msgid "Missing `}' in @def arg" msgstr "" -#: makeinfo/defun.c:358 +#: makeinfo/defun.c:363 msgid "Function" msgstr "" -#: makeinfo/defun.c:361 +#: makeinfo/defun.c:366 msgid "Macro" msgstr "" -#: makeinfo/defun.c:364 +#: makeinfo/defun.c:369 msgid "Special Form" msgstr "" -#: makeinfo/defun.c:368 +#: makeinfo/defun.c:373 msgid "Variable" msgstr "" -#: makeinfo/defun.c:371 +#: makeinfo/defun.c:376 msgid "User Option" msgstr "" -#: makeinfo/defun.c:375 +#: makeinfo/defun.c:380 msgid "Instance Variable" msgstr "" -#: makeinfo/defun.c:379 +#: makeinfo/defun.c:384 msgid "Method" msgstr "" -#: makeinfo/defun.c:450 makeinfo/defun.c:454 makeinfo/defun.c:556 -#: makeinfo/defun.c:570 makeinfo/defun.c:610 +#: makeinfo/defun.c:466 makeinfo/defun.c:470 makeinfo/defun.c:615 +#: makeinfo/defun.c:631 makeinfo/defun.c:671 msgid "of" msgstr "" -#: makeinfo/defun.c:458 makeinfo/defun.c:462 makeinfo/defun.c:466 -#: makeinfo/defun.c:564 makeinfo/defun.c:615 +#: makeinfo/defun.c:474 makeinfo/defun.c:478 makeinfo/defun.c:482 +#: makeinfo/defun.c:624 makeinfo/defun.c:676 msgid "on" msgstr "" -#: makeinfo/defun.c:656 +#: makeinfo/defun.c:717 #, c-format msgid "Must be in `%s' insertion to use `%sx'" msgstr "" -#: makeinfo/files.c:460 +#: makeinfo/files.c:448 #, c-format msgid "%s: getwd: %s, %s\n" msgstr "" -#: makeinfo/footnote.c:149 +#: makeinfo/footnote.c:150 #, c-format msgid "`%c%s' needs an argument `{...}', not just `%s'" msgstr "" -#: makeinfo/footnote.c:164 +#: makeinfo/footnote.c:165 #, c-format msgid "No closing brace for footnote `%s'" msgstr "" -#: makeinfo/footnote.c:197 +#: makeinfo/footnote.c:198 msgid "Footnote defined without parent node" msgstr "" -#: makeinfo/footnote.c:278 +#: makeinfo/footnote.c:210 +msgid "Footnotes inside footnotes are not allowed" +msgstr "" + +#: makeinfo/footnote.c:298 msgid "Footnotes" msgstr "" -#. The <title> should not have markup. -#: makeinfo/html.c:40 +#: makeinfo/html.c:42 msgid "Untitled" msgstr "" -#: makeinfo/index.c:212 +#: makeinfo/html.c:298 +#, c-format +msgid "Invalid node name: `%s'" +msgstr "" + +#: makeinfo/index.c:213 #, c-format msgid "Unknown index `%s'" msgstr "" -#: makeinfo/index.c:382 +#: makeinfo/index.c:238 +#, c-format +msgid "Info cannot handle `:' in index entry `%s'" +msgstr "" + +#: makeinfo/index.c:396 #, c-format msgid "Index `%s' already exists" msgstr "" -#: makeinfo/index.c:425 +#: makeinfo/index.c:439 #, c-format msgid "Unknown index `%s' and/or `%s' in @synindex" msgstr "" -#: makeinfo/index.c:642 +#: makeinfo/index.c:666 #, c-format msgid "Unknown index `%s' in @printindex" msgstr "" -#: makeinfo/index.c:680 +#: makeinfo/index.c:709 #, c-format msgid "Entry for index `%s' outside of any node" msgstr "" -#: makeinfo/index.c:683 makeinfo/index.c:722 +#: makeinfo/index.c:712 makeinfo/index.c:751 msgid "(outside of any node)" msgstr "" -#: makeinfo/insertion.c:192 +#: makeinfo/insertion.c:198 msgid "Broken-Type in insertion_type_pname" msgstr "" -#: makeinfo/insertion.c:265 +#: makeinfo/insertion.c:271 msgid "Enumeration stack overflow" msgstr "" -#: makeinfo/insertion.c:297 +#: makeinfo/insertion.c:303 #, c-format msgid "lettering overflow, restarting at %c" msgstr "" -#: makeinfo/insertion.c:481 +#: makeinfo/insertion.c:538 #, c-format msgid "%s requires an argument: the formatter for %citem" msgstr "" -#: makeinfo/insertion.c:623 +#: makeinfo/insertion.c:693 #, c-format msgid "`@end' expected `%s', but saw `%s'" msgstr "" -#: makeinfo/insertion.c:797 +#: makeinfo/insertion.c:931 #, c-format msgid "No matching `%cend %s'" msgstr "" -#: makeinfo/insertion.c:902 +#: makeinfo/insertion.c:1084 #, c-format msgid "%s requires letter or digit" msgstr "" -#: makeinfo/insertion.c:1046 +#: makeinfo/insertion.c:1158 +msgid "end of file inside verbatim block" +msgstr "" + +#: makeinfo/insertion.c:1318 msgid "@menu seen before first @node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1047 +#: makeinfo/insertion.c:1319 msgid "" "perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?" msgstr "" -#. Problems anyway, @detailmenu should always be inside @menu. -#: makeinfo/insertion.c:1059 +#: makeinfo/insertion.c:1331 msgid "@detailmenu seen before first node, creating `Top' node" msgstr "" -#: makeinfo/insertion.c:1074 +#: makeinfo/insertion.c:1346 #, c-format msgid "Unmatched `%c%s'" msgstr "" -#: makeinfo/insertion.c:1081 +#: makeinfo/insertion.c:1353 #, c-format msgid "`%c%s' needs something after it" msgstr "" -#: makeinfo/insertion.c:1087 +#: makeinfo/insertion.c:1359 #, c-format msgid "Bad argument to `%s', `%s', using `%s'" msgstr "" -#: makeinfo/insertion.c:1175 +#: makeinfo/insertion.c:1453 #, c-format msgid "@%s not meaningful inside `@%s' block" msgstr "" -#: makeinfo/insertion.c:1184 +#: makeinfo/insertion.c:1462 #, c-format msgid "@itemx not meaningful inside `%s' block" msgstr "" -#: makeinfo/insertion.c:1357 +#: makeinfo/insertion.c:1646 #, c-format msgid "%c%s found outside of an insertion block" msgstr "" -#: makeinfo/lang.c:199 +#: makeinfo/lang.c:331 #, c-format msgid "%s is not a valid ISO 639 language code" msgstr "" -#. This error message isn't perfect if the argument is multiple -#. characters, but it doesn't seem worth getting right. -#: makeinfo/lang.c:406 +#: makeinfo/lang.c:384 +#, c-format +msgid "unrecogized encoding name `%s'" +msgstr "" + +#: makeinfo/lang.c:387 +#, c-format +msgid "sorry, encoding `%s' not supported" +msgstr "" + +#: makeinfo/lang.c:414 +#, c-format +msgid "invalid encoded character `%s'" +msgstr "" + +#: makeinfo/lang.c:502 +#, c-format +msgid "%s is an invalid ISO code, using %c" +msgstr "" + +#: makeinfo/lang.c:687 #, c-format msgid "%c%s expects `i' or `j' as argument, not `%c'" msgstr "" -#: makeinfo/lang.c:410 +#: makeinfo/lang.c:691 #, c-format msgid "%c%s expects a single character `i' or `j' as argument" msgstr "" @@ -1676,427 +1949,522 @@ msgstr "" msgid "Macro `%s' called on line %d with too many args" msgstr "" -#: makeinfo/macro.c:595 +#: makeinfo/macro.c:594 #, c-format msgid "%cend macro not found" msgstr "" -#: makeinfo/macro.c:634 +#: makeinfo/macro.c:632 msgid "@quote-arg only useful for single-argument macros" msgstr "" -#: makeinfo/macro.c:670 +#: makeinfo/macro.c:668 #, c-format msgid "mismatched @end %s with @%s" msgstr "" -#: makeinfo/makeinfo.c:308 +#: makeinfo/makeinfo.c:316 #, c-format msgid "%s:%d: warning: " msgstr "" -#: makeinfo/makeinfo.c:331 +#: makeinfo/makeinfo.c:339 msgid "Too many errors! Gave up.\n" msgstr "" -#: makeinfo/makeinfo.c:342 makeinfo/makeinfo.c:1802 +#: makeinfo/makeinfo.c:350 makeinfo/makeinfo.c:2026 #, c-format msgid "Misplaced %c" msgstr "" -#: makeinfo/makeinfo.c:362 +#: makeinfo/makeinfo.c:370 #, c-format msgid "Try `%s --help' for more information.\n" msgstr "" -#: makeinfo/makeinfo.c:365 +#: makeinfo/makeinfo.c:373 #, c-format +msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n" +msgstr "" + +#: makeinfo/makeinfo.c:376 msgid "" -"Usage: %s [OPTION]... TEXINFO-FILE...\n" -"\n" -"Translate Texinfo source documentation to various other formats:\n" -"Info files suitable for reading online with Emacs or standalone GNU Info\n" -"(by default); plain text (with --no-headers); or HTML (with --html).\n" -"\n" -"Options:\n" -" --commands-in-node-names allow @ commands in node names.\n" -" -D VAR define a variable, as with @set.\n" -" -E, --macro-expand FILE output macro-expanded source to FILE.\n" -" --error-limit=NUM quit after NUM errors (default %d).\n" -" --fill-column=NUM break Info lines at NUM characters (default %d).\n" -" --footnote-style=STYLE output footnotes according to STYLE:\n" -" `separate' to place footnotes in their own " -"node,\n" -" `end' to place the footnotes at the end of the\n" -" node in which they are defined (the default).\n" -" --force preserve output even if errors.\n" -" --help display this help and exit.\n" -" --html output HTML rather than Info format;\n" -" -I DIR append DIR to the @include search path.\n" -" --ifhtml process @ifhtml and @html text even when not\n" -" generating HTML.\n" -" --ifinfo process @ifinfo text even when generating HTML.\n" -" --iftex process @iftex and @tex text.\n" -" implies --no-split.\n" -msgstr "" - -#: makeinfo/makeinfo.c:391 +"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:380 #, c-format msgid "" -" --no-headers suppress Info node separators and Node: lines " -"and\n" -" write to standard output without --output.\n" -" --no-ifhtml do not process @ifhtml and @html text.\n" -" --no-ifinfo do not process @ifinfo text.\n" -" --no-iftex do not process @iftex and @tex text.\n" -" --no-split suppress splitting of large Info output files or\n" -" generation of one HTML file per node.\n" -" --no-validate suppress node cross-reference validation.\n" -" --no-warn suppress warnings (but not errors).\n" -" --number-sections include chapter, section, etc. numbers in " -"output.\n" -" -o, --output=FILE output to FILE, ignoring any @setfilename.\n" -" -P DIR prepend DIR to the @include search path.\n" -" --paragraph-indent=VAL indent Info paragraphs by VAL spaces (default " -"%d).\n" -" if VAL is `none', do not indent;\n" -" if VAL is `asis', preserve existing " -"indentation.\n" -" --reference-limit=NUM warn about at most NUM references (default %d).\n" -" -U VAR undefine a variable, as with @clear.\n" -" -v, --verbose explain what is being done.\n" -" --version display version information and exit.\n" +"General options:\n" +" --error-limit=NUM quit after NUM errors (default %d).\n" +" --force preserve output even if errors.\n" +" --help display this help and exit.\n" +" --no-validate suppress node cross-reference validation.\n" +" --no-warn suppress warnings (but not errors).\n" +" --reference-limit=NUM warn about at most NUM references (default %" +"d).\n" +" -v, --verbose explain what is being done.\n" +" --version display version information and exit.\n" +msgstr "" + +#: makeinfo/makeinfo.c:394 +#, no-wrap +msgid "" +"Output format selection (default is to produce Info):\n" +" --docbook output DocBook rather than Info.\n" +" --html output HTML rather than Info.\n" +" --xml output XML (TexinfoML) rather than Info.\n" +msgstr "" + +#: makeinfo/makeinfo.c:401 +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" msgstr "" #: makeinfo/makeinfo.c:415 +#, 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" +" --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" +" If VAL is `none', do not indent; if VAL is\n" +" `asis', preserve existing indentation.\n" +" --split-size=NUM split Info files at size NUM (default %d).\n" +msgstr "" + +#: makeinfo/makeinfo.c:433 +msgid "" +"Input file options:\n" +" --commands-in-node-names allow @ commands in node names.\n" +" -D VAR define the variable VAR, as with @set.\n" +" -I DIR append DIR to the @include search path.\n" +" -P DIR prepend DIR to the @include search path.\n" +" -U VAR undefine the variable VAR, as with @clear.\n" +msgstr "" + +#: makeinfo/makeinfo.c:442 +msgid "" +"Conditional processing in input:\n" +" --ifhtml process @ifhtml and @html even if not generating HTML.\n" +" --ifinfo process @ifinfo even if not generating Info.\n" +" --ifplaintext process @ifplaintext even if not generating plain text.\n" +" --iftex process @iftex and @tex; implies --no-split.\n" +" --no-ifhtml do not process @ifhtml and @html text.\n" +" --no-ifinfo do not process @ifinfo text.\n" +" --no-ifplaintext do not process @ifplaintext text.\n" +" --no-iftex do not process @iftex and @tex text.\n" +msgstr "" + +#: 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" +" if generating Info, --ifinfo is on and the others are off;\n" +" if generating plain text, --ifplaintext is on and the others are off;\n" +msgstr "" + +#: makeinfo/makeinfo.c:461 msgid "" -"\n" -"The defaults for the @if... conditionals depend on the output format:\n" -"if generating HTML, --ifhtml is on and the others are off;\n" -"if generating Info or plain text, --ifinfo is on and the others are off.\n" -"\n" "Examples:\n" -" makeinfo foo.texi write Info to foo's @setfilename\n" -" makeinfo --html foo.texi write HTML to foo's @setfilename\n" -" makeinfo --no-headers -o - foo.texi write plain text to standard output\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 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" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org." +" makeinfo --html --no-headers foo.texi write html without node lines, " +"menus\n" +" makeinfo --number-sections foo.texi write Info with numbered sections\n" +" makeinfo --no-split foo.texi write one Info file however big\n" msgstr "" -#: makeinfo/makeinfo.c:508 makeinfo/makeinfo.c:531 makeinfo/makeinfo.c:592 +#: makeinfo/makeinfo.c:570 makeinfo/makeinfo.c:593 makeinfo/makeinfo.c:655 +#: makeinfo/makeinfo.c:676 #, c-format msgid "%s: %s arg must be numeric, not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:521 +#: makeinfo/makeinfo.c:583 #, c-format msgid "Couldn't open macro expansion output `%s'" msgstr "" -#: makeinfo/makeinfo.c:524 +#: makeinfo/makeinfo.c:586 msgid "Cannot specify more than one macro expansion output" msgstr "" -#: makeinfo/makeinfo.c:561 +#: makeinfo/makeinfo.c:624 #, c-format msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:602 +#: makeinfo/makeinfo.c:665 #, c-format msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:647 +#: makeinfo/makeinfo.c:723 #, c-format msgid "%s: missing file argument.\n" msgstr "" -#: makeinfo/makeinfo.c:810 +#: makeinfo/makeinfo.c:898 #, c-format msgid "Expected `%s'" msgstr "" -#: makeinfo/makeinfo.c:1229 +#: makeinfo/makeinfo.c:1365 +msgid "File exists, but is not a directory" +msgstr "" + +#: makeinfo/makeinfo.c:1366 +#, c-format +msgid "Can't create directory `%s': %s" +msgstr "" + +#: makeinfo/makeinfo.c:1414 #, c-format msgid "No `%s' found in `%s'" msgstr "" -#: makeinfo/makeinfo.c:1306 +#: makeinfo/makeinfo.c:1496 #, c-format msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n" msgstr "" -#: makeinfo/makeinfo.c:1327 +#: makeinfo/makeinfo.c:1526 #, c-format msgid "Making %s file `%s' from `%s'.\n" msgstr "" -#: makeinfo/makeinfo.c:1358 +#: makeinfo/makeinfo.c:1561 #, c-format msgid "This is %s, produced by makeinfo version %s from %s.\n" msgstr "" -#: makeinfo/makeinfo.c:1377 +#: makeinfo/makeinfo.c:1583 #, c-format msgid "" "%s: Removing macro output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#. If there were errors, and no --force, remove the output. -#: makeinfo/makeinfo.c:1420 +#: makeinfo/makeinfo.c:1627 #, c-format msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n" msgstr "" -#: makeinfo/makeinfo.c:1635 +#: makeinfo/makeinfo.c:1853 #, c-format msgid "Unknown command `%s'" msgstr "" -#: makeinfo/makeinfo.c:1657 +#: makeinfo/makeinfo.c:1875 #, c-format msgid "Use braces to give a command as an argument to @%s" msgstr "" -#: makeinfo/makeinfo.c:1838 +#: makeinfo/makeinfo.c:2068 #, c-format msgid "%c%s expected `{...}'" msgstr "" -#: makeinfo/makeinfo.c:1868 +#: makeinfo/makeinfo.c:2098 msgid "Unmatched }" msgstr "" -#: makeinfo/makeinfo.c:1918 +#: makeinfo/makeinfo.c:2148 msgid "NO_NAME!" msgstr "" -#: makeinfo/makeinfo.c:1940 +#: makeinfo/makeinfo.c:2169 #, c-format msgid "%c%s missing close brace" msgstr "" -#: makeinfo/makeinfo.c:2707 makeinfo/makeinfo.c:2884 +#: makeinfo/makeinfo.c:2958 +msgid "First argument to cross-reference may not be empty" +msgstr "" + +#: makeinfo/makeinfo.c:3018 makeinfo/makeinfo.c:3236 makeinfo/xml.c:1340 msgid "see " msgstr "" -#: makeinfo/makeinfo.c:2707 +#: makeinfo/makeinfo.c:3018 msgid "See " msgstr "" -#: makeinfo/makeinfo.c:2836 +#: makeinfo/makeinfo.c:3164 #, c-format msgid "`.' or `,' must follow cross reference, not %c" msgstr "" -#: makeinfo/makeinfo.c:3026 +#: makeinfo/makeinfo.c:3212 +msgid "First argument to @inforef may not be empty" +msgstr "" + +#: makeinfo/makeinfo.c:3427 #, c-format -msgid "No .png or .jpg for `%s'" +msgid "@image file `%s' (for HTML) not readable: %s" msgstr "" -#: makeinfo/makeinfo.c:3063 +#: makeinfo/makeinfo.c:3440 #, c-format -msgid "@image file `%s' unreadable: %s" +msgid "No `%s.png' or `.jpg', and no extension supplied" msgstr "" -#: makeinfo/makeinfo.c:3070 +#: makeinfo/makeinfo.c:3490 +#, c-format +msgid "@image file `%s' (for text) unreadable: %s" +msgstr "" + +#: makeinfo/makeinfo.c:3497 msgid "@image missing filename argument" msgstr "" -#: makeinfo/makeinfo.c:3259 +#: makeinfo/makeinfo.c:3690 #, c-format msgid "{No value for `%s'}" msgstr "" -#: makeinfo/makeinfo.c:3313 +#: makeinfo/makeinfo.c:3744 #, c-format msgid "%c%s requires a name" msgstr "" -#: makeinfo/makeinfo.c:3421 +#: makeinfo/makeinfo.c:3850 #, c-format msgid "Reached eof before matching @end %s" msgstr "" -#: makeinfo/multi.c:208 +#: makeinfo/makeinfo.c:4081 +#, c-format +msgid "`%.40s...' is too long for expansion; not expanded" +msgstr "" + +#: makeinfo/multi.c:226 msgid "Missing } in @multitable template" msgstr "" -#: makeinfo/multi.c:284 +#: makeinfo/multi.c:302 #, c-format msgid "ignoring stray text `%s' after @multitable" msgstr "" -#: makeinfo/multi.c:357 +#: makeinfo/multi.c:375 #, c-format msgid "Too many columns in multitable item (max %d)" msgstr "" -#: makeinfo/multi.c:401 +#: makeinfo/multi.c:426 #, c-format msgid "Cannot select column #%d in multitable" msgstr "" -#: makeinfo/multi.c:504 +#: makeinfo/multi.c:529 msgid "ignoring @tab outside of multitable" msgstr "" -#: makeinfo/multi.c:534 +#: makeinfo/multi.c:565 msgid "** Multicolumn output from last row:\n" msgstr "" -#: makeinfo/multi.c:537 +#: makeinfo/multi.c:568 #, c-format msgid "* column #%d: output = %s\n" msgstr "" -#: makeinfo/node.c:250 +#: makeinfo/node.c:276 #, c-format msgid "Node `%s' previously defined at line %d" msgstr "" -#: makeinfo/node.c:514 +#: makeinfo/node.c:594 #, c-format msgid "Formatting node %s...\n" msgstr "" -#: makeinfo/node.c:559 +#: makeinfo/node.c:655 #, c-format msgid "Node `%s' requires a sectioning command (e.g. %c%s)" msgstr "" -#: makeinfo/node.c:719 +#: makeinfo/node.c:815 #, c-format msgid "No node name specified for `%c%s' command" msgstr "" -#: makeinfo/node.c:774 +#: makeinfo/node.c:856 makeinfo/node.c:1075 +#, c-format +msgid "Anchor `%s' and node `%s' map to the same file name" +msgstr "" + +#: makeinfo/node.c:859 +msgid "This @anchor command ignored; references to it will not work" +msgstr "" + +#: makeinfo/node.c:861 makeinfo/node.c:1078 +msgid "Rename this anchor or use the `--no-split' option" +msgstr "" + +#: makeinfo/node.c:891 +#, c-format +msgid "Unexpected string at end of split-HTML file `%s'" +msgstr "" + +#: makeinfo/node.c:920 msgid "Node:" msgstr "" -#: makeinfo/node.c:783 makeinfo/sectioning.c:528 +#: makeinfo/node.c:930 msgid "Next:" msgstr "" -#: makeinfo/node.c:793 +#: makeinfo/node.c:940 msgid "Previous:" msgstr "" -#: makeinfo/node.c:803 +#: makeinfo/node.c:950 msgid "Up:" msgstr "" -#: makeinfo/node.c:1012 +#: makeinfo/node.c:1072 +#, c-format +msgid "Anchors `%s' and `%s' map to the same file name" +msgstr "" + +#: makeinfo/node.c:1077 +msgid "@anchor command ignored; references to it will not work" +msgstr "" + +#: makeinfo/node.c:1277 #, c-format msgid "%s reference to nonexistent node `%s'" msgstr "" -#: makeinfo/node.c:1029 +#: makeinfo/node.c:1294 msgid "Menu" msgstr "" -#: makeinfo/node.c:1031 +#: makeinfo/node.c:1296 msgid "Cross" msgstr "" -#: makeinfo/node.c:1115 +#: makeinfo/node.c:1380 #, c-format msgid "Next field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1119 +#: makeinfo/node.c:1383 #, c-format msgid "This node (%s) has the bad Prev" msgstr "" -#: makeinfo/node.c:1133 +#: makeinfo/node.c:1395 msgid "Prev" msgstr "" -#: makeinfo/node.c:1176 +#: makeinfo/node.c:1438 #, c-format msgid "Prev field of node `%s' not pointed to" msgstr "" -#: makeinfo/node.c:1180 +#: makeinfo/node.c:1442 #, c-format msgid "This node (%s) has the bad Next" msgstr "" -#: makeinfo/node.c:1194 +#: makeinfo/node.c:1454 #, c-format msgid "`%s' has no Up field" msgstr "" -#: makeinfo/node.c:1197 +#: makeinfo/node.c:1457 msgid "Up" msgstr "" -#: makeinfo/node.c:1265 +#: makeinfo/node.c:1523 #, c-format msgid "Node `%s' lacks menu item for `%s' despite being its Up target" msgstr "" -#: makeinfo/node.c:1296 +#: makeinfo/node.c:1552 #, c-format msgid "node `%s' has been referenced %d times" msgstr "" -#: makeinfo/node.c:1310 +#: makeinfo/node.c:1566 #, c-format msgid "unreferenced node `%s'" msgstr "" -#: makeinfo/sectioning.c:116 +#: makeinfo/sectioning.c:117 #, c-format msgid "Appendix %c " msgstr "" -#. should never happen, but a poor guy, named Murphy ... -#: makeinfo/sectioning.c:328 makeinfo/sectioning.c:410 +#: makeinfo/sectioning.c:356 makeinfo/sectioning.c:444 #, c-format msgid "Internal error (search_sectioning) \"%s\"!" msgstr "" -#: makeinfo/sectioning.c:468 +#: makeinfo/sectioning.c:502 #, c-format msgid "%c%s is obsolete; use %c%s instead" msgstr "" -#: makeinfo/sectioning.c:484 +#: makeinfo/sectioning.c:518 #, c-format msgid "Node with %ctop as a section already exists" msgstr "" -#: makeinfo/sectioning.c:496 +#: makeinfo/sectioning.c:526 #, c-format msgid "Here is the %ctop node" msgstr "" -#: makeinfo/sectioning.c:515 +#: makeinfo/sectioning.c:543 #, c-format msgid "%ctop used before %cnode, defaulting to %s" msgstr "" -#. in case we are writing stdout -#: makeinfo/toc.c:212 makeinfo/toc.c:261 makeinfo/toc.c:262 +#: makeinfo/toc.c:221 makeinfo/toc.c:298 makeinfo/toc.c:299 msgid "Table of Contents" msgstr "" -#. in case we are writing stdout -#: makeinfo/toc.c:292 makeinfo/toc.c:319 makeinfo/toc.c:320 +#: makeinfo/toc.c:330 makeinfo/toc.c:366 makeinfo/toc.c:367 msgid "Short Contents" msgstr "" -#: makeinfo/toc.c:354 +#: makeinfo/toc.c:406 #, c-format msgid "%s: TOC should be here, but it was not found" msgstr "" +#: makeinfo/xml.c:1108 +#, c-format +msgid "@image file `%s' unreadable: %s" +msgstr "" + #: util/install-info.c:151 #, c-format msgid "%s: warning: " @@ -2151,12 +2519,9 @@ msgid "" " If you don't specify any sections, they are determined\n" " from information in the Info file itself.\n" " --version display version information and exit.\n" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" msgstr "" -#: util/install-info.c:442 +#: util/install-info.c:444 #, c-format msgid "" "This is the file .../info/dir, which contains the\n" @@ -2176,137 +2541,124 @@ msgid "" "* Menu:\n" msgstr "" -#: util/install-info.c:465 +#: util/install-info.c:467 #, c-format msgid "%s: could not read (%s) and could not create (%s)\n" msgstr "" -#: util/install-info.c:549 +#: util/install-info.c:551 #, c-format msgid "%s: empty file" msgstr "" -#: util/install-info.c:864 util/install-info.c:904 +#: util/install-info.c:866 util/install-info.c:906 msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY" msgstr "" -#: util/install-info.c:899 +#: util/install-info.c:901 msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY" msgstr "" -#: util/install-info.c:1147 util/install-info.c:1157 +#: util/install-info.c:1150 util/install-info.c:1160 #, c-format msgid "%s: Specify the Info directory only once.\n" msgstr "" -#: util/install-info.c:1192 +#: util/install-info.c:1195 #, c-format msgid "%s: Specify the Info file only once.\n" msgstr "" -#: util/install-info.c:1241 +#: util/install-info.c:1244 #, c-format msgid "excess command line argument `%s'" msgstr "" -#: util/install-info.c:1245 +#: util/install-info.c:1248 msgid "No input file specified; try --help for more information." msgstr "" -#: util/install-info.c:1247 +#: util/install-info.c:1251 msgid "No dir file specified; try --help for more information." msgstr "" -#. No need to abort here, the original info file may not -#. have the requisite Texinfo commands. This is not -#. something an installer should have to correct (it's a -#. problem for the maintainer), and there's no need to cause -#. subsequent parts of `make install' to fail. -#: util/install-info.c:1269 +#: util/install-info.c:1273 #, c-format msgid "no info dir entry in `%s'" msgstr "" -#: util/install-info.c:1384 +#: util/install-info.c:1388 #, c-format msgid "menu item `%s' already exists, for file `%s'" msgstr "" -#: util/install-info.c:1407 +#: util/install-info.c:1411 #, c-format msgid "no entries found for `%s'; nothing deleted" msgstr "" -#: util/texindex.c:244 +#: util/texindex.c:245 msgid "display this help and exit" msgstr "" -#: util/texindex.c:246 +#: util/texindex.c:247 msgid "keep temporary files around after processing" msgstr "" -#: util/texindex.c:248 +#: util/texindex.c:249 msgid "do not keep temporary files around after processing (default)" msgstr "" -#: util/texindex.c:250 +#: util/texindex.c:251 msgid "send output to FILE" msgstr "" -#: util/texindex.c:252 +#: util/texindex.c:253 msgid "display version information and exit" msgstr "" -#: util/texindex.c:263 +#: util/texindex.c:264 #, c-format msgid "Usage: %s [OPTION]... FILE...\n" msgstr "" -#: util/texindex.c:264 +#: util/texindex.c:265 msgid "Generate a sorted index for each TeX output FILE.\n" msgstr "" -#: util/texindex.c:267 +#: util/texindex.c:268 #, c-format msgid "Usually FILE... is specified as `foo.%c%c' for a document `foo.texi'.\n" msgstr "" -#. avoid trigraph in cat-id-tbl.c -#: util/texindex.c:269 +#: util/texindex.c:270 msgid "" "\n" "Options:\n" msgstr "" -#: util/texindex.c:285 -msgid "" -"\n" -"Email bug reports to bug-texinfo@gnu.org,\n" -"general questions and discussion to help-texinfo@gnu.org.\n" -msgstr "" - -#: util/texindex.c:885 util/texindex.c:919 util/texindex.c:995 -#: util/texindex.c:1023 +#: util/texindex.c:887 util/texindex.c:921 util/texindex.c:997 +#: util/texindex.c:1025 #, c-format msgid "%s: not a texinfo index file" msgstr "" -#: util/texindex.c:980 +#: util/texindex.c:982 #, c-format msgid "failure reopening %s" msgstr "" -#: util/texindex.c:1222 +#: util/texindex.c:1224 #, c-format msgid "No page number in %s" msgstr "" -#: util/texindex.c:1293 +#: util/texindex.c:1295 #, c-format msgid "entry %s follows an entry with a secondary name" msgstr "" -#: util/texindex.c:1631 +#: util/texindex.c:1633 #, c-format msgid "%s; for file `%s'.\n" msgstr "" |