[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo ChangeLog doc/texi2oldapi.texi doc/texi...
|
From: |
Patrice Dumas |
|
Subject: |
texinfo ChangeLog doc/texi2oldapi.texi doc/texi... |
|
Date: |
Sat, 09 Apr 2011 00:10:51 +0000 |
CVSROOT: /sources/texinfo
Module name: texinfo
Changes by: Patrice Dumas <pertusus> 11/04/09 00:10:47
Modified files:
. : ChangeLog
doc : texi2oldapi.texi texinfo.txi version.texi
po : POTFILES.in cs.po da.po de.po de_AT.po eo.po
es.po fr.po he.po hr.po hu.po id.po it.po ja.po
nb.po nl.po pl.po ro.po ru.po rw.po sv.po tr.po
uk.po vi.po zh_CN.po zh_TW.po
po_document : POTFILES.in de.us-ascii.po es.us-ascii.po
fr.us-ascii.po hu.po it.po ja.po nl.us-ascii.po
no.us-ascii.po pt.us-ascii.po pt_BR.us-ascii.po
texi2html : Makefile.am README.dev TODO manage_i18n.pl.in
texi2html.pl texi2html.spec.in
texi2html/po_document: POTFILES.in.in
texi2html/po_messages: POTFILES.in.in
texi2html/test : run_test.sh run_test_all.sh
texi2html/test/contents: tests.txt
texi2html/test/encodings: tests.txt
texi2html/test/formatting: tests.txt
texi2html/test/indices: tests.txt
texi2html/test/layout: tests.txt
texi2html/test/macros: tests.txt
texi2html/test/manuals: tests.txt
texi2html/test/misc: tests.txt
texi2html/test/sectioning: tests.txt
texi2html/test/singular_manual: tests.txt
Added files:
texi2html : texi2html.pm
texi2html/examples: enable_encoding.pm makeinfo.pm noheaders.pm
roff.pm utf8.pm xhtml.pm
texi2html/formats: docbook.pm html.pm info.pm plaintext.pm
xml.pm
texi2html/maintained_extra: book.pm chm.pm html32.pm
mediawiki.pm tex4ht.pm
Removed files:
texi2html : texi2html.init
texi2html/examples: enable_encoding.init makeinfo.init
noheaders.init roff.init utf8.init
xhtml.init
texi2html/formats: docbook.init html.init info.init
plaintext.init xml.init
texi2html/maintained_extra: book.init chm.init html32.init
mediawiki.init tex4ht.init
Log message:
* */*: rename major .init files as .pm files, especially
those that are processed by xgettext. Report from Sergey
Poznyakoff.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/ChangeLog?cvsroot=texinfo&r1=1.1232&r2=1.1233
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texi2oldapi.texi?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/texinfo.txi?cvsroot=texinfo&r1=1.378&r2=1.379
http://cvs.savannah.gnu.org/viewcvs/texinfo/doc/version.texi?cvsroot=texinfo&r1=1.94&r2=1.95
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/POTFILES.in?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/cs.po?cvsroot=texinfo&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/da.po?cvsroot=texinfo&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/de.po?cvsroot=texinfo&r1=1.81&r2=1.82
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/de_AT.po?cvsroot=texinfo&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/eo.po?cvsroot=texinfo&r1=1.74&r2=1.75
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/es.po?cvsroot=texinfo&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/fr.po?cvsroot=texinfo&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/he.po?cvsroot=texinfo&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/hr.po?cvsroot=texinfo&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/hu.po?cvsroot=texinfo&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/id.po?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/it.po?cvsroot=texinfo&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/ja.po?cvsroot=texinfo&r1=1.66&r2=1.67
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/nb.po?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/nl.po?cvsroot=texinfo&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/pl.po?cvsroot=texinfo&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/ro.po?cvsroot=texinfo&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/ru.po?cvsroot=texinfo&r1=1.76&r2=1.77
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/rw.po?cvsroot=texinfo&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/sv.po?cvsroot=texinfo&r1=1.77&r2=1.78
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/tr.po?cvsroot=texinfo&r1=1.73&r2=1.74
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/uk.po?cvsroot=texinfo&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/vi.po?cvsroot=texinfo&r1=1.46&r2=1.47
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/zh_CN.po?cvsroot=texinfo&r1=1.67&r2=1.68
http://cvs.savannah.gnu.org/viewcvs/texinfo/po/zh_TW.po?cvsroot=texinfo&r1=1.63&r2=1.64
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/POTFILES.in?cvsroot=texinfo&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/de.us-ascii.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/es.us-ascii.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/fr.us-ascii.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/hu.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/it.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/ja.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/nl.us-ascii.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/no.us-ascii.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/pt.us-ascii.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/po_document/pt_BR.us-ascii.po?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/Makefile.am?cvsroot=texinfo&r1=1.84&r2=1.85
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/README.dev?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/TODO?cvsroot=texinfo&r1=1.201&r2=1.202
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/manage_i18n.pl.in?cvsroot=texinfo&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.pl?cvsroot=texinfo&r1=1.434&r2=1.435
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.spec.in?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/texi2html.init?cvsroot=texinfo&r1=1.292&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/enable_encoding.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/makeinfo.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/noheaders.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/roff.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/utf8.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/xhtml.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/enable_encoding.init?cvsroot=texinfo&r1=1.13&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/makeinfo.init?cvsroot=texinfo&r1=1.42&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/noheaders.init?cvsroot=texinfo&r1=1.22&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/roff.init?cvsroot=texinfo&r1=1.42&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/utf8.init?cvsroot=texinfo&r1=1.10&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/examples/xhtml.init?cvsroot=texinfo&r1=1.12&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/docbook.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/html.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/info.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/plaintext.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/xml.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/docbook.init?cvsroot=texinfo&r1=1.38&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/html.init?cvsroot=texinfo&r1=1.60&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/info.init?cvsroot=texinfo&r1=1.60&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/plaintext.init?cvsroot=texinfo&r1=1.9&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/formats/xml.init?cvsroot=texinfo&r1=1.31&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/book.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/chm.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/html32.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/mediawiki.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/tex4ht.pm?cvsroot=texinfo&rev=1.1
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/book.init?cvsroot=texinfo&r1=1.7&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/chm.init?cvsroot=texinfo&r1=1.8&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/html32.init?cvsroot=texinfo&r1=1.10&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/mediawiki.init?cvsroot=texinfo&r1=1.9&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/maintained_extra/tex4ht.init?cvsroot=texinfo&r1=1.8&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/po_document/POTFILES.in.in?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/po_messages/POTFILES.in.in?cvsroot=texinfo&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/run_test.sh?cvsroot=texinfo&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/run_test_all.sh?cvsroot=texinfo&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/contents/tests.txt?cvsroot=texinfo&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/encodings/tests.txt?cvsroot=texinfo&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/formatting/tests.txt?cvsroot=texinfo&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/indices/tests.txt?cvsroot=texinfo&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/layout/tests.txt?cvsroot=texinfo&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/macros/tests.txt?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/manuals/tests.txt?cvsroot=texinfo&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/misc/tests.txt?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/sectioning/tests.txt?cvsroot=texinfo&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/texinfo/texi2html/test/singular_manual/tests.txt?cvsroot=texinfo&r1=1.5&r2=1.6
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.1232
retrieving revision 1.1233
diff -u -b -r1.1232 -r1.1233
--- ChangeLog 8 Apr 2011 22:00:55 -0000 1.1232
+++ ChangeLog 9 Apr 2011 00:10:36 -0000 1.1233
@@ -1,3 +1,14 @@
+2011-04-09 Patrice Dumas <address@hidden>
+
+ * */*: rename major .init files as .pm files, especially
+ those that are processed by xgettext. Report from Sergey
+ Poznyakoff.
+
+2011-04-07 Patrice Dumas <address@hidden>
+
+ * po/POTFILES.in: re-add perl files that have error messages.
+ * po_document/POTFILES.in: add tp/Convert/HTML.pm.
+
2011-04-08 Karl Berry <address@hidden>
* util/gendocs.sh: split_html_db_dir used before definition.
Index: doc/texi2oldapi.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texi2oldapi.texi,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- doc/texi2oldapi.texi 10 Jan 2011 17:45:53 -0000 1.2
+++ doc/texi2oldapi.texi 9 Apr 2011 00:10:38 -0000 1.3
@@ -63,7 +63,7 @@
@item Some options, although obsoleted are still available.
@item The defaults for the HTML formatting may be slightly different.
Have a look at the function @code{t2h_default_set_variables_texi2html}
-in @file{texi2html.init}.
+in @file{texi2html.pm}.
@end itemize
@node Texi2HTML changes
Index: doc/texinfo.txi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/texinfo.txi,v
retrieving revision 1.378
retrieving revision 1.379
diff -u -b -r1.378 -r1.379
--- doc/texinfo.txi 18 Mar 2011 23:20:37 -0000 1.378
+++ doc/texinfo.txi 9 Apr 2011 00:10:38 -0000 1.379
@@ -1,5 +1,5 @@
\input texinfo.tex @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.378 2011/03/18 23:20:37 karl Exp $
address@hidden $Id: texinfo.txi,v 1.379 2011/04/09 00:10:38 pertusus Exp $
@c Ordinarily, Texinfo files have the extension .texi. But texinfo.texi
@c clashes with texinfo.tex on 8.3 filesystems, so we use texinfo.txi.
@@ -16350,7 +16350,8 @@
@item address@hidden
@opindex address@hidden
Load @var{file} as code to modify the behavior and output of the
-generated manual. It is customary to use the @code{.init} extension
+generated manual. It is customary to use the @code{.pm} or
+the @code{.init} extensions
for these customization files, but that is not enforced by anything;
the @var{file} name is taken literally. @option{--conf-dir} (see
above) may be used to add to the list of directories in which these
@@ -18048,7 +18049,7 @@
@samp{<html>} attribute is used; 3)@tie{} Entities that are not in the
address@hidden standard are also used.
-Using @samp{--init-file=html32.init} produces strict address@hidden
+Using @samp{--init-file=html32.pm} produces strict address@hidden
output (@pxref{Invoking texi2any}).
Please report output from an error-free run of @code{makeinfo} which
@@ -18903,13 +18904,13 @@
@cindex Perl, language for init files
Init files are written in Perl, and by convention have extension
address@hidden Several init files are included in the Texinfo
address@hidden or @file{.pm}. Several init files are included in the Texinfo
distribution (some are crucial components of the program), and can
serve as a good model for writing your own. In particular, the
address@hidden file is used to set all the defaults for
address@hidden file is used to set all the defaults for
Texinfo. Although it is large, it contains many useful examples of
-settings. Smaller examples include @file{utf8.init},
address@hidden, and plenty more.
+settings. Smaller examples include @file{utf8.pm},
address@hidden, and plenty more.
@menu
* Init File Variables:: Configuration & other variables, function references.
@@ -23170,7 +23171,7 @@
(@url{http://www.gnu.org/software/rcs}) version control systems, which
expand it into a string such as:
@example
-$Id: texinfo.txi,v 1.378 2011/03/18 23:20:37 karl Exp $
+$Id: texinfo.txi,v 1.379 2011/04/09 00:10:38 pertusus Exp $
@end example
(This is useful in all sources that use version control, not just manuals.)
You may wish to include the @samp{$Id:} comment in the @code{@@copying}
@@ -23249,7 +23250,7 @@
@verbatim
\input texinfo @c -*-texinfo-*-
address@hidden $Id: texinfo.txi,v 1.378 2011/03/18 23:20:37 karl Exp $
address@hidden $Id: texinfo.txi,v 1.379 2011/04/09 00:10:38 pertusus Exp $
@comment %**start of header
@setfilename sample.info
@include version.texi
Index: doc/version.texi
===================================================================
RCS file: /sources/texinfo/texinfo/doc/version.texi,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -b -r1.94 -r1.95
--- doc/version.texi 20 Mar 2011 21:20:23 -0000 1.94
+++ doc/version.texi 9 Apr 2011 00:10:38 -0000 1.95
@@ -1,4 +1,4 @@
address@hidden UPDATED 20 March 2011
address@hidden UPDATED-MONTH March 2011
address@hidden UPDATED 9 April 2011
address@hidden UPDATED-MONTH April 2011
@set EDITION 4.13
@set VERSION 4.13
Index: po/POTFILES.in
===================================================================
RCS file: /sources/texinfo/texinfo/po/POTFILES.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- po/POTFILES.in 6 Apr 2011 23:43:14 -0000 1.11
+++ po/POTFILES.in 9 Apr 2011 00:10:38 -0000 1.12
@@ -46,19 +46,19 @@
makeinfo/xref.c
util/texindex.c
texi2html/texi2html.pl
-texi2html/texi2html.init
+texi2html/texi2html.pm
texi2html/T2h_l2h.pm
texi2html/T2h_i18n.pm
-texi2html/formats/docbook.init
-texi2html/formats/html.init
-texi2html/formats/info.init
-texi2html/formats/plaintext.init
-texi2html/formats/xml.init
-texi2html/maintained_extra/book.init
-texi2html/maintained_extra/chm.init
-texi2html/maintained_extra/html32.init
-texi2html/maintained_extra/tex4ht.init
-texi2html/maintained_extra/mediawiki.init
+texi2html/formats/docbook.pm
+texi2html/formats/html.pm
+texi2html/formats/info.pm
+texi2html/formats/plaintext.pm
+texi2html/formats/xml.pm
+texi2html/maintained_extra/book.pm
+texi2html/maintained_extra/chm.pm
+texi2html/maintained_extra/html32.pm
+texi2html/maintained_extra/tex4ht.pm
+texi2html/maintained_extra/mediawiki.pm
tp/texi2any.pl
tp/Texinfo/Common.pm
tp/Texinfo/Parser.pm
Index: po/cs.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/cs.po,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- po/cs.po 20 Mar 2011 21:20:24 -0000 1.63
+++ po/cs.po 9 Apr 2011 00:10:38 -0000 1.64
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2000-10-31 15:17+01:00\n"
"Last-Translator: Vladimir Michl <address@hidden>\n"
"Language-Team: Czech <address@hidden>\n"
@@ -82,11 +82,11 @@
msgid "memory exhausted"
msgstr "virtuální pamì» vyèerpána"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Posun na následující znak"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Posun na pøedcházející znak"
@@ -98,11 +98,11 @@
msgid "Move to the end of this line"
msgstr "Pøesun na konec tohoto øádku"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Posun na následující slovo"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Posun na pøedcházející slovo"
@@ -183,6 +183,7 @@
msgstr "Jedinné doplnìní"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Jedno doplnìní:\n"
@@ -196,6 +197,7 @@
msgstr "Vlo¾ení doplnìní"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Hledám doplnìní..."
@@ -222,10 +224,12 @@
msgstr "Vyhledání øetìzce v rejstøíku tohoto souboru"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Jsou hledány polo¾ky rejstøíku..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "®ádný rejstøík nebyl nalezen."
@@ -241,10 +245,12 @@
"\\[index-search]'"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Není zadán øetìzec, který se má vyhledávat v rejstøíku(cích)."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Nejsou polo¾ky rejstøíku."
@@ -294,13 +300,13 @@
"\n"
"* Menu: Uzly jejich¾ rejstøíky obsahují \"%s\":\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Více informací mù¾ete získat pomocí pøepínaèe --help.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -310,12 +316,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -323,7 +329,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -333,7 +339,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -341,7 +347,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -349,11 +355,11 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -363,7 +369,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -373,13 +379,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -393,7 +399,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
#, fuzzy
msgid ""
@@ -408,72 +414,72 @@
"obecné otázky smìøujte na <address@hidden>. Pøipomínky k pøekladu\n"
"zasílejte na <address@hidden> (èesky).\n"
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Uzel `%s' nelze nalézt."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Uzel `(%s)%s' nelze nalézt."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Nelze nalézt okno!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Bod se nevyskutuje v oknì tohoto uzlu!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Poslední okno nelze smazat."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "V tomto uzlu není menu."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "V tomto nejsou poznámky pod èarou."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "V tomto uzlu není køí¾ový odkaz."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Pro tento uzel není `%s' ukazatel."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Neznámý Info pøíkaz `%c'; zkuste `?' pro nápovìdu."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Typ terminálu `%s' není dostateènì inteligentní pro provoz Infa."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Ji¾ jste na poslední stránce tohoto uzlu."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Ji¾ jste na první stránce tohoto uzlu."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Pouze jedno okno."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Výsledné okno by bylo pøíli¹ malé."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Není volné místo pro okno nápovìdy, prosím sma¾te nìkteré okno."
@@ -791,16 +797,19 @@
" a zobrazení uzlu, ve kterém je nalezen dal¹í výskyt tohoto øetìzce.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Aktuální hledací cesta je:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
msgstr "Pøíkazy dostupné v Info oknech:\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -816,7 +825,7 @@
"\n"
#: info/infodoc.c:347
-#, fuzzy
+#, fuzzy, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -824,62 +833,62 @@
"Následující pøíkazy mohou být vykonány pouze pomocí M-x:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Zobrazení nápovìdy"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Zobrazení Info uzlu `(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Zobrazení dokumentace ke KLÁVESE"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Popis klávesy: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s je nedefinováno."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s je nedefinováno."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "Klávesa %s je definována pro pøíkaz %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Ukázání co napsat pro spu¹tìní daného pøíkazu"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Kde je pøíkaz: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "Pøíkaz `%s' není na ¾ádné klávese"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, 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:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "Pøíkaz %s mù¾e být vyvolán pomocí %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Funkce `%s' není známa"
@@ -892,93 +901,102 @@
"----------------------\n"
msgstr "Výbìr dal¹ích uzlù:\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr ""
-#: info/infokey.c:201
+#: info/infokey.c:199
#, fuzzy, c-format
msgid "cannot open input file `%s'"
msgstr "Rouru do `%s' nelze otevøít."
-#: info/infokey.c:215
+#: info/infokey.c:213
#, fuzzy, c-format
msgid "cannot create output file `%s'"
msgstr "Výstupní soubor `%s' nelze vytvoøit."
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr ""
-#: info/infokey.c:232
+#: info/infokey.c:230
#, fuzzy, c-format
msgid "error closing output file `%s'"
msgstr "Výstupní soubor `%s' nelze vytvoøit."
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr ""
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr ""
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr ""
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr ""
-#: info/infokey.c:665
-#, fuzzy
+#: info/infokey.c:660
+#, fuzzy, c-format
msgid "missing action name"
msgstr "%c%s chybìjící uzavírací závorka"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr ""
-#: info/infokey.c:688
+#: info/infokey.c:681
#, fuzzy, c-format
msgid "unknown action `%s'"
msgstr "Neznámý pøíkaz `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr ""
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr ""
-#: info/infokey.c:723
-#, fuzzy
+#: info/infokey.c:715
+#, fuzzy, c-format
msgid "missing variable name"
msgstr "%s: chybí argument jména souboru.\n"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr ""
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr ""
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr ""
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr ""
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1031,10 +1049,12 @@
msgstr ""
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
@@ -1051,6 +1071,7 @@
msgstr "Zadání jména pøíkazu v zobrazovacím poli a jeho vykonání"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Pøíkaz zobrazovacího pole nelze vykonat zde."
@@ -1114,7 +1135,7 @@
msgid "Select visited node: "
msgstr "Vyberte nav¹tívený uzel: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Odkaz se ztratil! (%s)."
@@ -1124,7 +1145,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1133,509 +1154,521 @@
"Vítejte v programu Info verze %s. Stisknìte \\[get-help-window] pro "
"nápovìdu, \\[menu-item] pro polo¾ku menu."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Posun dolù na dal¹í øádek"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Posun nahoru na pøedchozí øádek"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Pøesun na konec øádku"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Pøesun na zaèátek øádku"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Dal¹í"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "V tomto dokumentu ji¾ nejsou dal¹í uzly."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Pro tento uzel není pøedchozí uzel."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "V tomto dokumentu není pro tento uzel pøedchozí nebo vy¹¹í uzel."
-#: info/session.c:1412
+#: info/session.c:1401
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:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Pøesun na pøedchozí uzel nebo na první vy¹¹í v uzlové struktuøe"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Posun o stránku dolù v tomto oknì"
-#: info/session.c:1537
+#: info/session.c:1526
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:1545
+#: info/session.c:1534
#, fuzzy
msgid "Scroll forward in this window staying within node"
msgstr "Posun o stránku dolù v tomto oknì"
-#: info/session.c:1553
+#: info/session.c:1542
#, 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:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Posun o stránku nahoru v tomto oknì"
-#: info/session.c:1569
+#: info/session.c:1558
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:1578
+#: info/session.c:1567
#, fuzzy
msgid "Scroll backward in this window staying within node"
msgstr "Posun o stránku nahoru v tomto oknì"
-#: info/session.c:1586
+#: info/session.c:1575
#, 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:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Posun na zaèátek tohoto uzlu"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Posun na konec tohoto uzlu"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Posun dolù po øádcích"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Posun nahoru po øádcích"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Posun dolù o polovinu velikosti obrazovky"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Posun nahoru o polovinu velikosti obrazovky"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Výbìr následujícího okna"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Výbìr pøedchozího okna"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Rozdìlení aktuálního okna"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Smazání aktuálního okna"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Permanentní okno nelze smazat"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Smazání v¹ech ostatních oknen"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Posun druhého okna o stránku dolù"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Posun druhého okna o stránku zpìt"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Zmìna velikosti okna"
-#: info/session.c:1993
+#: info/session.c:1982
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:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr ""
"Zmìna stavu zalamování v aktuálním oknì (zapnuto->vypni, vypnuto->zapni)"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Zobrazení následujícího uzlu"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Zobrazení pøedchozího uzlu"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Zobrazení vy¹¹ího uzlu"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Zobrazení posledního uzlu v tomto souboru"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Toto okno nemá více dal¹ích uzlù"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Zobrazení prvního uzlu v tomto souboru"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Zobrazení poslední polo¾ky menu tohoto uzlu"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Zobrazení této polo¾ky menu"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "V tomto menu není %d. polo¾ka"
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Polo¾ka menu (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Polo¾ka menu: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Následování køí¾ového odkazu (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Následování køí¾ového odkazu: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Zadání jména polo¾ky menu a následné zobrazení"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr ""
"Zadání jména poznámky pod èarou nebo køí¾ového odkazu a následné zobrazení"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Pøesun na zaèátek menu tohoto uzlu"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr ""
"Nav¹tívení tolika polo¾ek menu, kolik je mo¾no. Ka¾dá polo¾ka v jiném oknì."
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Zadání jména uzlu a jeho následné zobrazení"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Pøesun na uzel: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "V uzlu `%s' není menu."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Polo¾ka menu `%s' v uzlu `%s' není."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Uzel, na který se odkazuje `%s' v `%s', nelze najít."
-#: info/session.c:2964
+#: info/session.c:2957
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:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Následování menu: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Nalezení uzlu popisujícího pøepínaèe programu"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Nalezení uzlu s pøepínaèi programu [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Zadání jména manuálové stránky a následné zobrazení"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Manuálová stránka: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Zobrazení nejvy¹¹ího uzlu v tomto souboru"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Zobrazení uzlu `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Zru¹ení uzlu (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Uzel `%s' nelze zru¹it"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Poslední uzel nelze zru¹it"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Zobrazení poslední dobou nejvíce nav¹tìvovaných uzlù"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Zru¹ení tohoto uzlu"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Zadání jména souboru a jeho následné zobrazení"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Nalezení souboru: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Nelze najít `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Výstupní soubor `%s' nelze vytvoøit."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Dokonèeno."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Zapisování uzlu %s..."
-#: info/session.c:3629
+#: info/session.c:3621
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:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Rouru do `%s' nelze otevøít."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Probíhá tisk uzlu %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "Smazání v¹eho od zaèátku øádku do kurzoru"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Probíhá hledání podsouboru %s..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Pøeètení øetìzce a jeho vyhledání (zále¾í na velikosti písmen)"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Pøeètení øetìzce a jeho vyhledání"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Pøeètení øetìzce a jeho vyhledání (zpìtné)"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%søetìzce [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr " (velikost rozhoduje)"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Zpìtné hledání"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Hledání"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Nebylo nalezeno."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Opakování posledního hledání tím samým smìrem"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Není pøedchozí hledaný øetìzec"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Opakování posledního hledání opaèným smìrem"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
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:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "zpìtné interaktivní hledání: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "zpìtné interaktivní hledání: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "interaktivní hledání: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "interaktivní hledání: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Bezvýsledné "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Pøesun na pøedcházející køí¾ový odkaz"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Pøesun na následující køí¾ový odkaz"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Zobrazení odkazu nebo polo¾ky menu, která je na tomto øádku"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Zru¹ení aktuální operace"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Ukonèení operace"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Pøesun kurzoru na zadaný øádek okna"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Pøekreslení obrazovky"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Ukonèení Infa"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr ""
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Neznámý pøíkaz (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "Sekvence kláves \"%s\" je neplatná"
-#: info/session.c:4973
+#: info/session.c:4965
#, fuzzy, c-format
msgid "`%s' is invalid"
msgstr "Sekvence kláves \"%s\" je neplatná"
-#: info/session.c:5188
+#: info/session.c:5180
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:5197
+#: info/session.c:5189
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:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Vnitønì u¾íváno funkcí \\[universal-argument]"
@@ -1746,31 +1779,26 @@
msgid " Subfile: %s"
msgstr " Podsoubor: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: varování: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " pro %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "Více informací získáte pøíkazem `%s --help'.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1784,7 +1812,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1800,7 +1828,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1815,7 +1843,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1831,14 +1859,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1851,7 +1879,7 @@
"obecné otázky smìøujte na <address@hidden>. Pøipomínky k pøekladu\n"
"zasílejte na <address@hidden> (èesky).\n"
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, fuzzy, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1889,65 +1917,69 @@
"\n"
"* Menu:\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: %s nelze èíst a %s nelze vytvoøit\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: prázdný soubor"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY bez odpovídajícího END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY bez pøedchozího START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr ""
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Info soubor zadejte pouze jednou.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "nadbyteèný argument `%s' v pøíkazovém øádku"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Vstupní soubor nezadán; pou¾itím pøepínaèe --help získáte bli¾¹í informace."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
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"
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "v Info adresáøi `%s' není ¾ádná polo¾ka"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "pro `%s' nebyly nalezeny ¾ádné polo¾ky"
@@ -2019,6 +2051,7 @@
msgstr "nepravdìpodobný znak %c ve @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@sc argument je celý velkými písmeny, zbyteènì"
@@ -2028,6 +2061,7 @@
msgstr "address@hidden' vy¾aduje `%s', ale vidí `%s'"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr ""
@@ -2036,7 +2070,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "address@hidden' vy¾aduje `%s', ale vidí `%s'"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2047,7 +2083,7 @@
msgid "%c%s is obsolete"
msgstr "Pøíkaz %c%s je zastaralý"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp vy¾aduje kladný èíselný argument a ne `%s'"
@@ -2057,17 +2093,17 @@
msgid "Bad argument to %c%s"
msgstr "©patný argument pro %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "none"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "©patný argument pro %c%s"
@@ -2076,32 +2112,33 @@
msgid "insert"
msgstr ""
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "©patný argument pro %c%s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Chybìjící `}' v argumentu @def"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr ""
@@ -2122,10 +2159,11 @@
msgstr ""
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr ""
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2145,12 +2183,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Chybí uzavírací závorka pro poznámku pod èarou `%s'"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Poznámka pod èarou definována bez rodièovského uzlu"
#: makeinfo/footnote.c:209
-#, fuzzy
+#, fuzzy, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Poznámka pod èarou definována bez rodièovského uzlu"
@@ -2163,21 +2202,22 @@
msgid "%s: could not open --css-file: %s"
msgstr ""
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr ""
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr ""
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, fuzzy, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "%s: neznámý pøepínaè `--%s'\n"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Neznámý rejstøík `%s'"
@@ -2206,14 +2246,14 @@
msgid "(line %*d)"
msgstr ""
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Neznámý rejstøík `%s' v @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Polo¾ka pro rejstøík `%s' je mimo v¹echny uzly"
@@ -2223,6 +2263,7 @@
msgstr "(mimo v¹echny uzly)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr ""
@@ -2231,6 +2272,7 @@
msgstr "Chybný typ v insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Výpoèetní zásobník pøetekl"
@@ -2239,7 +2281,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "písmenkování pøeteklo, znovu zaèínám na %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2250,14 +2292,14 @@
msgid "%cfloat environments cannot be nested"
msgstr ""
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden' vy¾aduje `%s', ale vidí `%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2269,31 +2311,35 @@
msgstr "%s vy¾aduje písmeno nebo èíslici"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr ""
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, fuzzy, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s není myslitelné uvnitø address@hidden' bloku"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"proto¾e vá¹ uzel @top by mìl být uzavøen v @ifnottex spí¹e ne¾ v @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu spatøeno pøed prvním uzlem, vytvoøen uzel `Top'"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2303,9 +2349,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s není myslitelné uvnitø address@hidden' bloku"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2316,14 +2362,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s' potøebuje nìjaký argument"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, fuzzy, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Chybný argument pro `%s', `%s', pou¾ívám `%s'"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s není myslitelné uvnitø address@hidden' bloku"
@@ -2368,17 +2414,17 @@
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:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s vy¾aduje jeden znak `i' nebo `j' jako argument"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro `%s' ji¾ bylo definováno"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "zde je pøedchozí definice `%s'"
@@ -2393,59 +2439,61 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makro `%s' volané na øádku %d s pøíli¹ mnoha argumenty"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend makro nebylo nalezeno"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "pomíchané @end %s s @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Pøíli¹ mnoho chyb! Konec.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: varování: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "©patnì umístìný znak %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Více informací získáte pøíkazem `%s --help'.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, fuzzy, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Pou¾ití: %s [PØEPÍNAÈ]... SOUBOR...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2460,7 +2508,7 @@
" --version display version information and exit.\n"
msgstr ""
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2470,7 +2518,7 @@
" --plaintext output plain text rather than Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2489,7 +2537,7 @@
" -o, --output=FILE output to FILE (or directory if split HTML).\n"
msgstr ""
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2511,7 +2559,7 @@
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2522,7 +2570,7 @@
" produce file names in ASCII transliteration.\n"
msgstr ""
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2532,7 +2580,7 @@
"dropped.\n"
msgstr ""
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2542,7 +2590,7 @@
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2562,7 +2610,7 @@
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2571,7 +2619,7 @@
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2609,87 +2657,87 @@
"obecné otázky smìøujte na <address@hidden>. Pøipomínky k pøekladu\n"
"zasílejte na <address@hidden> (èesky)."
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, 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:683
+#: makeinfo/makeinfo.c:633
#, fuzzy, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, fuzzy, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `"
"%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-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:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: chybí argument jména souboru.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr ""
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Oèekáváno `%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr ""
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Soubor `%s' nenalezen v `%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, 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:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Vytváøím %s soubor `%s' ze souboru `%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2697,14 +2745,14 @@
"%s: Výstupní soubor maker `%s' byl odstranìn, proto¾e byly nalezeny chyby;\n"
"u¾ijte pøepínaè --force k ponechání souboru.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-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:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2713,96 +2761,99 @@
"%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:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Neznámý pøíkaz `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-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:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, fuzzy, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s oèekáváno `{...}'"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Nepárová }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "Funkce neexistuje!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s chybìjící uzavírací závorka"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, 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:3488
+#: makeinfo/makeinfo.c:3414
#, fuzzy, c-format
msgid "No such file `%s'"
msgstr "Soubor `%s' nenalezen v `%s'"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, 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:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "pøíkaz @image postrádá jméno souboru"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Pro `%s' není hodnota}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s po¾aduje jméno"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Vstupní soubor skonèil a pøíkaz address@hidden %s' nebyl nalezen"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr ""
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Chybìjící } v @multitable vzoru"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "ignoruji zbloudilý text `%s' po pøíkazu @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Pøíli¹ mnoho sloupcù v multitabulkové polo¾ce (max %d)"
@@ -2812,7 +2863,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "sloupec #%d v multitabulce nelze vybrat"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "pøíkaz address@hidden' ignorován, je mimo multitabulku"
@@ -2852,10 +2904,12 @@
msgstr ""
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr ""
@@ -2870,6 +2924,7 @@
msgstr ""
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
@@ -2903,16 +2958,16 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr ""
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-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:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz"
@@ -2957,25 +3012,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop je pou¾it pøed %cnode, pøesmìrováno na %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "z"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr ""
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -2985,6 +3044,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -2994,11 +3054,12 @@
msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "V tomto uzlu není køí¾ový odkaz."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -3068,14 +3129,14 @@
msgid "%s is not a valid region code"
msgstr "%s není platný kód jazyka (podle ISO 639)"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3170,663 +3231,653 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: neznámý pøepínaè `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "Výstupní soubor `%s' nelze vytvoøit."
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Výstupní soubor `%s' nelze vytvoøit."
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: prázdný soubor"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Nalezení souboru: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Uzel `%s' ji¾ byl definován na øádku %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s po¾aduje jméno"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Oèekáváno `%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Pou¾ijte závorky k zadání pøíkazu jako argumentu @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `"
"%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: argument pro --paragraph-indent musí být èíslo|`none'|`asis', ale ne `"
"%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Neznámý rejstøík `%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Neznámý rejstøík `%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s argument musí být èíslo ne `%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s argument musí být èíslo ne `%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Výstupní soubor `%s' nelze vytvoøit."
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Nelze najít `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Rejstøík `%s' ji¾ existuje"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files 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"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: varování: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: varování: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Chybìjící `}' v argumentu @def"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr ""
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Poznámka pod èarou definována bez rodièovského uzlu"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Neznámý pøíkaz `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "©patný argument pro %c%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: prázdný soubor"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "uzel `%s' - nesmìøuje na nìj ¾ádný odkaz"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "©patný argument pro %c%s"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s se odkazuje na neexistující uzel `%s'"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makro `%s' volané na øádku %d s pøíli¹ mnoha argumenty"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "\\ pøi expanzi makra následováno `%s' místo \\ nebo jména parametru"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "©patný argument pro %c%s"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Rejstøík `%s' ji¾ existuje"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "makro `%s' ji¾ bylo definováno"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Chybí uzavírací závorka pro poznámku pod èarou `%s'"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "Pøíkaz %c%s je zastaralý"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "Pøíkaz %c%s je zastaralý"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "makro `%s' ji¾ bylo definováno"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s oèekáváno `{...}'"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: prázdný soubor"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "pøíkaz address@hidden' ignorován, je mimo multitabulku"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s vy¾aduje `i' nebo `j' jako argument, ne `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Neznámý pøíkaz `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Neznámý pøíkaz `%s'"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s chybìjící uzavírací závorka"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s chybìjící uzavírací závorka"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "odpovídající polo¾ky rejstøíku nebyly pro `%s' nalezeny\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Uzel `%s' nelze nalézt."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, perl-format
msgid "error loading %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Neznámý pøíkaz `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Neznámý pøíkaz `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "Rouru do `%s' nelze otevøít."
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -3877,7 +3928,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "©patný argument pro %c%s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "©patný argument pro %c%s"
@@ -3893,7 +3944,7 @@
msgstr "©patný argument pro %c%s"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: chybí argument jména souboru.\n"
@@ -3966,157 +4017,161 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s není myslitelné uvnitø address@hidden' bloku"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "Výstup %s pro expanzi makra nelze otevøít"
+
+#: tp/Texinfo/Parser.pm:3490
#, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu spatøeno pøed prvním @node, vytvoøen uzel `Top'"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Oèekáváno `%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s není myslitelné uvnitø address@hidden' bloku"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: chybí argument jména souboru.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "©patný argument pro %c%s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s argument musí být èíslo ne `%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: argument k --footnote-style musí být `separate'|`end', ale ne `%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Rejstøík `%s' ji¾ existuje"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Výstupní soubor `%s' nelze vytvoøit."
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "Výstup %s pro expanzi makra nelze otevøít"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Výstupní soubor `%s' nelze vytvoøit."
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "V tomto uzlu není menu."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(mimo v¹echny uzly)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Uzel `%s' nelze nalézt."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "soubor `%s' v pøíkazu @image je neèitelný: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Uzel `%s' nelze nalézt."
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "`.' nebo `,' musí následovat za køí¾ovým odkazem, ale ne za %c"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: varování: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Rejstøík `%s' ji¾ existuje"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: neznámý pøepínaè -- %c\n"
Index: po/da.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/da.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- po/da.po 20 Mar 2011 21:20:24 -0000 1.66
+++ po/da.po 9 Apr 2011 00:10:39 -0000 1.67
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.2e\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2002-11-08 09:13GMT\n"
"Last-Translator: Claus Hindsgaul <address@hidden>\n"
"Language-Team: Danish <address@hidden>\n"
@@ -81,11 +81,11 @@
msgid "memory exhausted"
msgstr "virtuel hukommelse opbrugt"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Gå et tegn frem"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Gå et tegn tilbage"
@@ -97,11 +97,11 @@
msgid "Move to the end of this line"
msgstr "Gå til slutning af linjen"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Ryk et ord frem"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Ryk et ord tilbage"
@@ -182,6 +182,7 @@
msgstr "Eneste afslutning"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Én afslutning:\n"
@@ -195,6 +196,7 @@
msgstr "Indsæt afslutning"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Opbygger afslutninger..."
@@ -219,10 +221,12 @@
msgstr "Slå en tekst op i denne fils indeks."
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Finder indeksindgange..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Fandt intet indeks."
@@ -236,10 +240,12 @@
msgstr "Gå til næste fundne indekspunkt fra sidste '\\[index-search]'-kommando"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Ingen tidligere indeks søgetekst"
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Ingen indeksindgange."
@@ -289,13 +295,13 @@
"\n"
"* Menu: Emner, hvis indeks indeholder \"%s\":\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Prøv --help for mere information.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -305,12 +311,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "ingen indeksindgange blev fundet for '%s'\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -318,7 +324,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -328,7 +334,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -336,7 +342,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -344,12 +350,12 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly vær talesyntese-venlig.\n"
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -359,7 +365,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -369,13 +375,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -389,7 +395,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -403,72 +409,72 @@
"oversættelsesfejl til address@hidden"
"Texinfos hjemmeside: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Kan ikke finde emnet '%s'."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Kan ikke finde emnet '(%s)%s'."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Kan ikke finde et vindue!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Punktet optræder ikke i dette vindues emne!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Kan ikke slette det sidste vindue."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Ingen menu i dette emne."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Ingen fodnoter i dette emne."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Ingen krydsreferencer i dette emne."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Ingen '%s'-peger mod dette emne."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Ukendt Info kommando '%c'; prøv '?' for hjælp."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Info kan ikke køre på terminal type '%s'."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Du er i forvejen ved emnets sidste side."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Du er i forvejen ved emnets første side."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Kun ét vindue."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Det resulterende vindue ville være for lille."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Ikke nok plads til et hjælpevindue. Fjern venligst et vindue."
@@ -805,10 +811,12 @@
" og vælg emnet med den næste forekomst.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Den nuværende søgesti er:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -817,6 +825,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -834,6 +843,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -841,62 +851,62 @@
"Følgende kommandoer kan slet ikke køres:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Vis hjælp"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Besøg infoemnet '(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Vis dokumentation for TAST"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Beskriv tast: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s er ikke defineret."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s er ikke defineret."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s er defineret til %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Vis hvad der skal tastes, for at udføre en given kommando"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Hvor er kommando: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "'%s' er ikke på nogen taster"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s kan kun udføres via %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s kan udføres via %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Der er ingen funktion kaldet '%s'"
@@ -909,91 +919,102 @@
"Valg af ander emnder:\n"
"---------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "ugyldigt antal parametre"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "can ikke åbne inddata-filen '%s'."
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "kan ikke oprette uddatafil '%s'"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "fejl under skrivning til '%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "fejl under lukning af uddatafilen '%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "nøglesekvens for lang"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "manglende nøglesekvens"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-tegn (\\000) ikke tilladt"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NUL-tegn (^%c) ikke tilladt"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "mangler handlingsnavn"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "for langt afsnit"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "ukendt handling '%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "for langt handlingsnavn"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "ekstra tegn følger handlingen '%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "manglende variabelnavn"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "mangler '=' umiddelbart efter variabelnavn"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "for langt variabelnavn"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "for lang værdi"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", linje %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1065,10 +1086,12 @@
"opdatere den"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Ugyldige data i infokey-fil -- visse tastebindinger blev ignoreret"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"Ugyldige data i infokey-fil -- visse variabelindstillinger blev ignoreret"
@@ -1086,6 +1109,7 @@
msgstr "Indlæs et kommandonavn i ekko-området og udfør den"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Kan ikke udføre en 'ekko-område'-kommando her."
@@ -1149,7 +1173,7 @@
msgid "Select visited node: "
msgstr "Vælg besøgt emne: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Referencen forsvandt! (%s)."
@@ -1159,7 +1183,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1168,504 +1192,516 @@
"Velkommen til Info version %s. Skriv \\[get-help-window] for hjælp. \\[menu-"
"item] for menupunkt."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Gå ned til næste linje"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Gå op til forrige linje"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Gå til linjeslutning"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Gå til linjestart"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Næste"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Ikke flere emner i dette dokument."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Ingen 'Forrige' i dette emne."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Ingen 'Forrige' eller 'Op' for dette emne i dette dokument."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Gå frem eller ned gennem emne-strukturen"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Gå tilbage eller op gennem emne-strukturen"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Rul tilbage i vinduet"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Rul frem i vinduet og sæt standard vinduesstørrelse"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Rul frem i vinduet i samme emne"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr "Rul frem i vinduet i samme emne og sæt standard vinduesstørrelse"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Rul tilbage i vinduet"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Rul tilbage i vinduet og sæt standard vinduesstørrelse"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Rul tilbage i vinduet indenfor samme emne"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
msgstr ""
"Rul tilbage i vinduet indenfor samme emne og sæt standard vinduesstørrelse"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Gå til starten af dette emne"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Gå til slutningen af dette emne"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Rul N linjer ned"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Rul N linjer op"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Rul en halv skærmstørrelse ned"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Rul en halv skærmstørrelse op"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Vælg det næste vindue"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Vælg det forrige vindue"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Opdel nuværende vindue"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Slet nuværende vindue"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Kan ikke slette et permanent vindue"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Slet alle andre vinduer"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Rul det andet vindue"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Rul det andet vindue baglæns"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Forstør (eller formindsk) dette vindue"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Fordel det tilgængelige skærmområde mellem de synlige vinduer"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Vælg/fravælg linjeombrydning i nuværende vindue"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Vælg emnet Næste"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Vælg emnet Forrige"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Vælg emnet 'Op'"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Vælg det sidste emne i filen"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Dette vindue har ingen yderligere emner"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Vælg det første emne i filen"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Vælg det sidste punkt i emnets menu"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Vælg dette menupunkt"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Der er ikke %d punkter i denne menu."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menupunkt (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menupunkt: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Følg krydsreference (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Følg krydsreference: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Indlæs et menupunkt og vælg dets emne"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Indlæs en fodnote eller krydsreference og vælg dets emne"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Flyt til starten af dette emnes menu"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Besøg så mange menupunkter på en gang, som det er muligt"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Indlæs et emnenavn og vælg det"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Gå til emne: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Ingen menu i emne '%s'."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Intet menupunkt '%s' i emne '%s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Kunne ikke finde emnet, der refereres til af '%s' i '%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Indlæs en liste med menuer, der starter i katalog, og følg dem"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Følg menuer: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Find emnet, der beskriver hvordan programmet startes"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Find programstart emne for [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Indlæs en man-side reference og vælg den"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Hent man-side: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Vælg emnet 'Top' i filen"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Vælg emnet '(katalog)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Fjern emne (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Kan ikke fjerne emnet '%s'"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Kan ikke fjerne det sidste emne"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Vælg det sidst valgt emne"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Fjern dette emne"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Indlæs et filnavn og vælg det"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Find fil: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Kan ikke finde '%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Kunne ikke oprette uddatafil '%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Færdig."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Skriver emnet %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr ""
"Udskriv indholdet af dette emne (ved videreførsel gennem INFO_PRINT_COMMAND)"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Kan ikke åbne videreførsel til '%s'."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Udskriver emnet %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "Slet bagud til linjestart"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Leder efter underfilen %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Indlæs en tekst og søg efter den uden versalfølsomhed"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Indlæs en tekst og søg for den"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Indlæs en tekst og søg baglæns efter den"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%sefter tekst [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr " versalfølsomt"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Søg baglæns"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Søg"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Søgning mislykkedes."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Gentag sidste søgning i samme retning"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Ingen tidligere søgetekst"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Gentag sidste søgning i modsat retning"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Søg interaktivt efter en tekst, mens du skriver den"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "I-søgning baglæns: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I-søgning baglæns: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "I-søgning: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I-søgning: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Fejler "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Gå til foregående krydsreference"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Gå til næste krydsreference"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Vælg reference eller menupunkt, der optræder på denne linje"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Afbryd nuværende aktivitet"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Afslut"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Flyt markør til bestemt linje i vinduet"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Gentegn skærmen"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Afslut info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Kør kommandoen, der er bundet til denne tasts småbogstavs-variant"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Ukendt kommando (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" er ugyldig"
-#: info/session.c:4973
+#: info/session.c:4965
#, fuzzy, c-format
msgid "`%s' is invalid"
msgstr "\"%s\" er ugyldig"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Tilføj dette tegn til det nuværende numeriske parameter"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Start (eller gang med 4) det nuværende numeriske parameter"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Bruges internt af \\[universal-argument]"
@@ -1776,31 +1812,26 @@
msgid " Subfile: %s"
msgstr " Underfil: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: advarsel: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " for %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tPrøv '%s --help' for en komplet tilvalgsliste.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Brug: %s [TILVALG]... TEXINFO-FIL...\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1814,7 +1845,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1830,7 +1861,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1845,7 +1876,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1861,14 +1892,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1881,7 +1912,7 @@
"oversættelsesfejl til address@hidden"
"Texinfos hjemmeside: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, fuzzy, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1917,63 +1948,67 @@
"\n"
"* Menu:\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kunne ikke læse (%s) og kunne ikke oprette (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: tom fil"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY uden tilhørende END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY uden tilhørende START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr ""
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Angiv kun Info-filen én gang.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "overskydende kommandolinjeparameter '%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Ingen inddatafil angivet; prøv --help for mere information."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Intet katalog angivet; prøv --help for mere information."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "ingen infokatalog-indgang i '%s'"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "ingen indgange fundet for '%s'; intet slettet"
@@ -2045,6 +2080,7 @@
msgstr "usandsynligt tegn %c i @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@sc parameter er kun versaler, derfor ingen virkning"
@@ -2054,6 +2090,7 @@
msgstr "'{' forventedes, men fandt '%c'"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "filslutning inden i en verb-blok"
@@ -2062,7 +2099,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "'}' forventedes, men fandt '%c'"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2073,7 +2112,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s er forældet"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp kræver et positivt tal, ikke '%s'"
@@ -2083,17 +2122,17 @@
msgid "Bad argument to %c%s"
msgstr "Ugyldigt argument til %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "none"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Ugyldigt argument til %c%s"
@@ -2102,32 +2141,33 @@
msgid "insert"
msgstr ""
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Ugyldigt argument til %c%s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Manglende '}' i @def parameter"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, fuzzy, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Skal være i '%s' indsætning for at bruge '%sx'"
@@ -2148,10 +2188,11 @@
msgstr ""
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr ""
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2171,11 +2212,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Ingen slutparentes for fodnote '%s'"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Fodnote defineret uden forældre-emne"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Fodnoter indeni fodnoter er ikke tilladt"
@@ -2188,21 +2231,22 @@
msgid "%s: could not open --css-file: %s"
msgstr ""
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr ""
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[uventet] ingen html-mærker at \"pop\"'e"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[uventet] ugyldigt emnenavn: '%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Ukendt indeks '%s'"
@@ -2231,14 +2275,14 @@
msgid "(line %*d)"
msgstr ""
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Ukendt indeks '%s' i @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Indgang til indeks '%s' udenfor et emne"
@@ -2248,6 +2292,7 @@
msgstr "(udenfor et emne)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr ""
@@ -2256,6 +2301,7 @@
msgstr "Broken-Type i insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Overløb i optællingsstak (enumeration stack)"
@@ -2264,7 +2310,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "bogstavsoverløb, genstarter ved %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2275,14 +2321,14 @@
msgid "%cfloat environments cannot be nested"
msgstr ""
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "'@end' forventede '%s', men fandt '%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2294,30 +2340,34 @@
msgstr "%s kræver et bogstav eller ciffer"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "filslutning indeni en verbatim-blok"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, fuzzy, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s giver ingen mening i en '@%s'-blok"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu fundet før første @node, opretter 'Top' emne"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "måske skulle dit @top emne indsættes i @ifnottex i stedet for @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu fundet før første emne, opretter emnet 'Top'"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2327,9 +2377,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s giver ingen mening i en '@%s'-blok"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2340,14 +2390,14 @@
msgid "`%c%s' needs something after it"
msgstr "'%c%s' kræver noget efterfølgende"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, fuzzy, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Ugyldigt parameter '%s', '%s', benytter '%s'"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s giver ingen mening i en '@%s'-blok"
@@ -2392,17 +2442,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s kræver 'i' eller 'j' som parameter, ikke '%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s kræver et enkelt tegn 'i' eller 'j' som parameter"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro '%s' er allerede defineret"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "her er den forrige definition af '%s'"
@@ -2417,53 +2467,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makro '%s' kaldt på linje %d med for mange parametre"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend makro ikke fundet"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "uparret @end %s med @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "For mange fejl! Gav op.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: advarsel: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Fejlplaceret %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv '%s --help' for mere information.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Brug: %s [TILVALG]... TEXINFO-FIL...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2473,7 +2525,7 @@
"Info-filer, der er lavet til at blive læst på skærmen med Emacs eller GNU "
"Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, fuzzy, c-format
msgid ""
"General options:\n"
@@ -2498,7 +2550,7 @@
" -v, --verbose forklar, hvad der sker.\n"
" --version vis versionsoplysninger og afslut.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, fuzzy, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2512,7 +2564,7 @@
" --html lav HTML i stedet for Info.\n"
" --xml lav Texinfo XML i stedet for Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
#, fuzzy
msgid ""
"General output options:\n"
@@ -2542,7 +2594,7 @@
" --number-sections lav afsnits- og sektionsnumre.\n"
" -o, --output=FILE send til FIL (katalog i tilfældet opdelt HTML),\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, fuzzy, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2583,7 +2635,7 @@
" --split-size=ANTAL opdel Info-filer ved størrelsen ANTAL "
"(standard %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2594,7 +2646,7 @@
" produce file names in ASCII transliteration.\n"
msgstr ""
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2604,7 +2656,7 @@
"dropped.\n"
msgstr ""
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
#, fuzzy
msgid ""
"Input file options:\n"
@@ -2622,7 +2674,7 @@
"søgestien.\n"
" -U VAR afdefinér variablen VAR som med @clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
#, fuzzy
msgid ""
"Conditional processing in input:\n"
@@ -2654,7 +2706,7 @@
" --no-iftex behandl ikke @iftex og @tex-tekst.\n"
" --no-ifxml behandl ikke @ifxml og @xml-tekst.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
#, fuzzy
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
@@ -2670,7 +2722,7 @@
" hvis der laves ren tekst er --ifplaintext aktiveret og de andre "
"deaktiverede.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2696,99 +2748,99 @@
" makeinfo --number-sections xxx.texi skriv Info med nummererede afsnit\n"
" makeinfo --no-split xxx.texi skriv én Info-fil, uanset størrelsen\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s parameter skal være et tal, ikke '%s'.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, fuzzy, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, fuzzy, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent parameter skal være tal/'none'/'asis', ikke '%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: mangler filparameter.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr ""
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Forventede '%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Kan ikke oprette kataloget '%s': %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Ingen '%s' fundet i '%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Undlader makroudfoldelse til standard-ud, da Info-uddata sendes der.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Producerer %s file '%s' ud fra '%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Fjerner makro uddatafil '%s' grundet fejl; brug --force for at beholde.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Fjerner uddatafil '%s' grundet fejl; brug --force for at beholde.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2796,96 +2848,99 @@
msgstr ""
"%s: Fjerner uddatafil '%s' grundet fejl; brug --force for at beholde.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Ukendt kommando '%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Benyt parenteser for at angive en kommando som parameter til @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, fuzzy, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s forventede '{...}'"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Uparret }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "INTET_NAVN!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s mangler højre parentes"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image-fil '%s' (for HTML) er ulæselig: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, fuzzy, c-format
msgid "No such file `%s'"
msgstr "Ingen '%s' fundet i '%s'"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image-fil '%s' (for tekst) er ulæselig: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image mangler filnavnsparameter"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Ingen værdi for '%s'}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s kræver et navn"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Nåede filslutning før samhørende @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' er for langt til ekspansion; blev ikke ekspanderet"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Manglende } i @multitable skabelon"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "ignorerer vildfaren tekst '%s' efter @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "For mange søjler i 'multitable' element (maks %d)"
@@ -2895,7 +2950,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[uventet] Kan ikke vælge kolonne %d i 'multitable'"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "ignorerer @tab udenfor 'multitable'"
@@ -2935,10 +2991,12 @@
msgstr "Mål '%s' og emne '%s' ender med at have samme filnavn"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "Denne @anchor-kommando er ignoreret; referencer til den vil ikke virke"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Omdøb dette mål eller brug tilvalget '--no-split'"
@@ -2953,6 +3011,7 @@
msgstr "Målene '%s' og '%s' ender med at have samme filnavn"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "@anchor-kommandoen ignoreres. Referencer til den vil ikke fungere"
@@ -2986,15 +3045,15 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr ""
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Emnet '%s' mangler menupunkt for '%s' på trods af at det er dens 'Op'-mål"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "ikke-refereret emne '%s'"
@@ -3039,25 +3098,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop benyttet før %cnode, benytter forvalget %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-fil '%s' er ulæselig: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "for"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "på"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Første parameter i krydsreferencen må ikke være tom"
@@ -3067,6 +3130,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3076,11 +3140,12 @@
msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Ingen krydsreferencer i dette emne."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Første parameter i @inforef må ikke være tom"
@@ -3150,14 +3215,14 @@
msgid "%s is not a valid region code"
msgstr "%s er ikke en gyldig ISO 639 sprogkode"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3280,660 +3345,650 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: ukendt tilvalg '--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "kan ikke oprette uddatafil '%s'"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Kan ikke oprette kataloget '%s': %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Find fil: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Emne '%s' er tidligere defineret på linje %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s kræver et navn"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Forventede '%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Benyt parenteser for at angive en kommando som parameter til @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: --paragraph-indent parameter skal være tal/'none'/'asis', ikke '%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent parameter skal være tal/'none'/'asis', ikke '%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Ukendt indeks '%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Ukendt indeks '%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s parameter skal være et tal, ikke '%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s parameter skal være et tal, ikke '%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Kan ikke oprette kataloget '%s': %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Kan ikke finde '%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "ikke-refereret emne '%s'"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "ikke-refereret emne '%s'"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Indeks '%s' eksisterer allerede"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Fjerner uddatafil '%s' grundet fejl; brug --force for at beholde.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: advarsel: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: advarsel: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Manglende '}' i @def parameter"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Mål '%s' og emne '%s' ender med at have samme filnavn"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Fodnoter indeni fodnoter er ikke tilladt"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Ukendt kommando '%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Ugyldigt argument til %c%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "ikke-refereret emne '%s'"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Første parameter i @inforef må ikke være tom"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s reference til ikke-eksisterende emne '%s'"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image-fil '%s' er ulæselig: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makro '%s' kaldt på linje %d med for mange parametre"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "\\ i makroudfoldelse fulgt af '%s' i stedet for \\ eller parameternavn"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "ingen indeksindgange blev fundet for '%s'\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "Ugyldigt argument til %c%s"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Indeks '%s' eksisterer allerede"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "makro '%s' er allerede defineret"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Ingen slutparentes for fodnote '%s'"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s er forældet"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s er forældet"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu fundet før første @node, opretter 'Top' emne"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "makro '%s' er allerede defineret"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s forventede '{...}'"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "ignorerer @tab udenfor 'multitable'"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s kræver 'i' eller 'j' som parameter, ikke '%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Ukendt kommando '%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Ukendt kommando '%s'"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s mangler højre parentes"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s mangler højre parentes"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "ingen indeksindgange blev fundet for '%s'\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image-fil '%s' er ulæselig: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Kan ikke finde emnet '%s'."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-fil '%s' (for HTML) er ulæselig: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu fundet før første @node, opretter 'Top' emne"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu fundet før første @node, opretter 'Top' emne"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu fundet før første @node, opretter 'Top' emne"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image-fil '%s' er ulæselig: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "fejl under skrivning til '%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Ukendt kommando '%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Ukendt kommando '%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "can ikke åbne inddata-filen '%s'."
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -3984,7 +4039,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Ugyldigt argument til %c%s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Ugyldigt argument til %c%s"
@@ -4000,7 +4055,7 @@
msgstr "Ugyldigt argument til %c%s"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: mangler filparameter.\n"
@@ -4073,157 +4128,161 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s giver ingen mening i en '@%s'-blok"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Skal være i '%s' indsætning for at bruge '%sx'"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu fundet før første @node, opretter 'Top' emne"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu fundet før første @node, opretter 'Top' emne"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Forventede '%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s giver ingen mening i en '@%s'-blok"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: mangler filparameter.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Ugyldigt argument til %c%s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s parameter skal være et tal, ikke '%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: --footnote-style parameter skal være 'separate' eller 'end', ikke '%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Indeks '%s' eksisterer allerede"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Kan ikke oprette kataloget '%s': %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "Kunne ikke åbne makroudfoldelses-uddata '%s'"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Kan ikke oprette kataloget '%s': %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Ingen menu i dette emne."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(udenfor et emne)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Kan ikke finde emnet '%s'."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image-fil '%s' er ulæselig: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Kan ikke finde emnet '%s'."
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "en krydsreference må efterfølges af '.' eller ',', ikke %c"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: advarsel: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Indeks '%s' eksisterer allerede"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: ugyldigt tilvalg -- %c\n"
Index: po/de.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/de.po,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- po/de.po 20 Mar 2011 21:20:24 -0000 1.81
+++ po/de.po 9 Apr 2011 00:10:39 -0000 1.82
@@ -34,7 +34,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.12.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2008-08-25 10:25+0200\n"
"Last-Translator: Michael Piefel <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -108,11 +108,11 @@
msgid "memory exhausted"
msgstr "kein Speicher mehr"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Ein Zeichen vorgehen"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Ein Zeichen zurückgehen"
@@ -124,11 +124,11 @@
msgid "Move to the end of this line"
msgstr "Zum Ende dieser Zeile bewegen"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Ein Wort vorgehen"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Ein Wort zurückgehen"
@@ -210,6 +210,7 @@
msgstr "Einzige Vervollständigung"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Eine Vervollständigung:\n"
@@ -223,6 +224,7 @@
msgstr "Vervollständigung einfügen"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Vervollständigungen werden erstellt..."
@@ -248,10 +250,12 @@
msgstr "Eine Zeichenkette im Index dieser Datei suchen"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Index-Einträge werden gesucht..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Keine Indizes gefunden."
@@ -267,10 +271,12 @@
"Befehl gehen"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Keine vorherige zu suchende Index-Zeichenkette."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Keine Index-Einträge."
@@ -323,13 +329,13 @@
"\n"
"* Menü: Knoten, deren Indizes â%sâ enthalten:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "â--helpâ gibt weitere Informationen.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -344,12 +350,12 @@
"Dies ist freie Software: Sie können sie ändern und weiter verteilen.\n"
"Es gibt KEINERLEI Garantie, soweit es das Gesetz erlaubt.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "Keine Indexeinträge für â%sâ gefunden\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -360,7 +366,7 @@
"\n"
"Zum Lesen von Dokumentation, die im Info-Format vorliegt.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -375,7 +381,7 @@
" --dribble=DATEI Tasteneingaben des Nutzers in DATEI merken\n"
" -f, --file=DATEI zu besuchende Info-DATEI angeben"
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -389,7 +395,7 @@
" angeben\n"
" -o, --output=DATEI ausgewählte Knoten nach DATEI ausgeben"
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -402,11 +408,11 @@
" -O, --show-options, --usage zum Knoten mit den Optionen für den\n"
" Befehlsaufruf gehen"
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly zu Sprachsynthesizern freundlich sein."
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -421,7 +427,7 @@
" --version Programmversion anzeigen\n"
" -w, --where, --location physischen Ort des Info-Datei anzeigen"
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -439,7 +445,7 @@
"Verbleibende Parameter werden als Namen von Menüeinträgen des ersten zu\n"
"besuchenden Knotens angesehen."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -447,7 +453,7 @@
"\n"
"Für eine Zusammenfassung möglicher Tastenkombinationen in Info âhâ
tippen."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -477,7 +483,7 @@
"schreiben\n"
" info -f ./foo.info datei ./foo.info anzeigen"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -491,72 +497,72 @@
"schicken, allgemeine Fragen und Gedankenaustausch an address@hidden"
"Texinfos Homepage: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Knoten â%sâ nicht gefunden."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Knoten â(%s)%sâ nicht gefunden."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Kein Fenster gefunden!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Momentane Position erscheint nicht in dem Knoten dieses Fensters!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Kann das letzte Fenster nicht löschen!"
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Kein Menü in diesem Knoten."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Keine FuÃnoten in diesem Knoten."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Keine Querverweise in diesem Knoten."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Kein â%sâ-Verweis für diesem Knoten."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Unbekannter Info-Befehl â%câ. â?â eingeben, um Hilfe zu
bekommen."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Der Terminaltyp â%sâ ist nicht fähig genug, um Info auszuführen."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Sie sind bereits auf der letzten Seite dieses Knotens."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Sie sind bereits auf der ersten Seite dieses Knotens."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Nur ein Fenster."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Das entstehende Fenster wäre zu klein."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Nicht genügend Platz für ein Hilfefenster. Bitte ein Fenster
löschen."
@@ -868,10 +874,12 @@
" Knoten wählen, in dem der nächste Eintrag gefunden wurde.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Der momentane Suchpfad ist:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -880,6 +888,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -897,6 +906,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -904,62 +914,62 @@
"Die folgenden Befehle können überhaupt nicht aufgerufen werden:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Diesen Hilfe-Text anzeigen"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Info-Knoten â(info)Helpâ besuchen"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Dokumentation für KEY ausgeben"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Beschreibe Taste: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s ist nicht definiert."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s ist nicht definiert."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s ist definiert als %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Anzeigen, was einzugeben ist, um einen gegebenen Befehl auszuführen"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Wo ist der Befehl: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "Keine Taste mit â%sâ belegt"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s kann nur durch %s aufgerufen werden."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s kann durch %s aufgerufen werden."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Es gibt keine Funktion mit Namen â%sâ"
@@ -972,91 +982,102 @@
"Andere Knoten wählen:\n"
"---------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "falsche Anzahl von Argumenten"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "Eingabedatei â%sâ kann nicht geöffnet werden."
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "Ausgabedatei â%sâ kann nicht angelegt werden."
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "Fehler beim Schreiben von â%sâ."
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "Fehler beim SchlieÃen der Ausgabedatei â%sâ."
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "Tastenkombination zu lang."
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "Fehlende Tastenkombination."
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-Zeichen (\\000) nicht erlaubt."
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NUL-Zeichen (^%c) nicht erlaubt."
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "Fehlender Befehlsname."
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "Abschnitt zu lang."
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "Unbekannter Befehl â%sâ."
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "Befehlsname zu lang."
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "Extrazeichen folgen Befehl â%sâ."
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "Dateiname fehlt."
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "Fehlendes â=â direkt hinter Variablenname."
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "Variablenname zu lang"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "Wert zu lang"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "â%sâ, Zeile %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1125,11 +1146,13 @@
"infokey erneuern"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"Fehlerhafte Daten in Infokey-Datei -- einige Tastaturbindungen ignoriert"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"Fehlerhafte Daten in Infokey-Datei -- einige Variableneinstellungen ignoriert"
@@ -1147,6 +1170,7 @@
msgstr "Einen Befehlsnamen im Echo-Bereich lesen und ausführen"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Befehl für Echo-Bereich hier nicht ausführbar."
@@ -1213,7 +1237,7 @@
msgid "Select visited node: "
msgstr "Wähle besuchten Knoten aus: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Der Verweis ist verschwunden! (%s)."
@@ -1223,7 +1247,7 @@
msgid "regexp error: %s"
msgstr "Fehler in regulärem Ausdruck: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1232,81 +1256,84 @@
"Willkommen bei Info (Version %s). â\\[get-help-window]â eingeben für
Hilfe, "
"â\\[menu-item]â für Menüeintrag."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Eine Zeile nach unten bewegen"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Eine Zeile nach oben bewegen"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Zum Ende dieser Zeile bewegen"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Zum Anfang der Zeile bewegen"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "nächstes"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Keine weiteren Knoten in diesem Dokument."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Kein âvorigesâ (Prev) für diesem Knoten."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr ""
"Kein âvorigesâ (Prev) oder âaufwärtsâ (Up) für diesen Knoten
innerhalb "
"dieses Dokuments."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Vorwärts oder abwärts durch die Knotenstruktur bewegen"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Zurück oder aufwärts durch die Knotenstruktur bewegen"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "In diesem Fenster vorwärts blättern"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr ""
"In diesem Fenster vorwärts blättern und die Standard-FenstergröÃe setzen"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "In diesem Fenster vorwärts blättern ohne den Knoten zu verlassen"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"In diesem Fenster vorwärts blättern (ohne den Knoten zu verlassen)\n"
" und Standard-FenstergröÃe setzen"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "In diesem Fenster zurückblättern"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "In diesem Fenster zurückblättern und die Standard-FenstergröÃe
setzen"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "In diesem Fenster zurückblättern ohne den Knoten zu verlassen"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1314,428 +1341,437 @@
"In diesem Fenster zurück blättern (ohne den Knoten zu verlassen)\n"
" und Standard-FenstergröÃe setzen"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Zum Anfang dieses Knotens bewegen"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Zum Ende dieses Knotens bewegen"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Zeilenweise vorblättern"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Zeilenweise zurück blättern"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Einen halben Bildschirm vorblättern"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Einen halben Bildschirm zurückblättern"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Das nächste Fenster auswählen"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Das vorige Fenster auswählen"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Aktuelles Fenster unterteilen"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Aktuelles Fenster löschen"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Ein permanentes Fenster kann nicht gelöscht werden"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Alle anderen Fenster löschen"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Im anderen Fenster vorblättern"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Im anderen Fenster zurück blättern"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Aktuelles Fenster vergröÃern (oder verkleinern)"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr ""
"Den vorhandenen Bildschirmplatz unter allen sichtbaren Fenstern aufteilen"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Den Status des Zeilenumbruchs im aktuellen Fenster umschalten"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Die Verwendung regulärer Ausdrücke in Suchen umschalten"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Für Suchen werden reguläre Ausdrücke benutzt"
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "Für Suchen werden wortwörtliche Zeichenketten benutzt"
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Den ânächstenâ Knoten (Next) auswählen"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Den âvorigenâ Knoten (Prev) auswählen"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Den übergeordneten Knoten auswählen (âaufwärtsâ, Up)"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Den letzten Knoten dieser Datei auswählen"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Dieses Fenster hat keine weiteren Knoten"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Den ersten Knoten dieser Datei auswählen"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Den letzten Menüeintrag dieses Knotens auswählen"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Diesen Menüeintrag auswählen"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Es sind keine %d Einträge in diesem Menü."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menüeintrag (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menüeintrag: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Folge xref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Folge xref: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Einen Menüeintrag lesen und seinen Knoten auswählen"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "FuÃnote oder Querverweis lesen und den Knoten auswählen"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Zum Anfang des Menüs dieses Knotens bewegen"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "So viele Menüeinträge wie möglich auf einmal besuchen"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Den Namen eines Knotens lesen und diesen auswählen"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Gehe zu Knoten: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Kein Menü im Knoten â%sâ."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Kein Menüeintrag â%sâ im Knoten â%sâ."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Kann keinen Knoten finden, der von â%sâ in â%sâ referenziert
wird."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Menüliste lesen; bei âdirâ beginnen und ihnen folgen"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Folge Menüs: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Den Knoten finden, der den Programmaufruf beschreibt"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Finde den Programmaufruf-Knoten von [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Einen Verweis auf eine Manpage lesen und diese auswählen"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Hole Manpage: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Den Knoten âTopâ dieser Datei auswählen"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Den Knoten â(dir)â auswählen"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Lösche Information über Knoten (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Kann Information über Knoten â%sâ nicht löschen"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Information über den letzten Knoten kann nicht gelöscht werden"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Den zuletzt gewählten Knoten auswählen"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Information über diesen Knoten löschen"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Den Namen einer Datei lesen und diese auswählen"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Finde Datei: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Kann â%sâ nicht finden."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Ausgabedatei â%sâ kann nicht angelegt werden."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Fertig."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Knoten â%sâ wird geschrieben..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr ""
"Den Inhalt dieses Knotens an INFO_PRINT_COMMAND weiterreichen\n"
" (mittels einer Pipe)"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Kann Daten nicht nach â%sâ weiterreichen (mittels einer Pipe)."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Knoten â%sâ wird gedruckt..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "Suche vom Ende des Dokuments fortgesetzt."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "Suche vom Anfang des Dokuments fortgesetzt."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Unterdatei â%sâ wird durchsucht..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr ""
"Eine Zeichenkette einlesen und danach gemäà GroÃ-/Kleinschreibung suchen"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Eine Zeichenkette einlesen und danach suchen"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Eine Zeichenkette einlesen und danach in Rückwärtsrichtung suchen"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Suche mit regulärem Ausdruck"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " gemäà GroÃ-/Kleinschreibung"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " in Rückwärtsrichtung"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Suche"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Suche fehlgeschlagen."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Letzte Suche in der gleichen Richtung wiederholen"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Keine vorherige Such-Zeichenkette."
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Letzte Suche in der entgegengesetzten Richtung wiederholen"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Interaktiv eine Zeichenkette während der Eingabe suchen"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "Interaktive Suche mit regulärem Ausdruck in Rückwärtsrichtung: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "Interaktive Suche in Rückwärtsrichtung: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "Interaktive Suche mit regulärem Ausdruck: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "Interaktive Suche: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Fehlschlagende "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Zum vorigen Querverweis bewegen"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Zum nächsten Querverweis bewegen"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Verweis oder Menüeintrag auswählen, der auf dieser Zeile erscheint"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Momentane Operation abbrechen"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Beenden"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Den Cursor zu einer bestimmten Zeile des Fensters bewegen"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Anzeige erneut darstellen"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Info beenden"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr ""
"Befehl ausführen, der an die kleingeschriebene Variante dieser\n"
" Taste gebunden ist"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Unbekannter Befehl (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "â%sâ ist ungültig"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "â%sâ ist ungültig"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Diese Zahl dem aktuellen numerischen Argument hinzufügen"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Beginne (oder multipliziere mit 4) das aktuelle numerische Argument"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Intern verwendet von \\[universal-argument]"
@@ -1848,33 +1884,28 @@
msgid " Subfile: %s"
msgstr " Unterdatei: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: Warnung: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " für %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tâ%s --helpâ gibt weitere Informationen.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Aufruf: %s [OPTION]... [INFO-DATEI [VERZEICHNIS-DATEI]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
"Einträge in INFO-DATEI hinzufügen oder entfernen (in Info-Verzeichnis "
"VERZEICHNIS-DATEI)"
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1900,7 +1931,7 @@
" mit dem VERZEICHNIS-DATEI-Argument\n"
" --dry-run gleichbedeutend zu --test"
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1931,7 +1962,7 @@
"eben-\n"
" falls nicht gefunden wird."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1958,7 +1989,7 @@
" --no-indent neue Einträge in der VERZEICHNIS-Datei nicht
formatieren\n"
" --quiet Warnungen unterdrücken"
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1989,7 +2020,7 @@
" entnommen.\n"
" --section R SEC äquivalent zu --regex=R --section=SEC --add-once"
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1999,7 +2030,7 @@
" --test die VERZEICHNIS-DATEI nicht ändern\n"
" --version Programmversion anzeigen und beenden"
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -2010,7 +2041,7 @@
"schicken, allgemeine Fragen und Gedankenaustausch an address@hidden"
"Texinfos Homepage: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2045,63 +2076,67 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kann nicht gelesen (%s) und nicht angelegt werden (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: leere Datei"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY ohne END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY ohne START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: Verzeichnisdatei schon vorhanden: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Info-Datei nur einmal angeben.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Zusätzlicher regulärer Ausdruch angegeben, ignoriere â%sâ"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Fehler in regulärem Ausdruck â%sâ: %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "überflüssiges Kommandozeilen-Argument â%sâ wird übergangen"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Keine Eingabe-Datei angegeben; â--helpâ gibt weitere
Informationen."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Keine dir-Datei angegeben; â--helpâ gibt weitere Informationen."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "Kein Info-Verzeichnis-Eintrag in â%sâ"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "keine Einträge für â%sâ gefunden; nichts entfernt"
@@ -2173,6 +2208,7 @@
msgstr "wahrscheinlich falsches Zeichen â%câ in @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "Argument von @sc besteht nur aus GroÃbuchstaben, somit keine Wirkung"
@@ -2182,6 +2218,7 @@
msgstr "â{â erwartet, jedoch â%câ bekommen"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "Dateiende innerhalb eines @verb-Blocks"
@@ -2190,7 +2227,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "â}â erwartet, jedoch â%câ bekommen"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2203,7 +2242,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s ist obsolet"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp erfordert ein positives numerisches Argument, nicht â%sâ"
@@ -2213,17 +2252,17 @@
msgid "Bad argument to %c%s"
msgstr "Fehlerhaftes Argument zu %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "genau"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "kein"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Fehlerhafte Argumente zu @%s"
@@ -2232,32 +2271,33 @@
msgid "insert"
msgstr "Einfügen"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Fehlerhafte Argumente zu @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "Erwartete @%s on oder off, nicht â%sâ"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Nur @%s 10 oder 11 unterstützt, nicht â%sâ"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Fehlende â}â bei @def Argument"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Muss in einer address@hidden sein, um address@hidden zu benutzen"
@@ -2278,10 +2318,11 @@
msgstr "â%sâ weggelassen, da in Standardausgabe geschrieben wird"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Ausgabepuffer nicht leer."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "Angeforderter FlieÃumgebungstyp â%sâ vorher nicht benutzt"
@@ -2301,11 +2342,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Keine schlieÃende Klammer für FuÃnote â%sâ"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "FuÃnote auÃerhalb eines Elternknotens definiert"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "FuÃnoten innerhalb von FuÃnoten sind nicht erlaubt"
@@ -2319,21 +2362,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: CSS-Datei endete inmitten eines Kommentars"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[unerwartet] kein HTML-Tag für Pop-Operation"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[unerwartet] ungültiger Knotenname: â%sâ"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Unbekannter Index â%sâ"
@@ -2362,14 +2406,14 @@
msgid "(line %*d)"
msgstr "(Zeile %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Unbekannter Index â%sâ in @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Eintrag für Index â%sâ auÃerhalb jeglichen Knotens"
@@ -2379,6 +2423,7 @@
msgstr "(auÃerhalb jeglichen Knotens)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item nicht im Argument für @itemize erlaubt"
@@ -2389,6 +2434,7 @@
msgstr "âBroken-Typeâ bei âinsertion_type_pnameâ"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Ãberlauf bei den Zahlen der Aufzählung"
@@ -2398,7 +2444,7 @@
msgstr "Ãberlauf bei den Buchstaben der Aufzählung. Beginne wieder bei %c"
# %citem ist ein Texinfo-Befehl
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2410,14 +2456,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "%cfloat-Umgebungen können nicht verschachtelt sein"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden erwartete â%sâ, bekam jedoch â%sâ"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2429,20 +2475,23 @@
msgstr "%s benötigt einen Buchstaben oder eine Zahl"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "Dateiende innerhalb eines âVerbatimâ-Blocks"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s nicht sinnvoll auÃerhalb einer address@hidden"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu vor ersten @node gefunden. âTopâ-Knoten wird angelegt"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
@@ -2450,11 +2499,12 @@
"umschlossen werden?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu vor ersten @node gefunden. âTopâ-Knoten wird angelegt"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2465,9 +2515,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s nicht sinnvoll auÃerhalb einer address@hidden"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2478,14 +2528,14 @@
msgid "`%c%s' needs something after it"
msgstr "â%c%sâ benötigt etwas nachfolgendes"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Fehlerhaftes Argument â%sâ zu address@hidden, benutze â%sâ"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s nicht sinnvoll innerhalb eines address@hidden"
@@ -2531,17 +2581,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s erwartet âiâ oder âjâ als Argument, nicht â%câ"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-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"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "Makro â%sâ früher definiert"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "hier ist die frühere Definition von â%sâ"
@@ -2557,55 +2607,57 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makro â%sâ in Zeile %d mit zuvielen Argumenten aufgerufen"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend Makro nicht gefunden"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion ist veraltet; bitte stattdessen @rmacro benutzen"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
"@quote-arg ist veraltet; Argumente werden standardmäÃig in
Anführungszeichen "
"eingeschlossen"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@end %s stimmt nicht mit @%s überein"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Zu viele Fehler! Abbruch.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: Warnung: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Fehlplazierte %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "â%s --helpâ gibt weitere Informationen.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Aufruf: %s [OPTION]... TEXINFO-DATEI...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2614,7 +2666,7 @@
"standardmäÃig in Info-Dateien, die online mit einem Info-Leser wie\n"
"GNU Info (oder auch Emacs, TkInfo, etc.) gelesen werden können.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2641,7 +2693,7 @@
" -v, --verbose ausführlich die Bearbeitungschritte anzeigen\n"
" --version Programmversion anzeigen und beenden\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2656,7 +2708,7 @@
" --xml Texinfo XML anstelle von Info ausgeben\n"
" --plaintext einfachen Text anstelle von Info ausgeben\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2692,7 +2744,7 @@
" -o, --output=DATEI Ausgabe in DATEI (Verzeichnis bei aufgeteiltem "
"HTML)\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2736,7 +2788,7 @@
" --split-size=GRÃSSE in GRÃSSE groÃe Dateien splitten (Standard "
"%d)\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2755,7 +2807,7 @@
" Dateinamen in ASCII-Transliteration "
"produzieren\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2769,7 +2821,7 @@
" (Voreinstellung: %d). Wenn WERT 0 ist, wird\n"
" ignorierbarer Leerraum weggelassen.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2785,7 +2837,7 @@
" -P VERZ VERZ dem Suchpfad für @include
voranstellen\n"
" -U VAR eine Variable aufheben (wie mit @clear)\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2825,7 +2877,7 @@
" AuÃerdem werden bei den --no-ifFORMAT-Optionen auch die entsprechenden\n"
" @ifnoFORMAT-Abschnitte bearbeitet.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2840,7 +2892,7 @@
" wird reiner Text erzeugt, ist --ifplaintext an und die anderen sind aus;\n"
" wird XML erzeugt, ist --ifxml an und die anderen sind aus.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2872,89 +2924,89 @@
" makeinfo --no-split foo.texi nur eine Info-Datei (kann groà "
"sein)\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Ignoriere nicht erkannten Wert â%sâ für
TEXINFO_OUTPUT_FORMAT.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s Argument muss numerisch sein, nicht â%sâ.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: Makro-Expansions-Ausgabedatei â%sâ kann nicht geöffnet werden"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: ignoriere zweite Makro-Expansions-Ausgabedatei â%sâ.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: konnte Ausagbedatei für interne Verweise â%sâ nicht öffnen"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: ignoriere zweite Ausgabedatei für interne Verweise â%sâ.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: Argument für --paragraph-indent muss numerisch, ânoneâ oder
âasisâ sein, "
"nicht â%sâ.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: Argument für --footnote-style muss âseparateâ oder âendâ sein,
nicht "
"â%sâ.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: Datei-Angabe fehlt.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Mehrzeilen-Befehl %c%s inkorrekt verwendet"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Habe â%sâ erwartet"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Kann Verzeichnis â%sâ nicht anlegen: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Kein â%sâ in â%sâ gefunden"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Keine Makro-Auflösung nach der Standard-Ausgabe, da auch die Info-"
"Ausgabe dorthin geht.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "%s-Datei â%sâ von â%sâ wird erzeugt.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2962,14 +3014,14 @@
"%s: Entferne Makro-Ausgabedatei â%sâ wegen Fehler; --force benutzen, um "
"Datei beizubehalten.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Entferne Ausgabedatei â%sâ wegen Fehler; --force benutzen, um diese "
"beizubehalten.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2978,13 +3030,13 @@
"%s: Entferne Ausgabedatei für interne Verweise â%sâ wegen Fehler;
--force "
"benutzen, um diese beizubehalten.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Unbekannter Befehl â%sâ"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
@@ -2992,85 +3044,88 @@
"Geschweifte Klammern verwenden, um einen Befehl als Argument an
address@hidden zu "
"geben"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s erwartete geschweifte Klammern"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Nicht übereinstimmende }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "Kein_NAME!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s fehlende schlieÃende Klammer"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image-Datei â%sâ (für HTML) nicht lesbar: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Kein Datei namens â%sâ"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image-Datei â%sâ (für Text) nicht lesbar: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image fehlt als Argument ein Dateiname"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "undefiniertes Flag: %s"
# checkit
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Kein Wert für â%sâ}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s erfordert einen Namen"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Dateiende vor erforderlichem address@hidden %sâ erreicht"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "â%.40s...â ist zum Expandieren zu lang; nicht expandiert"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Fehlende â}â bei @multitable-Template"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "nicht interpretierbarer Text â%sâ nach @multitable wird ignoriert"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Zu viele Spalten im address@hidden (maximal %d)"
@@ -3080,7 +3135,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[unerwartet] Spalte %d kann in âmultitableâ nicht ausgewählt
werden"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "@tab auÃerhalb einer âmultitableâ wird ignoriert"
@@ -3121,11 +3177,13 @@
msgstr "Anker â%sâ und Knoten â%sâ zeigen auf gleichen Dateinamen."
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
"Dieser @anchor-Befehl wird ignoriert, da Verweise auf ihn nicht funktionieren"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Entweder diesen Anker umbenennen oder Option â--no-splitâ
verwenden"
@@ -3140,6 +3198,7 @@
msgstr "Anker â%sâ und â%sâ zeigen auf gleichen Dateinamen."
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
"@anchor-Befehl wird ignoriert, da Referenzen auf ihn nicht funktionieren"
@@ -3182,16 +3241,16 @@
"â%sâ hat kein Feld âaufwärtsâ (Up) (vielleicht @section statt
@subsection o."
"ä.?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Dem Knoten â%sâ fehlt ein Menüeintrag für â%sâ, obwohl er dessen
Ziel für "
"âaufwärtsâ (Up) ist"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "Nicht referenzierter Knoten â%sâ"
@@ -3236,27 +3295,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop vor %cnode benutzt, Voreinstellung %s wird genommen"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-Datei â%sâ nicht lesbar: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem als letztes Element von @multitable erzeugt ungültige Docbook-"
"Dokumente"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "aus"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "ein"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Erstes Argument für Querverweis darf nicht leer sein."
@@ -3266,6 +3329,7 @@
msgstr "Leerer Dateiname für HTML-Querverweis in â%sâ"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Dateiende erreicht, während â.â oder â,â gesucht wurden"
@@ -3275,10 +3339,12 @@
msgstr "â.â or â,â muss @%s folgen, nicht â%câ"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "für Querverweise in Klammern @pxref benutzen"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Erstes Argument für @inforef darf nicht leer sein."
@@ -3348,15 +3414,15 @@
msgid "%s is not a valid region code"
msgstr "%s ist kein gültiges ISO-639-Sprachkürzel"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: Argument für --footnote-style muss âseparateâ oder âendâ sein,
nicht "
"â%sâ.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3497,675 +3563,662 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: nicht erkannte Option â--%sâ\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "Ausgabedatei â%sâ kann nicht angelegt werden."
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Kann Verzeichnis â%sâ nicht anlegen: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: leere Datei"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Finde Datei: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Knoten â%sâ bereits in Zeile %d definiert"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s erfordert einen Namen"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Habe â%sâ erwartet"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr ""
"Geschweifte Klammern verwenden, um einen Befehl als Argument an
address@hidden zu "
"geben"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: Argument für --paragraph-indent muss numerisch, ânoneâ oder
âasisâ sein, "
"nicht â%sâ.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: Argument für --paragraph-indent muss numerisch, ânoneâ oder
âasisâ sein, "
"nicht â%sâ.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: Argument für --footnote-style muss âseparateâ oder âendâ sein,
nicht "
"â%sâ.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Unbekannter Index â%sâ"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Unbekannter Index â%sâ"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s Argument muss numerisch sein, nicht â%sâ.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s Argument muss numerisch sein, nicht â%sâ.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Kann Verzeichnis â%sâ nicht anlegen: %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Kann â%sâ nicht finden."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "Nicht referenzierter Knoten â%sâ"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "Nicht referenzierter Knoten â%sâ"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Index â%sâ existiert bereits"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Entferne Ausgabedatei â%sâ wegen Fehler; --force benutzen, um diese "
"beizubehalten.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: Warnung: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: Warnung: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(Zeile %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(Zeile %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Fehlende â}â bei @def Argument"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Anker â%sâ und Knoten â%sâ zeigen auf gleichen Dateinamen."
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "FuÃnoten innerhalb von FuÃnoten sind nicht erlaubt"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Unbekannter Befehl â%sâ"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Fehlerhafte Argumente zu @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: leere Datei"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "Nicht referenzierter Knoten â%sâ"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Erstes Argument für @inforef darf nicht leer sein."
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%sverweis auf nicht existierenden Knoten â%sâ (vielleicht @section statt "
"@subsection o.ä.?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image-Datei â%sâ nicht lesbar: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makro â%sâ in Zeile %d mit zuvielen Argumenten aufgerufen"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
"Dem \\ in der Makro-Erweiterung folgt â%sâ anstelle eines Parameternamens"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "Keine Indexeinträge für â%sâ gefunden\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item nicht im Argument für @itemize erlaubt"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Index â%sâ existiert bereits"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "Makro â%sâ früher definiert"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Keine schlieÃende Klammer für FuÃnote â%sâ"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s ist obsolet"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s ist obsolet"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu vor ersten @node gefunden. âTopâ-Knoten wird angelegt"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "Makro â%sâ früher definiert"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s erwartete geschweifte Klammern"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: leere Datei"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "@tab auÃerhalb einer âmultitableâ wird ignoriert"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s erwartet âiâ oder âjâ als Argument, nicht â%câ"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Unbekannter Befehl â%sâ"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Undefinierter Befehl: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s fehlende schlieÃende Klammer"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s fehlende schlieÃende Klammer"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "Keine Indexeinträge für â%sâ gefunden\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image-Datei â%sâ nicht lesbar: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr ""
+"@quote-arg ist veraltet; Argumente werden standardmäÃig in
Anführungszeichen "
+"eingeschlossen"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Knoten â%sâ nicht gefunden."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-Datei â%sâ (für HTML) nicht lesbar: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Bemerkung...} erzeugt einen Pseudo-Querverweis in Info; "
-"umformulieren, um das zu vermeiden"
-
-#: texi2html/formats/info.init:1352
-#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "â.â or â,â muss @%s folgen, nicht â%câ"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "â.â or â,â muss @%s folgen, nicht â%câ"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu vor ersten @node gefunden. âTopâ-Knoten wird angelegt"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu vor ersten @node gefunden. âTopâ-Knoten wird angelegt"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu vor ersten @node gefunden. âTopâ-Knoten wird angelegt"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image-Datei â%sâ nicht lesbar: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "Fehler beim Schreiben von â%sâ."
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Unbekannter Befehl â%sâ"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Unbekannter Befehl â%sâ"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "Eingabedatei â%sâ kann nicht geöffnet werden."
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr ""
-"@quote-arg ist veraltet; Argumente werden standardmäÃig in
Anführungszeichen "
-"eingeschlossen"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4217,7 +4270,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Fehlerhafte Argumente zu @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Fehlerhafte Argumente zu @%s"
@@ -4233,7 +4286,7 @@
msgstr "@item nicht im Argument für @itemize erlaubt"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: Datei-Angabe fehlt.\n"
@@ -4306,158 +4359,170 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s nicht sinnvoll innerhalb eines address@hidden"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Muss in einer address@hidden sein, um address@hidden zu benutzen"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu vor ersten @node gefunden. âTopâ-Knoten wird angelegt"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu vor ersten @node gefunden. âTopâ-Knoten wird angelegt"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Habe â%sâ erwartet"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s nicht sinnvoll auÃerhalb einer address@hidden"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: Datei-Angabe fehlt.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Fehlerhafte Argumente zu @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s Argument muss numerisch sein, nicht â%sâ.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: Argument für --footnote-style muss âseparateâ oder âendâ sein,
nicht "
"â%sâ.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Index â%sâ existiert bereits"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Kann Verzeichnis â%sâ nicht anlegen: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: Konnte CSS-Datei nicht öffnen: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Kann Verzeichnis â%sâ nicht anlegen: %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Kein Menü in diesem Knoten."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(auÃerhalb jeglichen Knotens)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Knoten â%sâ nicht gefunden."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "â.â or â,â muss @%s folgen, nicht â%câ"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "â.â or â,â muss @%s folgen, nicht â%câ"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image-Datei â%sâ nicht lesbar: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Knoten â%sâ nicht gefunden."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Bemerkung...} erzeugt einen Pseudo-Querverweis in Info; "
+#~ "umformulieren, um das zu vermeiden"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "â.â or â,â muss @%s folgen, nicht â%câ"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: Warnung: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Index â%sâ existiert bereits"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: ungültige Option -- %c\n"
Index: po/de_AT.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/de_AT.po,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- po/de_AT.po 20 Mar 2011 21:20:25 -0000 1.63
+++ po/de_AT.po 9 Apr 2011 00:10:39 -0000 1.64
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: texinfo 3.12d\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 1999-02-16 21:14+01:00\n"
"Last-Translator: Karl Eichwalder <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -83,11 +83,11 @@
msgid "memory exhausted"
msgstr ""
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr ""
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr ""
@@ -99,11 +99,11 @@
msgid "Move to the end of this line"
msgstr ""
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr ""
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr ""
@@ -184,6 +184,7 @@
msgstr ""
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr ""
@@ -197,6 +198,7 @@
msgstr ""
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr ""
@@ -221,10 +223,12 @@
msgstr ""
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr ""
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr ""
@@ -238,10 +242,12 @@
msgstr ""
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr ""
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr ""
@@ -288,13 +294,13 @@
"* Menu: Nodes whose indices contain `%s':\n"
msgstr ""
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr ""
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -304,12 +310,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr ""
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -317,7 +323,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -327,7 +333,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -335,7 +341,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -343,11 +349,11 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -357,7 +363,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -367,13 +373,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -387,7 +393,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -396,72 +402,72 @@
"Texinfo home page: http://www.gnu.org/software/texinfo/";
msgstr ""
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr ""
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr ""
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr ""
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr ""
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr ""
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr ""
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr ""
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr ""
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr ""
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr ""
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr ""
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr ""
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr ""
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr ""
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr ""
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ""
@@ -744,16 +750,19 @@
msgstr ""
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr ""
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
msgstr ""
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -767,67 +776,68 @@
msgstr ""
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
msgstr ""
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr ""
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr ""
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr ""
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr ""
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr ""
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr ""
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr ""
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr ""
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr ""
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr ""
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr ""
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr ""
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr ""
@@ -838,91 +848,102 @@
"----------------------\n"
msgstr ""
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr ""
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr ""
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr ""
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr ""
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr ""
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr ""
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr ""
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr ""
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr ""
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr ""
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr ""
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr ""
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr ""
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr ""
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr ""
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr ""
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr ""
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr ""
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr ""
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -975,10 +996,12 @@
msgstr ""
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
@@ -995,6 +1018,7 @@
msgstr ""
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr ""
@@ -1050,7 +1074,7 @@
msgid "Select visited node: "
msgstr ""
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr ""
@@ -1060,504 +1084,516 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
"for menu item."
msgstr ""
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr ""
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr ""
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr ""
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr ""
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr ""
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr ""
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr ""
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr ""
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr ""
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr ""
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr ""
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr ""
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr ""
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr ""
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr ""
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr ""
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
msgstr ""
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr ""
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr ""
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr ""
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr ""
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr ""
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr ""
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr ""
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr ""
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr ""
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr ""
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr ""
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr ""
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr ""
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr ""
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr ""
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr ""
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr ""
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr ""
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr ""
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr ""
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr ""
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr ""
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr ""
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr ""
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr ""
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr ""
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr ""
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr ""
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr ""
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr ""
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr ""
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr ""
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr ""
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr ""
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr ""
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr ""
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr ""
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr ""
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr ""
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr ""
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr ""
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr ""
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr ""
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr ""
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr ""
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr ""
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr ""
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr ""
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr ""
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr ""
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr ""
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr ""
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr ""
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr ""
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr ""
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr ""
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr ""
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr ""
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr ""
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr ""
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr ""
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr ""
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr ""
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr ""
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr ""
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr ""
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr ""
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr ""
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr ""
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr ""
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr ""
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr ""
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr ""
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr ""
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr ""
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr ""
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr ""
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr ""
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr ""
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr ""
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr ""
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr ""
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr ""
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr ""
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr ""
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr ""
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr ""
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr ""
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr ""
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr ""
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr ""
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr ""
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr ""
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr ""
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr ""
@@ -1664,31 +1700,26 @@
msgid " Subfile: %s"
msgstr ""
-#: install-info/install-info.c:221
+#: install-info/install-info.c:285
#, c-format
-msgid "%s: warning: "
+msgid "%s for %s"
msgstr ""
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
-msgstr ""
-
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr ""
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr ""
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1702,7 +1733,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1718,7 +1749,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1733,7 +1764,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1749,21 +1780,21 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
"Texinfo home page: http://www.gnu.org/software/texinfo/";
msgstr ""
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1783,63 +1814,67 @@
"%s\n"
msgstr ""
-#: install-info/install-info.c:627
+#: install-info/install-info.c:640
#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr ""
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr ""
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr ""
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr ""
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr ""
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr ""
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr ""
@@ -1911,6 +1946,7 @@
msgstr ""
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr ""
@@ -1920,6 +1956,7 @@
msgstr ""
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr ""
@@ -1928,7 +1965,9 @@
msgid "`}' expected, but saw `%c'"
msgstr ""
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -1939,7 +1978,7 @@
msgid "%c%s is obsolete"
msgstr ""
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr ""
@@ -1949,17 +1988,17 @@
msgid "Bad argument to %c%s"
msgstr ""
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr ""
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr ""
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr ""
@@ -1968,32 +2007,33 @@
msgid "insert"
msgstr ""
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr ""
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr ""
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr ""
@@ -2014,10 +2054,11 @@
msgstr ""
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr ""
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2037,11 +2078,13 @@
msgid "No closing brace for footnote `%s'"
msgstr ""
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr ""
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr ""
@@ -2054,21 +2097,22 @@
msgid "%s: could not open --css-file: %s"
msgstr ""
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr ""
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr ""
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr ""
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr ""
@@ -2097,14 +2141,14 @@
msgid "(line %*d)"
msgstr ""
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr ""
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr ""
@@ -2114,6 +2158,7 @@
msgstr ""
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr ""
@@ -2122,6 +2167,7 @@
msgstr ""
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr ""
@@ -2130,7 +2176,7 @@
msgid "lettering overflow, restarting at %c"
msgstr ""
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2141,14 +2187,14 @@
msgid "%cfloat environments cannot be nested"
msgstr ""
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr ""
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2160,30 +2206,34 @@
msgstr ""
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr ""
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr ""
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr ""
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr ""
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2193,9 +2243,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr ""
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2206,14 +2256,14 @@
msgid "`%c%s' needs something after it"
msgstr ""
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr ""
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr ""
@@ -2258,17 +2308,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr ""
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr ""
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr ""
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr ""
@@ -2283,59 +2333,61 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr ""
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr ""
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr ""
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr ""
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr ""
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr ""
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr ""
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2350,7 +2402,7 @@
" --version display version information and exit.\n"
msgstr ""
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2360,7 +2412,7 @@
" --plaintext output plain text rather than Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2379,7 +2431,7 @@
" -o, --output=FILE output to FILE (or directory if split HTML).\n"
msgstr ""
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2401,7 +2453,7 @@
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2412,7 +2464,7 @@
" produce file names in ASCII transliteration.\n"
msgstr ""
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2422,7 +2474,7 @@
"dropped.\n"
msgstr ""
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2432,7 +2484,7 @@
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2452,7 +2504,7 @@
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2461,7 +2513,7 @@
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2477,190 +2529,193 @@
" makeinfo --no-split foo.texi write one Info file however big\n"
msgstr ""
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr ""
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr ""
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
"preserve.\n"
msgstr ""
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr ""
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr ""
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr ""
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr ""
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr ""
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr ""
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr ""
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr ""
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr ""
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr ""
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr ""
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr ""
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr ""
@@ -2670,7 +2725,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr ""
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr ""
@@ -2710,10 +2766,12 @@
msgstr ""
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr ""
@@ -2728,6 +2786,7 @@
msgstr ""
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
@@ -2761,14 +2820,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr ""
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr ""
@@ -2813,25 +2872,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr ""
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr ""
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr ""
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr ""
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -2841,6 +2904,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -2850,10 +2914,12 @@
msgstr ""
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr ""
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -2921,13 +2987,13 @@
msgid "%s is not a valid region code"
msgstr ""
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3020,648 +3086,636 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, perl-format
msgid "Unrecognized type: %s"
msgstr ""
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, perl-format
msgid "Cannot split output %s"
msgstr ""
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr ""
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, perl-format
msgid "%s not writable"
msgstr ""
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
msgid " end of file"
msgstr ""
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, perl-format
msgid "Node `%s' previously defined %s"
msgstr ""
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, perl-format
msgid "@%s requires an argument"
msgstr ""
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, perl-format
msgid "Expected @end %s"
msgstr ""
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, perl-format
msgid "Cannot read %s: %s"
msgstr ""
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, perl-format
msgid "@%s: Cannot find %s"
msgstr ""
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, perl-format
msgid "File empty for renamed node `%s'"
msgstr ""
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr ""
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr ""
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, perl-format
msgid "%s:%d: warning: %s\n"
msgstr ""
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, perl-format
msgid "Missing `}' on @%s line"
msgstr ""
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr ""
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr ""
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, perl-format
msgid "Unknown format %s"
msgstr ""
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, perl-format
msgid "@%s (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
msgid "empty multitable"
msgstr ""
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr ""
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, perl-format
msgid "First argument to @%s may not be empty"
msgstr ""
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
msgid "@image file name"
msgstr ""
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, perl-format
msgid "Macro `%s' called with too many args"
msgstr ""
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, perl-format
msgid "No index prefix found for @%s"
msgstr ""
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr ""
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, perl-format
msgid "@%s already set"
msgstr ""
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr ""
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, perl-format
msgid "No closing brace for specially handled command %s"
msgstr ""
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, perl-format
msgid "%c%s is obsolete."
msgstr ""
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr ""
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, perl-format
msgid "@%s seen before first @node"
msgstr ""
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, perl-format
msgid "Float label `%s' previously defined %s"
msgstr ""
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, perl-format
msgid "@%s expected braces"
msgstr ""
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, perl-format
msgid "@%s in empty multitable"
msgstr ""
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
msgid "ignoring @tab in empty multitable"
msgstr ""
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr ""
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, perl-format
msgid "Unexpected command `%s' here"
msgstr ""
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, perl-format
msgid "@%s missing close brace"
msgstr ""
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, perl-format
msgid "%s should not appear in %s"
msgstr ""
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, perl-format
msgid "Empty index entry for @%s"
msgstr ""
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr ""
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
-msgstr ""
-
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, c-format
-msgid "address@hidden file `%s' unreadable: %s"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
msgstr ""
-#: texi2html/formats/html.init:2485
-#, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
msgstr ""
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr ""
-#: texi2html/formats/info.init:1188
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
+#: texi2html/formats/html.pm:2485
+#, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr ""
-#: texi2html/formats/info.init:1352
-msgid "`.' or `,' must follow address@hidden"
+#: texi2html/formats/info.pm:1352
+msgid "`.' or `,' must follow @xref."
msgstr ""
-#: texi2html/formats/info.init:1357
-#, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
-msgid "address@hidden before first node"
+#: texi2html/formats/info.pm:2780
+msgid "@menu before first node"
msgstr ""
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+msgid "@direntry after first node"
msgstr ""
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+msgid "@dircategory after first node"
msgstr ""
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr ""
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, perl-format
msgid "error loading %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, perl-format
msgid "Unknown variable %s"
msgstr ""
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
#, perl-format
-msgid "Can't read init file %s"
+msgid "Unknown variable %s\n"
msgstr ""
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:434
#, perl-format
-msgid "Could not open %s for writing: %s\n"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
+msgid "Can't read init file %s"
msgstr ""
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
+#: tp/texi2any.pl:620
+#, perl-format
+msgid "Could not open %s for writing: %s\n"
msgstr ""
#: tp/Texinfo/Parser.pm:769
@@ -3714,7 +3768,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, perl-format
msgid "Superfluous argument to @%s"
msgstr ""
@@ -3730,7 +3784,7 @@
msgstr ""
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, perl-format
msgid "@%s missing argument"
msgstr ""
@@ -3802,146 +3856,134 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr ""
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
#, perl-format
-msgid "Must be after address@hidden' to use address@hidden'"
+msgid "@%s should only appear in heading or footing"
msgstr ""
-#: tp/Texinfo/Parser.pm:3533
-msgid "@dircategory after first node"
-msgstr ""
-
-#: tp/Texinfo/Parser.pm:3683
-msgid "@direntry after first node"
+#: tp/Texinfo/Parser.pm:3490
+#, perl-format
+msgid "Must be after address@hidden' to use address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
msgid "Unexpected @"
msgstr ""
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr ""
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, perl-format
msgid "Command @%s missing a node argument"
msgstr ""
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:201
-msgid "@top already exists"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, perl-format
-msgid "Can't create directories `%s': %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, perl-format
msgid "Could not open %s for writing: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr ""
+
+#: tp/Texinfo/Convert/Info.pm:97
msgid "Document without nodes."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, perl-format
msgid "@%s outside of any node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:602
-#, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
Index: po/eo.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/eo.po,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -b -r1.74 -r1.75
--- po/eo.po 20 Mar 2011 21:20:25 -0000 1.74
+++ po/eo.po 9 Apr 2011 00:10:39 -0000 1.75
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.13\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2011-03-15 22:18+0100\n"
"Last-Translator: Benno Schulenberg <address@hidden>\n"
"Language-Team: Esperanto <address@hidden>\n"
@@ -84,11 +84,11 @@
msgid "memory exhausted"
msgstr "memoro elÄerpitas"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Unu signon antaÅen"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Unu signon malantaÅen"
@@ -100,11 +100,11 @@
msgid "Move to the end of this line"
msgstr "Al la fino de Äi tiu linio"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Unu vorton antaÅen"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Unu vorton malantaÅen"
@@ -185,6 +185,7 @@
msgstr "Sola kompletigo"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Unu kompletigo:\n"
@@ -198,6 +199,7 @@
msgstr "EnÅovi la kompletigon"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "SerÄado de kompletigoj..."
@@ -222,10 +224,12 @@
msgstr "SerÄi Äenon en la indekso por Äi tiu dosiero"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "SerÄado de indeksaj artikoloj..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Nenia indekso trovita."
@@ -240,10 +244,12 @@
"Pasi al la sekva indeksa ero kongrua al la lasta komando
â\\[index-search]â"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Malestas antaÅa Äeno por serÄo en indekso."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Neniu indeksa artikolo."
@@ -292,13 +298,13 @@
"\n"
"* Menu: Nodoj kies indeksoj entenas «%s»:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Por ricevi pli da informoj uzu la opcion â--helpâ.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -313,12 +319,12 @@
"Äi tio estas libera programo; vi rajtas Äin ÅanÄadi kajaÅ pludonadi.\n"
"NENIA garantio estas donita, kiom la leÄo tion toleras.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "ne troviÄis indeksa artikolo por «%s»\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -329,7 +335,7 @@
"\n"
"Legi dokumentojn en Info-aranÄo.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -339,7 +345,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -347,7 +353,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -355,11 +361,11 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly esti afabla al la parolsinteziloj."
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -369,7 +375,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -379,13 +385,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -399,7 +405,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -414,72 +420,72 @@
"Por diskutoj pri Esperanto-traduko uzu la dissendoliston\n"
"<address@hidden>."
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "La nodo «%s» ne troveblas."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "La nodo «(%s)%s» ne troveblas."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Ne eblas trovi fenestron!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "La muskursoro ne estas en Äi-fenestra nodo!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Maleblas forigi la lastan fenestron."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Malestas menuo en Äi tiu nodo."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Malestas piednotoj en Äi tiu nodo."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Neniu referenco en Äi tiu nodo."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Mankas ligilo «%s» por Äi tiu nodo."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Nekonata Info-komando â%câ; tajpu â?â por helpo."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Terminalo de tipo «%s» ne estas sufiÄe inteligenta por Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Äi tiu jam estas la lasta paÄo en Äi tiu nodo."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Äi tiu jam estas la unua paÄo en Äi tiu nodo."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Nur unu fenestro."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "La fenestro rezultus tro malgranda."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Mankas spaco por helpa fenestro; bonvolu forigi iun fenestron."
@@ -790,10 +796,12 @@
" viziti la nodon en kiu troviÄos la sekva apero.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "La kuranta serÄvojo estas:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -802,6 +810,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -819,6 +828,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -826,62 +836,62 @@
"La sekvaj komandoj neniel vokeblas:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Eligi helpomesaÄon"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Viziti la Info-nodon «(info)Help»"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Eligi informon pri KLAVO"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Priskribu klavon: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s estas nedifinita."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s estas nedifinita."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s estas ligita al %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Montri kion tajpi por plenumi koncernan komandon"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Kie estas la komando: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "neniu klavo trovita por la komando «%s»"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s vokeblas nur per %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s vokeblas per %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Malestas funkcio nomata «%s»"
@@ -894,91 +904,102 @@
"Por elekti aliajn nodojn:\n"
"-------------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "malÄusta nombro da argumentoj"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "ne eblas malfermi enigan dosieron «%s»"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "ne eblas krei eligan dosieron «%s»"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "eraro dum skribo en «%s»"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "eraro dum fermo de eliga dosiero «%s»"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "tro longa klavosekvenco"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "mankanta klavosekvenco"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-signo (\\000) malpermesatas"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NUL-signo (^%c) malpermesatas"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "mankas agonomo"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "tro longa sekcio"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "nekonata ago «%s»."
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "tro longa agonomo"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "kromaj signoj post la ago «%s»"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "mankas nomo de variablo"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "mankas â=â tuj post variablonomo"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "tro longa variablonomo"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "tro longa valoro"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "«%s», linio %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1044,10 +1065,12 @@
"Misa infoklava dosiero «%s» (misa sekcikodo) -- aktualigu Äin per
«infokey»"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Misaj datumoj en infoklava dosiero -- iuj klavasociaĵoj ignoriÄas"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"Misaj datumoj en infoklava dosiero -- iuj valorizoj de variabloj ignoriÄas"
@@ -1065,6 +1088,7 @@
msgstr "Legi en la eÄ¥ozono nomon de komando kaj plenumi Äin"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Maleblas plenumi eÄ¥ozonan (âecho-area-â) komandon Äi tie."
@@ -1128,7 +1152,7 @@
msgid "Select visited node: "
msgstr "Elektu vizititan nodon: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "La referenco malaperis! (%s)."
@@ -1138,7 +1162,7 @@
msgid "regexp error: %s"
msgstr "eraro en regulesprimo: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1147,80 +1171,83 @@
"Bonvenon al Info, versio %s. Tajpu \\[get-help-window] por helpo, \\[menu-"
"item] por iri al menuero."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Iri suben al la sekva linio"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Iri supren al la antaÅa linio"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Iri al la fino de la linio"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Iri al la komenco de la linio"
# Plibone ne tradukindas.
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Next"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Malestas pluaj referencoj en la dokumento."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Mankas ligilo âPrevâ por Äi tiu nodo."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "En la dokumento mankas ligilo(j) âPrevâ aÅ âUpâ por tiu nodo."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Iri antaÅen aÅ suben en la strukturo de nodoj"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Iri malantaÅen aÅ supren en la strukturo de nodoj"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Rulumi antaÅen en Äi tiu fenestro"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Rulumi antaÅen en Äi tiu fenestro kaj fiksi defaÅltan
fenestrograndon"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Rulumi antaÅen en Äi tiu fenestro sed resti en la nodo"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Rulumi antaÅen en Äi tiu fenestro restante en la nodo kaj fiksi defaÅltan "
"fenestrograndon"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Rulumi malantaÅen en Äi tiu fenestro"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr ""
"Rulumi malantaÅen en Äi tiu fenestro kaj fiksi defaÅltan fenestrograndon"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Rulumu malantaÅen en Äi tiu fenestro sed resti en la nodo"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1228,424 +1255,433 @@
"Rulumi malantaÅen en Äi tiu fenestro restante en la nodo kaj fiksi
defaÅltan "
"fenestrograndon"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Iri al la komenco de Äi tiu nodo"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Iri al la fino de Äi tiu nodo"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Linie rulumi suben"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Linie rulumi supren"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Duonekrane rulumi suben"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Duonekrane rulumi supren"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Elekti la sekvan fenestron"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Elekti la antaÅan fenestron"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Disfendi la kurantan fenestron"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Forigi la kurantan fenestron"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Maleblas forigi permanentan fenestron"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Forigi Äiujn ceterajn fenestrojn"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Rulumi la alian fenestron"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Rulumi la alian fenestron malantaÅen"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "(Mal)pligrandigi Äi tiun fenestron"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Dispartigi la disponeblan ekranspacon inter la videblaj fenestroj"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "BaskulÅalti la reÄimon de linifaldo en la kuranta fenestro"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "BaskulÅalti la uzon de regulesprimoj en serÄoj"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Regulesprimoj uzatos en serÄoj."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "LaÅliteraj signoÄenoj uzatos en serÄoj."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Viziti la sekvan nodon (âNextâ)"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Viziti la antaÅan nodon (âPrevâ)"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Viziti la supran nodon (âUpâ)"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Viziti la lastan nodon en Äi tiu dosiero"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Äi tiu fenestro ne havas pluajn nodojn."
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Viziti la unuan nodon en Äi tiu dosiero"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Elekti la lastan eron en la menuo de Äi tiu nodo"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Elekti Äi tiun menueron"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Äi tiu menuo ne havas %d erojn."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menuero (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menuero: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Sekvi referencon (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Sekvi referencon: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Legi menueron kaj viziti Äian nodon"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Legi piednoton aÅ referencon kaj viziti Äian nodon"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Iri al la komenco de la menuo de Äi tiu nodo"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr ""
"Viziti samtempe kiom eble plej multe da menueroj (Äiun en aparta fenestro)"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Legi nodnomon kaj viziti tiun nodon"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Iri al nodo: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Malestas menuo en nodo «%s»."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Malestas menuero «%s» en nodo «%s»."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Ne eblas trovi nodon referencatan per «%s» en «%s»."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Legi liston da menuoj, komencante per «dir» kaj sekvante ilin"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Sekvi menuojn: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Trovi la nodon kiu priskribas programvokon"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Trovi la voknodon de [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Legi referencon al manlibra paÄo kaj viziti Äin"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Manlibran paÄon: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Viziti la nodon «Top» en Äi tiu dosiero"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Viziti la nodon «(dir)»"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Malaperigi nodon (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Ne eblas malaperigi nodon «%s»"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Maleblas malaperigi la lastan nodon"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Reviziti nodon plej ĵuse vizititan"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Malaperigi Äi tiun nodon"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Legi dosiernomon kaj viziti Äin"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Trovi dosieron: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Ne eblas trovi «%s»."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Ne eblas krei eligan dosieron «%s»."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Prete."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Skribado de nodo «%s»..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Meti la enhavon de Äi tiu nodo en la dukton per INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Ne eblas malfermi dukton al «%s»."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Printado de nodo «%s»..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "SerÄo kontinuis ekde la fino de la dokumento."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "SerÄo kontinuis ekde la komenco de la dokumento."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "SerÄado en subdosiero «%s»..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Legi Äenon kaj serÄi Äin usklecodistinge"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Legi Äenon kaj serÄi Äin"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Legi Äenon kaj serÄi Äin malantaÅen"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "SerÄi regulesprime"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " usklecodistinge"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " malantaÅen"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "SerÄi"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "SerÄo fiaskis."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Ripeti la ĵusan serÄon samdirekte"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Malestas pli frua serÄoÄeno."
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Ripeti la ĵusan serÄon alidirekte"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "SerÄi signoÄenon dum vi tajpas Äin"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "SerÄi tajpante regulesprime malantaÅen: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "SerÄi tajpante malantaÅen: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "SerÄi tajpante regulesprime: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "SerÄi tajpante: "
# La vorto metiÄas antaÅ la kvar antaÅaj mesaÄoj kiam la serÄo fiaskas.
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "*Fiaskas* "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Iri al la antaÅa referenco"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Iri al la sekva referenco"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Elekti la referencon aÅ la menueron de Äi tiu linio"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Äesigi la kurantan operacion"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Fini"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Movi la kursoron sur indikitan linion de la fenestro"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "RefreÅigi la ekranon"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Eliri el Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Plenumi komandon asociitan kun Äi tiu klavo minuskligita"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Komando nekonata (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "«%s» ne validas"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "â%sâ ne validas"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Aldoni Äi tiun ciferon al la kuranta nombra argumento"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Komenci (aÅ 4-obligi) la kurantan nombran argumenton"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Uzata interne de \\[universal-argument]"
@@ -1753,31 +1789,26 @@
msgid " Subfile: %s"
msgstr " Subdosiero: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: averto: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " por %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tPor ricevi kompletan liston da opcioj, tajpu â%s --helpâ.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Uzmaniero: %s [OPCIO]... [INFO-DOSIERO [DIR-DOSIERO]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr "Aldonas aÅ forigas la elementojn en INFO-DOSIERO al aÅ el
DIR-DOSIERO."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1791,7 +1822,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1807,7 +1838,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1822,7 +1853,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1838,14 +1869,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1857,7 +1888,7 @@
"Por diskutoj pri Esperanto-traduko uzu la dissendoliston\n"
"<address@hidden>."
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1892,63 +1923,67 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: ne eblas legi (%s) kaj ne eblas krei (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: malplena dosiero"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY sen para END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY sen para START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: dir-dosiero jam ekzistas: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Indiku la Info-dosieron solfoje.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Troa regulesprimo -- «%s» ignoratas"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Eraro en regulesprimo «%s»: %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "troa argumento en komandlinio: «%s»"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Mankas enigdosiero; provu «--help» por pluaj informoj."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Mankas dosiero Info-katalogo (dir); provu «--help» por pluaj
informoj."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "Nenia informo por Info-katalogo troviÄis en «%s»"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "TroviÄis nenia Info-kataloga informo pri «%s»; nenio forigitas"
@@ -2020,6 +2055,7 @@
msgstr "dubinda signo â%câ en @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "argumento de @sc tute majusklas, do neniel efikas"
@@ -2029,6 +2065,7 @@
msgstr "â{â atendata, sed â%câ ricevita"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "dosierfino ene de pretaranÄita bloko (\"verb block\")"
@@ -2037,7 +2074,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "â}â atendata, sed â%câ ricevita"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2050,7 +2089,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s arkaikiÄis"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp bezonas pozitivan nombran argumenton, ne «%s»"
@@ -2061,17 +2100,17 @@
msgstr "Misa argumento por %c%s"
# La du sekvaj vortoj tradukeblas, kvankam neniu uzus la tradukojn.
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "tielkiel"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "nenio"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Misa argumento por @%s"
@@ -2081,32 +2120,33 @@
msgid "insert"
msgstr "enÅovu"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Misa argumento por @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "Por @%s estas atendita 'on' aÅ 'off', ne '%s'"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Por @%s nur '10' aÅ '11' eblas, ne '%s'"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Mankas â}â en argumento de @def"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Nur en address@hidden uzeblas address@hidden"
@@ -2127,10 +2167,11 @@
msgstr "«%s» estas preterlasita, Äar okazas skribado en la Äefeligujon"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Eliga bufro ne malplenas"
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "Petata glitkoma tipo «%s» ne uzatas antaÅe"
@@ -2150,11 +2191,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Mankas â}â por la piednoto «%s»"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Piednoto estas difinita sen patra nodo"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Maleblas fari piednoton al piednoto"
@@ -2167,21 +2210,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: Ne eblas malfermi CSS-dosieron: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: CSS-dosiero finiÄis en komento"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[neatendite] mankas HTML-etikedo por elstakigo"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[neatendite] misa nodnomo: «%s»"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Nekonata indekso «%s»"
@@ -2210,14 +2254,14 @@
msgid "(line %*d)"
msgstr "(linio %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Nekonata indekso «%s» en @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Artikolo por indekso «%s» estas ekster iu ajn nodo"
@@ -2227,6 +2271,7 @@
msgstr "(ekster iu ajn nodo)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "address@hidden ne rajtas havi argumenton address@hidden"
@@ -2235,6 +2280,7 @@
msgstr "Misa tipo en la funkcio «insertion_type_pname()»"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Troo en la stako de enumeracioj"
@@ -2243,7 +2289,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "mankas sekva enumeracia litero; rekomencite ekde %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2254,14 +2300,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "Maleblas ingiÄi blokoj %cfloat unu en alia"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden atendis â%sâ, sed renkontis â%sâ"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2273,30 +2319,34 @@
msgstr "%s bezonas literon aÅ ciferon"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "dosierfino ene de pretaranÄita bloko (\"verbatim block\")"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s ne sencas ekster bloko address@hidden"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "address@hidden renkontitas jam antaÅ la unua address@hidden; nodo
«Top» kreitas"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "eble via @top-nodo staru sub @ifnottex anstataÅ sub @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "address@hidden renkontitas jam antaŠla unua nodo; nodo «Top»
kreitas"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%s ne sencas ekster blokoj address@hidden aÅ address@hidden"
@@ -2306,9 +2356,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s ne sencas ekster bloko address@hidden"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2319,14 +2369,14 @@
msgid "`%c%s' needs something after it"
msgstr "â%c%sâ bezonas ion post si"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Misa argumento «%s» por «%s»; estos uzata «%s»"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s estas sensenca ene de bloko address@hidden"
@@ -2371,17 +2421,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s atendas argumenton âiâ aÅ âjâ, ne â%câ"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s akceptas nur solsignan argumenton âiâ aÅ âjâ"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makroo «%s» estas jam difinita antaÅe"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "Äi tie estas la antaÅa difino de «%s»"
@@ -2396,53 +2446,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makroo «%s» en linio %d havas troan argumenton"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "Makroo «%cend» ne troviÄis"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "address@hidden malrekomendatas; uzu address@hidden anstataÅe"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "address@hidden malrekomendatas; argumentoj citatas defaÅlte"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "misa @end %s por @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Tro multe da eraroj! Haltis.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: averto: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Misloka %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Por pluaj detaloj tajpu â%s --helpâ.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uzmaniero: %s [OPCIO]... TEXINFO-DOSIERO...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2450,7 +2502,7 @@
"Tradukas fontan Texinfo-dokumenton en diversajn aliajn formojn, defaÅlte
en\n"
"Info-dosierojn kiuj taÅgas por legado per Emakso aÅ aÅtonoma GNU-Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2476,7 +2528,7 @@
" -v, --verbose rakonti kio estas farata\n"
" --version eligi la versio-informon kaj fini\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2491,7 +2543,7 @@
" --xml generi en Texinfo-XML anstataÅ en Info\n"
" --plaintext generi platan tekston anstataÅ Info-on\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2524,7 +2576,7 @@
" -o, --output=DOSIERO skribi en DOSIEROn (aÅ dosierujon por fenda "
"HTML)\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2562,7 +2614,7 @@
" --split-size=NOMBRO fendi en dosieroj po NOMBRO bajtoj (defaÅlte "
"%d)\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2580,7 +2632,7 @@
" --internal-links=DOSIERO eligi liston de internaj ligoj al DOSIERO\n"
" --transliterate-file-names reliterumi dosiernomojn en nura ASCII\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2594,7 +2646,7 @@
" (defaÅlte %d); se NOMBRO estas 0, forigi\n"
" sensignifajn spacetojn\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2610,7 +2662,7 @@
" -P UJO antaÅmeti dosierUJOn al la serÄvojo de @include\n"
" -U VAR maldifini la variablon VAR, kiel per @clear\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2649,7 +2701,7 @@
"\n"
" Krome, Äe la opcioj --no-ifFORMO, ja traktiÄas la pecoj sub
@ifnotFORMO.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2664,7 +2716,7 @@
"malaktivas;\n"
" kiam XML generiÄas, --ifxml aktivas kaj la ceteraj malaktivas.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2694,84 +2746,84 @@
" makeinfo --no-split UM.texi\t Kreas unu Info-dosieron, kiom ajn "
"grandan.\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Nekonata valoro de TEXINFO_OUTPUT_FORMAT: «%s». Ignorita.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: Argumento de â%sâ devas esti nombro, ne «%s».\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: Ne eblas malfermi makrotraktadan eligdosieron «%s»"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: Ripeta dosierindiko «%s» por makrotraktada eligo estas
ignorita.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: Ne eblas malfermi eligdosieron «%s» de enaj ligoj"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: Ripeta dosierindiko «%s» por eligo de enaj ligoj estas
ignorita.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: Post â--paragraph-indentâ estu nombro, ânoneâ aÅ âasisâ, ne
â%sâ.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s: Post â--footnote-styleâ estu âseparateâ aÅ âendâ, ne
â%sâ.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: mankas dosiera argumento.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Misa uzo de plurlinia komando «%c%s»."
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "«%s» atendatas"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Ne eblas krei dosierujon «%s»: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Neniu «%s» trovitas en «%s»"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr "%s: Makrotraktitaĵo ne trafos en la Äefeligujon Äar Info iras
tien.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "%s-dosiero «%s» estas generata el «%s».\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2779,14 +2831,14 @@
"%s: La eligdosiero «%s» por makrotraktitaĵo forigitas Äar estis eraroj;\n"
"uzu la opcion â--forceâ por Äin reteni.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: La eligdosiero «%s» forigitas Äar estis eraroj;\n"
"uzu la opcion â--forceâ por Äin reteni.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2795,96 +2847,99 @@
"%s: La eligdosiero «%s» kun enaj ligoj forigitas Äar estis eraroj;\n"
"uzu la opcion â--forceâ por Äin reteni.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Nekonata komando «%s»."
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Uzu vinkulojn {} por pasigi komandan argumenton al address@hidden"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s postulas vinkulojn {}"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Nepara â}â"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "SEN_NOMO!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s sen â}â"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "Bilddosiero «%s» (por HTML) estas nelegebla: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Ne ekzistas dosiero «%s»"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "Bilddosiero «%s» (por teksto) estas nelegebla: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "Mankas dosiera argumento en la komando @image"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "Nedifinita flago: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Mankas valoro por «%s»}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s bezonas nomon"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Dosierfino renkontiÄis pli frue ol la para @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "â%.40s...â tro longas por malvolvo; malvolvo ne okazos"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Mankas â}â en la Åablono de @multitable"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "la misa teksto «%s» post @multitable estas ignorita"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Tro da kolumnoj en elemento de âmultitableâ (%d maksimume)"
@@ -2894,7 +2949,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[neatendite] maleblas elekti %d-an kolumnon en âmultitableâ"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "komando @tab ekster âmultitableâ; ignorita"
@@ -2934,10 +2990,12 @@
msgstr "Dosiernoma kolizio por ankro «%s» kaj nodo «%s»"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "Äi tiu @anchor-komando estas ignorita; la referencoj al Äi ne
funkcios"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Alinomu la ankron aÅ uzu la opcion â--no-splitâ"
@@ -2952,6 +3010,7 @@
msgstr "Dosiernoma kolizio por la ankroj «%s» kaj «%s»"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "Ignorita @anchor-komando; la referencoj al Äi ne funkcios"
@@ -2986,14 +3045,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "Nodo «%s» ne havas kampon âUpâ (Äu eraro en sekciaranÄo?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "En nodo «%s» mankas menuero por â%sâ, malgraÅ esti ties ligilo
âUpâ"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "nodo «%s» ne estas referencita"
@@ -3038,27 +3097,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop aperis pli frue ol %cnode; la defaÅlto uzota estas %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "dosiero «%s» en la komando @image estas nelegebla: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"address@hidden lastelemente en address@hidden rezultigas nevalidajn Docbook-"
"dokumentojn"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "de"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "sur"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "La unua argumento de referenco ne rajtas vaki"
@@ -3068,6 +3131,7 @@
msgstr "Vaka dosiernomo por HTML-a referenco en â%sâ"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Dosierfino renkontiÄis dum serÄo de «.» aŠ«,»"
@@ -3077,10 +3141,12 @@
msgstr "Post @%s sekvendas «.» aŠ«,», ne «%c»"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "por referencoj en krampoj, uzu address@hidden"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "La unua argumento de address@hidden ne rajtas vaki"
@@ -3150,13 +3216,13 @@
msgid "%s is not a valid region code"
msgstr "%s ne estas valida lingvokodo laÅ ISO 639"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "%s: Post â--footnote-styleâ estu âseparateâ aÅ âendâ, ne
â%sâ.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3291,664 +3357,649 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: nekonata opcio «--%s»\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "ne eblas krei eligan dosieron «%s»"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Ne eblas krei dosierujon «%s»: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, perl-format
msgid "%s not writable"
msgstr ""
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Trovi dosieron: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Nodo «%s» estas jam difinita en la linio %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s bezonas nomon"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "«%s» atendatas"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Uzu vinkulojn {} por pasigi komandan argumenton al address@hidden"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: Post â--paragraph-indentâ estu nombro, ânoneâ aÅ âasisâ, ne
â%sâ.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: Post â--paragraph-indentâ estu nombro, ânoneâ aÅ âasisâ, ne
â%sâ.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "%s: Post â--footnote-styleâ estu âseparateâ aÅ âendâ, ne
â%sâ.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Nekonata indekso «%s»"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Nekonata indekso «%s»"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: Argumento de â%sâ devas esti nombro, ne «%s».\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: Argumento de â%sâ devas esti nombro, ne «%s».\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Ne eblas krei dosierujon «%s»: %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Ne eblas trovi «%s»."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "nodo «%s» ne estas referencita"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "nodo «%s» ne estas referencita"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Jam ekzistas indekso «%s»"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files 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"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr ""
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: averto: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Mankas â}â en argumento de @def"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Dosiernoma kolizio por ankro «%s» kaj nodo «%s»"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Maleblas fari piednoton al piednoto"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Nekonata komando «%s»."
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Misa argumento por @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: malplena dosiero"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "nodo «%s» ne estas referencita"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "La unua argumento de address@hidden ne rajtas vaki"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s referencas neekzistantan nodon «%s» (Äu eraro en sekciaranÄo?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "dosiero «%s» en la komando @image estas nelegebla: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makroo «%s» en linio %d havas troan argumenton"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "Dum makrogenerado: \\ sekvata de «%s» (anstataŠde nomo de
parametro)"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "ne troviÄis indeksa artikolo por «%s»\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "address@hidden ne rajtas havi argumenton address@hidden"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Jam ekzistas indekso «%s»"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "makroo «%s» estas jam difinita antaÅe"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Mankas â}â por la piednoto «%s»"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s arkaikiÄis"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s arkaikiÄis"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "address@hidden renkontitas jam antaÅ la unua address@hidden; nodo
«Top» kreitas"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "makroo «%s» estas jam difinita antaÅe"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s postulas vinkulojn {}"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: malplena dosiero"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "komando @tab ekster âmultitableâ; ignorita"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s atendas argumenton âiâ aÅ âjâ, ne â%câ"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Nekonata komando «%s»."
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Nekonata komando: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s sen â}â"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: Ne eblas malfermi CSS-dosieron: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "ne troviÄis indeksa artikolo por «%s»\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: Ne eblas malfermi CSS-dosieron: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "dosiero «%s» en la komando @image estas nelegebla: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "address@hidden malrekomendatas; argumentoj citatas defaÅlte"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "La nodo «%s» ne troveblas."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Bilddosiero «%s» (por HTML) estas nelegebla: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"address@hidden estigas falsan referencon en Info; alivortigu por eviti "
-"tion"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "Post @%s sekvendas «.» aŠ«,», ne «%c»"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "Post @%s sekvendas «.» aŠ«,», ne «%c»"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "address@hidden renkontitas jam antaÅ la unua address@hidden; nodo
«Top» kreitas"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+msgid "@direntry after first node"
msgstr ""
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+msgid "@dircategory after first node"
msgstr ""
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "dosiero «%s» en la komando @image estas nelegebla: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "eraro dum skribo en «%s»"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Nekonata indekso «%s»"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Nekonata indekso «%s»"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "ne eblas malfermi enigan dosieron «%s»"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: Ne eblas malfermi CSS-dosieron: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "address@hidden malrekomendatas; argumentoj citatas defaÅlte"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -3999,7 +4050,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Misa argumento por @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Misa argumento por @%s"
@@ -4015,7 +4066,7 @@
msgstr "%s: opcio «--%s» ne toleras argumenton\n"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: mankas dosiera argumento.\n"
@@ -4087,154 +4138,168 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s estas sensenca ene de bloko address@hidden"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: Ne eblas malfermi CSS-dosieron: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Nur en address@hidden uzeblas address@hidden"
-#: tp/Texinfo/Parser.pm:3533
-msgid "@dircategory after first node"
-msgstr ""
-
-#: tp/Texinfo/Parser.pm:3683
-msgid "@direntry after first node"
-msgstr ""
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, perl-format
msgid "@%s should only appear in math context"
msgstr ""
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "«%s» atendatas"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s ne sencas ekster bloko address@hidden"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: mankas dosiera argumento.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Misa argumento por @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: Argumento de â%sâ devas esti nombro, ne «%s».\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "%s: Post â--footnote-styleâ estu âseparateâ aÅ âendâ, ne
â%sâ.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Jam ekzistas indekso «%s»"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Ne eblas krei dosierujon «%s»: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: Ne eblas malfermi CSS-dosieron: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Ne eblas krei dosierujon «%s»: %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Malestas menuo en Äi tiu nodo."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(ekster iu ajn nodo)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "La nodo «%s» ne troveblas."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "Post @%s sekvendas «.» aŠ«,», ne «%c»"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "Post @%s sekvendas «.» aŠ«,», ne «%c»"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "dosiero «%s» en la komando @image estas nelegebla: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "La nodo «%s» ne troveblas."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "address@hidden estigas falsan referencon en Info; alivortigu por "
+#~ "eviti tion"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "Post @%s sekvendas «.» aŠ«,», ne «%c»"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: averto: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Jam ekzistas indekso «%s»"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: nevalida opcio -- %c\n"
Index: po/es.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/es.po,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- po/es.po 20 Mar 2011 21:20:25 -0000 1.32
+++ po/es.po 9 Apr 2011 00:10:39 -0000 1.33
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texinfo-4.12.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2008-09-04 23:50+0200\n"
"Last-Translator: Benno Schulenberg <address@hidden>\n"
"Language-Team: Spanish <address@hidden>\n"
@@ -82,11 +82,11 @@
msgid "memory exhausted"
msgstr "no más memoria disponible"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Avanzar un carácter"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Retroceder un carácter"
@@ -98,11 +98,11 @@
msgid "Move to the end of this line"
msgstr "Ir al final de esta lÃnea"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Avanzar una palabra"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Retroceder una palabra"
@@ -184,6 +184,7 @@
msgstr "Ãnica entrada"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Una entrada:\n"
@@ -197,6 +198,7 @@
msgstr "Insertar entrada"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Contruyendo lista de entradas..."
@@ -222,10 +224,12 @@
msgstr "Buscar un texto en el Ãndice de este fichero"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Buscando en el Ãndice..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "No se encontraron Ãndices."
@@ -242,10 +246,12 @@
"comando `\\[index-search]' fue ejecutado"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "No existe constancia previa de texto de búsqueda."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "No existen entradas en el Ãndice."
@@ -297,13 +303,13 @@
"\n"
"* Menú: Nodos cuyos Ãndices contienen `%s':\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Pruebe la opción `--help' para obtener más información.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -318,13 +324,13 @@
"Esto es software libre: usted es libre de cambiarlo y redistribuirlo.\n"
"Dicho software es provisto SIN GARANTÃA, hasta donde permite la ley.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr ""
"No se encontraron entradas de Ãndice que concuerden con la palabra `%s'\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -335,7 +341,7 @@
"\n"
"Muestra documentación escrita en formato Info.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -352,7 +358,7 @@
" el usuario desde el fichero FICHERO.\n"
" -f, --file=FICHERO el FICHERO Info que visitar."
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -366,7 +372,7 @@
" -o, --output=FICHERO guardar los nodos seleccionados en este "
"FICHERO."
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -383,13 +389,13 @@
" lÃnea de comandos del programa al que el\n"
" fichero Info en cuestión se refiere."
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly actúa acorde a como sintetizadores de voz\n"
" esperan que programas que los usan lo hagan."
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -408,7 +414,7 @@
" -w, --where, --location mostrar la ruta fÃsica del fichero Info en\n"
" cuestión."
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -429,7 +435,7 @@
"del\n"
"menú con respecto al nodo inicial visitado."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -437,7 +443,7 @@
"\n"
"Por un resumen de las teclas, teclee <h> dentro de 'info'."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -465,7 +471,7 @@
" info -f ./foo.info muestra el fichero `./foo.info', sin buscar en\n"
" el directorio"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -479,73 +485,73 @@
"Texinfo en general pueden ser dirigidas a <address@hidden>.\n"
"El sitio web de Texinfo es: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Nodo `%s' no fue encontrado."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "El nodo `(%s)%s' no fue encontrado."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "No podrÃa encontrar una ventana!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "El cursor no parece estar sobre nodo alguno en esta ventana!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "No se puede eliminar la última ventana."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "No existe un menú en este nodo."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "No hay notas de pie de página en este nodo."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "No hay enlaces en este nodo."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Este nodo no contiene enlace alguno a `%s'."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr ""
"`%c' no es un comando conocido; pruebe usted con `?' para acceder a la ayuda."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "El tipo de terminal `%s' es incapaz de ejecutar Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Usted ya se encuentra en la última página de este nodo."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Usted ya se encuentra en la primera página de este nodo."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Una única ventana."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "La ventana resultante serÃa demasiado pequeña."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ""
"No hay pantalla suficiente como para albergar la ventana de ayuda, elimine "
@@ -861,10 +867,12 @@
" y seleccionar el nodo en que dicho texto es encontrado.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "La lista de orden de búsqueda de ficheros actual es:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -873,6 +881,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -890,6 +899,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -897,62 +907,62 @@
"Los siguientes comandos no pueden ser invocados en forma alguna:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Mostrar mensaje de ayuda"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Visitar nodo Info `(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Imprimir la documentación relacionada con la tecla KEY"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Describir la tecla: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s no ha sido definido."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s no ha sido definido."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s ha sido definido como %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Muestra qué teclas pulsar para un comando en especÃfico"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Comando \"donde está\": "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' no consta como tecla (o combinación de teclas) válida "
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s sólo puede ser invocado vÃa %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s puede ser invocado vÃa %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "No existe función alguna llamada `%s'"
@@ -965,92 +975,103 @@
"Seleccionando otros nodos:\n"
"--------------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "número de argumentos incorrecto"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "no se pudo abrir el fichero `%s'"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "no se pudo crear el fichero `%s'"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "error mientras se escribÃa al fichero `%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "error cerrando fichero `%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "secuencia de teclas demasiado larga"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "secuencia de teclas ausente"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "El caracter `NUL' (\\000), no está permitido aquÃ"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "El carácter nulo (^%c) no está permitido aquÃ"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "nombre de acción ausente"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "sección demasiado larga"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "acción desconocida `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "nombre de acción demasiado largo"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "extra caracteres tras nombre de acción `%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "nombre de variable ausente"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr ""
"ausencia del carácter `=' inmediatamente después del nombre de la variable"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "nombre de variable demasiado largo"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "valor demasiado largo"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", lÃnea %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1123,12 +1144,14 @@
"ejecute `infokey' sobre este para actualizarlo"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"Datos erróneos en fichero infokey -- algunas combinaciones de teclas serán "
"ignoradas"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"Datos erróneos en fichero infokey -- algunas variables que han sido "
@@ -1147,6 +1170,7 @@
msgstr "Leer el nombre de un comando desde el área de mensajes y ejecutarlo"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "No se puede ejecutar el comando `echo-area' aquÃ."
@@ -1212,7 +1236,7 @@
msgid "Select visited node: "
msgstr "Seleccionar nodo visitado: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "La referencia ha desaparecido! (%s)."
@@ -1222,7 +1246,7 @@
msgid "regexp error: %s"
msgstr "Error en expresión regular: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1231,78 +1255,81 @@
"Este es Info, versión %s. Teclee \\[get-help-window] para ayuda, \\[menu-"
"item] para seleccionar un Ãtem de menú."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Ir a la siguiente lÃnea"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Ir a la lÃnea anterior"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Ir al final de la lÃnea"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Ir al principio de la lÃnea"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Siguiente"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "No hay más nodos en este documento."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "No hay nodo `Anterior' a este."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Este nodo no contiene `Anterior' ni `Superior'."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Moverse hacia adelante o abajo a través de la estructura de nodos"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Moverse hacia atrás o arriba a través de la estructura de nodos"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Avanzar en esta ventana"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Avanzar en esta ventana y establecer el ancho de la misma"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Avanzar en esta ventana sin salir del nodo actual"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Avanzar en esta ventana sin salir del nodo actual y establecer el ancho de "
"la misma"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Retroceder en esta ventana"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Retroceder en esta ventana y establecer el ancho de la misma"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Retroceder en esta ventana sin salir del nodo actual"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1310,428 +1337,437 @@
"Retroceder en esta ventana sin salir del nodo actual y establecer el ancho "
"de la misma"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Moverse al principio de este nodo"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Moverse al final de este nodo"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Avanzar por lÃneas"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Retroceder por lÃneas"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Avanzar media pantalla"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Retroceder media pantalla"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Seleccionar la siguiente ventana"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Seleccionar la ventana anterior"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Partir la ventana actual en dos mitades"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Eliminar la ventana actual"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "No se puede eliminar una ventana de tipo permanente"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Eliminar todas las otras ventanas"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Avanzar en la otra ventana"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Retroceder en la otra ventana"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Agrandar (o encoger) esta ventana"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr ""
"Dividir el espacio disponible de la pantalla entre las ventanas visibles"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Activar o desactivar el modo `envolver-lineas' en la ventana actual"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Activar o desactivar el uso de expresiones regulares durante
búsquedas"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Usando expresiones regulares durante búsquedas."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "Usando texto literal durante búsquedas."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Seleccionar el nodo siguiente"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Seleccionar el nodo anterior"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Seleccionar el nodo superior"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Seleccionar el último nodo en este fichero"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Esta ventana no dispone de nodos adicionales"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Seleccionar el primer nodo en este fichero"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Seleccionar el último elemento del menú de este nodo"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Seleccionar este elemento del menú"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "No hay %d elementos en este menú."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Elemento del menú (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Elemento del menú: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Seguir enlace (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Seguir enlace: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Leer un elemento del menú y seleccionar el nodo al que corresponda"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr ""
"Leer una nota de pie de página o enlace y seleccionar el nodo resultante"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Ir al principio del menú de este nodo"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Visitar de una sóla vez tantos elementos del menú como sea posible"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Leer un nombre de nodo y seleccionarlo"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Ir a nodo: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "El nodo `%s' no contiene menú alguno."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "No existe elemento de menú alguno llamado `%s' en el nodo `%s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "No se encontró ningún nodo referenciado por `%s' en `%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr ""
"Leer una lista de menús comenzando desde el directorio especificado y "
"seguirla"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Seguir menús: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Encontrar el nodo que describe la invocación del programa en
cuestión"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Encontrar nodo de invocación de [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Leer una referencia a páginas del manual y seleccionarla"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Página de manual a buscar: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Seleccionar el nodo `Top' en este fichero"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Seleccionar el nodo `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Terminar nodo (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "No se pudo terminar el nodo `%s'"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "No se puede terminar el último nodo"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Seleccionar el nodo usado más recientemente"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Terminar este nodo"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Leer el nombre de un fichero y seleccionarlo"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Fichero a buscar: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "No se encontró `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "No se pudo crear el fichero `%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Hecho."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Escribiendo nodo %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Volcar el contenido de este nodo a través de INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "No se pudo volcar sobre `%s'."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Imprimiendo nodo %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "La búsqueda continuó desde el final del documento."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "La búsqueda continuó desde el principio del documento."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Buscando sub-fichero %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Leer un texto y buscarlo (mayúsculas y minúsculas son significantes)"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Leer una cadena de texto y buscarla"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Leer una cadena de texto y buscarla hacia atrás"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Buscar (exp.reg.)"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " distinguiendo mayús./minús."
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " hacia atrás"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Buscar"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "La búsqueda finalizó sin resultados."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Repetir la última búsqueda en la misma dirección que la anterior"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "No existe constancia de búsqueda anterior"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Repetir la última búsqueda en dirección contraria"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Buscar de forma interactiva un texto según usted lo escribe"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "Búsqueda interactiva hacia atrás (exp.reg.): "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "Búsqueda interactiva hacia atrás: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "Búsqueda interactiva (exp.reg.): "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "Búsqueda interactiva: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Falló "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Ir al enlace anterior"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Ir a la próxima referencia externa"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Seleccionar la referencia o el elemento del menú situado en esta
lÃnea"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Cancelar la operación en curso"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Cancelado"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Mover el cursor a una lÃnea especÃfica de la ventana"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Redibujar los contenidos de la pantalla"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Salir de esta aplicación informática"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr ""
"Ejecutar comando asociado a la versión en minúsculas de esta tecla o "
"combinación de teclas"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Comando desconocido (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" es inválido"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "`%s' is inválido"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Sumar este dÃgito al argumento numérico actual"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Comenzar (o multiplicar por 4) el argumento numérico actual"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Internamente usado por \\[universal-argument]"
@@ -1853,34 +1889,29 @@
msgid " Subfile: %s"
msgstr " Sub-fichero: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: precaución: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " para %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr ""
"\tPruebe `%s --help' para obtener una lista de las opciones soportadas.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Uso: %s [OPCIÃN]... [FICHERO_INFO [FICHERO_ÃNDICE]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
"Añade al o elimina del fichero Ãndice FICHERO_ÃNDICE las\n"
"entradas encontradas en el fichero FICHERO_INFO."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1905,7 +1936,7 @@
" equivale al usar el argumento FICHERO_ÃNDICE.\n"
" --dry-run lo mismo que `--test'."
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1934,7 +1965,7 @@
"datos\n"
" existentes en el fichero Info en cuestión."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1960,7 +1991,7 @@
" --no-indent no bien arreglar nuevas entradas en el
FICHERO_ÃNDICE.\n"
" --quiet suprimir mensajes de precaución."
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1997,7 +2028,7 @@
" --section EXPREG SECC equivale a `--regex=EXPREG --section=SECC --add-"
"once'."
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -2008,7 +2039,7 @@
"FICHERO_ÃNDICE.\n"
" --version mostrar información sobre la versión de esta programa."
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -2019,7 +2050,7 @@
"Texinfo en general pueden ser dirigidas a <address@hidden>.\n"
"El sitio web de Texinfo es: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2063,67 +2094,71 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: No se pudo leer (%s) y no se pudo crear (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: fichero vacÃo"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "`START-INFO-DIR-ENTRY' presente, pero sin pareja (END-INFO-DIR-ENTRY)"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "`END-INFO-DIR-ENTRY' presente, pero sin pareja (START-INFO-DIR-ENTRY)"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: ya contiene un fichero Ãndice: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Sólo es necesario especificar el fichero Info una vez.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Expresión regular extra especificada, será ignorada `%s'"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Error en la expresión regular `%s': %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "Demasiados argumentos en la lÃnea de comandos `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"No se ha especificado fichero de entrada;\n"
"pruebe usted la opción `--help' para obetener más información."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Fichero Ãndice no especificado;\n"
"pruebe usted la opción `--help' para obtener más información."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "No existe constancia de entrada `dir' en `%s'"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "No se encontraron entradas para `%s'; nada será borrado"
@@ -2195,6 +2230,7 @@
msgstr "carácter extraño %c en @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr ""
"Todos los argumentos dados a la primitiva address@hidden' están en
mayúsculas. No "
@@ -2208,6 +2244,7 @@
"leÃdo en su lugar"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "fin de fichero dentro de bloque `verb'"
@@ -2218,7 +2255,9 @@
"a continuación se esperaba ver el sÃmbolo `}', pero el carácter `%c' ha
sido "
"leÃdo en su lugar"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2231,7 +2270,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s es una sintaxis ya obsoleta"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp requiere un argumento numérico positivo, no `%s'"
@@ -2241,17 +2280,17 @@
msgid "Bad argument to %c%s"
msgstr "Argumento erróneo para %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "none"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Argumento erróneo para @%s"
@@ -2260,32 +2299,33 @@
msgid "insert"
msgstr "insert"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Argumento erróneo para @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "Se esperaba leer @%s \"on\" u \"off\", no `%s'"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Sólo @%s 10 or 11 está soportado, no `%s'"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "La construcción address@hidden arg' necesita de un sÃmbolo `}' al
final"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Debe estar bajo la influencia del entorno address@hidden' para poder
usar address@hidden'"
@@ -2308,10 +2348,11 @@
"estándar (stdout)"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "El acumulador (buffer) de salida no está vacÃo."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "El tipo de construccion `float' `%s' no ha sido usado previamente"
@@ -2331,11 +2372,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "No se han cerrado llaves para la nota de pie de página `%s'"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Nota de pie de página definida sin nodo al que referirse"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "No está permitido anidar notas a pie de página en sà mismas"
@@ -2348,21 +2391,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: no se pudo abrir --css-file: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file finaliza con un comentario"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[inesperado] no etiqueta `html' que procesar"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[inesperado] el nombre de nodo `%s' es inválido"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Ãndice desconocido `%s'"
@@ -2391,14 +2435,14 @@
msgid "(line %*d)"
msgstr "(lÃnea %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Ãndice desconocido `%s' en address@hidden'"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "La entrada para el Ãndice `%s' se encuentra fuera de nodo alguno"
@@ -2408,6 +2452,7 @@
msgstr "(fuera de nodo alguno)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "el uso de address@hidden' no está permitido como argumento de
address@hidden'"
@@ -2416,6 +2461,7 @@
msgstr "Tipo erróneo en `insertion_type_pname'"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Desbordamiento de la pila por enumeración"
@@ -2425,7 +2471,7 @@
msgstr ""
"desbordamiento por tamaño de palabra, comenzando de nuevo en el carácter %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2436,14 +2482,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "entornos `%cfloat' no pueden ser anidados"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "Se esperaba ver address@hidden' `%s', pero se ha leÃdo `%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2455,20 +2501,23 @@
msgstr "%s require una letra o número"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "fin de fichero sobre bloque de texto literal"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s carece de sentido si se da fuera de entornos como address@hidden'"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "address@hidden' ha sido leÃdo antes que address@hidden', se creará
un nodo `Top'"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
@@ -2476,12 +2525,13 @@
"address@hidden' en vez de la de un bloque address@hidden'?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr ""
"address@hidden' ha sido leÃdo antes que nodo alguno, se creará un nodo
`Top'"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2494,9 +2544,9 @@
msgstr ""
"@%s carece de sentido fuera de influencias de entornos como address@hidden'"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2507,14 +2557,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s' necesita de algún argumento tras su declaración"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "`%s' no es un argumento correcto para address@hidden', se usará `%s'"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "address@hidden' carece de sentido bajo la influencia de un bloque
address@hidden'"
@@ -2561,17 +2611,17 @@
msgstr ""
"el uso de `%c%s' presupone como siguientes argumentos `i' o `j', no `%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "el uso `%c%s' presupone como argumentos los caracteres `i' o `j'"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "el macro `%s' ya ha sido definido en este documento"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "la definición previa de `%s' se encuentra aquÃ"
@@ -2588,58 +2638,60 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "La llamada al macro `%s' en la lÃnea %d contiene demasiados
argumentos"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "no se encontró declaración de final de macro (`%cend')"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
"address@hidden' consta como una primitiva obsoleta; use por favor "
"address@hidden' en su lugar"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
"address@hidden' consta como una primitiva obsoleta; sus argumentos son "
"entrecomillados por defecto"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "se esperaba leer address@hidden %s' pero se ha leÃdo address@hidden'"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr ""
"Demasiados errores! Se da por finalizado el proceso de este fichero aquÃ.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: precaución: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Carácter `%c' fuera de lugar"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Pruebe `%s --help' para obtener más información.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uso: %s [OPCIÃN]... FICHERO-TEXINFO...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2649,7 +2701,7 @@
"formato Info, que puede ser leÃdo con Emacs o el visor de ficheros Info de "
"GNU.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2685,7 +2737,7 @@
" --version mostrar información sobre la versión de
esta\n"
" aplicación informática.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2700,7 +2752,7 @@
" --xml generar un fichero en formato Texinfo XML.\n"
" --plaintext generar un fichero en texto plano.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2740,7 +2792,7 @@
"HTML\n"
" en modo multi-documento/multi-página).\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2794,7 +2846,7 @@
" una es de un tamaño NÃMERO (por defecto "
"%d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2815,7 +2867,7 @@
" producir nombres de ficheros en formato "
"ASCII.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2832,7 +2884,7 @@
"alterar\n"
" el significado del documento lo serán.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2863,7 +2915,7 @@
" propio documento mediante el uso de\n"
" address@hidden VARIABLE'.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2908,7 +2960,7 @@
" También, para las opciones de tipo --no-ifFORMATO, procesar "
"address@hidden'.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2924,7 +2976,7 @@
"no;\n"
" si este es XML, --ifxml estará activo, mientras el resto no;\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2990,88 +3042,88 @@
"un\n"
" mismo fichero.\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Ignorando valor desconocido de TEXINFO_OUTPUT_FORMAT (`%s').\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: argumento de %s debe ser numérico, asà que `%s' no es válido.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: no se pudo abrir el fichero `%s' para la expansión de macros"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: ignorando el segundo argumento `%s' para la expansión de
macros.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: no se pudo abrir el fichero `%s' para los enlaces internos"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: ignorando el segundo argumento `%s' para los enlaces internos.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: `--paragraph-indent' toma un argumento numérico/`none'/`asis', y no `"
"%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: `--footnote-style' toma como argumentos `separate' o `end', no `%s'.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: se necesita nombre de fichero que procesar.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Comentario multi-lÃnea `%c%s' usado inapropiadamente"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Se esperaba `%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "No se pudo crear el directorio `%s': %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "No se encontró `%s' en `%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Ignorando expansión de macro a descriptor de salida estándar (stdout)
ya "
"que la salida Info va a ser escrita en el mismo.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Generando %s fichero `%s' a partir de `%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -3079,14 +3131,14 @@
"%s: El fichero de expansión de macros `%s' será borrado debido a la
cantidad "
"de errores encontrados; use `--force' para preservar el mismo.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: El fichero `%s' será borrado debido a la cantidad de errores "
"encontrados; use `--force' para preservar el mismo.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -3095,99 +3147,102 @@
"%s: El fichero de enlaces internos `%s' será borrado debido a la cantidad de
"
"errores encontrados; use `--force' para preservar el mismo.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Comando desconocido `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Use llaves para suplir un comando como argumento a @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s se esperaban llaves"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "`}' desemparejada"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "NO SE ENCONTRO FUNCIÃN!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s se esperaba leer `}'"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "La imagen `%s' no es válida (para su salida en formato HTML): %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "El fichero `%s' no existe"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr ""
"La imagen `%s' no es válida (para su salida en formato texto plano): `%s'"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "la primitiva address@hidden' carece de referencia a fichero alguno"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "etiqueta indefinida: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{No se ha especificado un valor para `%s'}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "la construcción `%c%s' requiere un nombre"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr ""
"Se ha alcanzado el fin de fichero y no hay constancia de fin de bloque "
"(address@hidden %s')"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' es demasiado largo para su expansión; no será expandido"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Se esperaba leer `}' en la plantilla address@hidden'"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "ignorando texto incoherente `%s' después de address@hidden'"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Demasiadas columnas para el elemento multi-tabla (max %d)"
@@ -3197,7 +3252,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[inesperado] no se pudo seleccionar la columna #%d en la multi-tabla"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "ignorando address@hidden' no influenciado por el entorno `multitable'"
@@ -3237,12 +3293,14 @@
msgstr "El enlace `%s' y el nodo `%s' apuntan al mismo fichero"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
"Este comando address@hidden' será ignorado; referencias a este no estarán "
"disponibles"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Renombre este enlace o use la opción `--no-split'"
@@ -3257,6 +3315,7 @@
msgstr "Los enlaces `%s' y `%s' apuntan al mismo fichero"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
"El comando address@hidden' será ignorado; referencias a este no estarán
disponibles"
@@ -3297,16 +3356,16 @@
"`%s' no contiene referencia a `Up', quizás debido a un seccionado incorrecto
"
"del documento"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"El nodo `%s' carece de elemento de menú alguno para `%s' aunque consta como "
"destino para `Up'"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "Nodo `%s' no referenciado"
@@ -3351,27 +3410,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "`%ctop' ha sido usado antes de `%cnode', asumiré `%s'"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "El fichero de imagen `%s' no es accesible: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"address@hidden' como último elemento de address@hidden' causa que el
documento "
"Docbook resultante sea inválido"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "de"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "en"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "El primer argumento para un enlace siempre deberÃa estar presente"
@@ -3381,6 +3444,7 @@
msgstr "Nombre de fichero no especificado para el enlace HTML `%s'"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Se alcanzó el fin de fichero mientras se esperaba ver `.' or `,'"
@@ -3390,10 +3454,12 @@
msgstr "address@hidden' debe ser precedido por `.' o `,', no por `%c'"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Para generar enlaces entre paréntesis utilize address@hidden'"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "El primer argumento de address@hidden' siempre deberÃa estar presente"
@@ -3467,14 +3533,14 @@
msgstr ""
"`%s' no es válido como código de lenguaje alguno que cumpla con ISO 639"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: `--footnote-style' toma como argumentos `separate' o `end', no `%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3645,676 +3711,663 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: opción desconocida `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "no se pudo crear el fichero `%s'"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "No se pudo crear el directorio `%s': %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: fichero vacÃo"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Fichero a buscar: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "El nodo `%s' ha sido definido previamente en la lÃnea %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "la construcción `%c%s' requiere un nombre"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Se esperaba `%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Use llaves para suplir un comando como argumento a @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: `--paragraph-indent' toma un argumento numérico/`none'/`asis', y no `"
"%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: `--paragraph-indent' toma un argumento numérico/`none'/`asis', y no `"
"%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: `--footnote-style' toma como argumentos `separate' o `end', no `%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Ãndice desconocido `%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Ãndice desconocido `%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: argumento de %s debe ser numérico, asà que `%s' no es válido.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: argumento de %s debe ser numérico, asà que `%s' no es válido.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "No se pudo crear el directorio `%s': %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "No se encontró `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "Nodo `%s' no referenciado"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "Nodo `%s' no referenciado"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Ya existe un Ãndice llamado `%s'"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: El fichero `%s' será borrado debido a la cantidad de errores "
"encontrados; use `--force' para preservar el mismo.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: precaución: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: precaución: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(lÃnea %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(lÃnea %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "La construcción address@hidden arg' necesita de un sÃmbolo `}' al
final"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "El enlace `%s' y el nodo `%s' apuntan al mismo fichero"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "No está permitido anidar notas a pie de página en sà mismas"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Comando desconocido `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Argumento erróneo para @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: fichero vacÃo"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "Nodo `%s' no referenciado"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "El primer argumento de address@hidden' siempre deberÃa estar presente"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"`%s' hace referencia a un nodo inexistente (`%s'), quizás debido a un "
"seccionado incorrecto del documento"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "El fichero de imagen `%s' no es accesible: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "La llamada al macro `%s' en la lÃnea %d contiene demasiados
argumentos"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ fue leÃdo durante la expansión del macro seguido de `%s' en vez de por
un "
"parámetro válido"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr ""
"No se encontraron entradas de Ãndice que concuerden con la palabra `%s'\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "el uso de address@hidden' no está permitido como argumento de
address@hidden'"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Ya existe un Ãndice llamado `%s'"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "el macro `%s' ya ha sido definido en este documento"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "No se han cerrado llaves para la nota de pie de página `%s'"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s es una sintaxis ya obsoleta"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s es una sintaxis ya obsoleta"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "address@hidden' ha sido leÃdo antes que address@hidden', se creará
un nodo `Top'"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "el macro `%s' ya ha sido definido en este documento"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s se esperaban llaves"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: fichero vacÃo"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "ignorando address@hidden' no influenciado por el entorno `multitable'"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr ""
"el uso de `%c%s' presupone como siguientes argumentos `i' o `j', no `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Comando desconocido `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "El comando `%s' no existe"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s se esperaba leer `}'"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s se esperaba leer `}'"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: no se pudo abrir --css-file: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr ""
"No se encontraron entradas de Ãndice que concuerden con la palabra `%s'\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: no se pudo abrir --css-file: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "El fichero de imagen `%s' no es accesible: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr ""
+"address@hidden' consta como una primitiva obsoleta; sus argumentos son "
+"entrecomillados por defecto"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Nodo `%s' no fue encontrado."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "La imagen `%s' no es válida (para su salida en formato HTML): %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Note...} produce una referencia no deseada en Info; reescrÃbalo para
"
-"que esto no ocurra"
-
-#: texi2html/formats/info.init:1352
-#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "address@hidden' debe ser precedido por `.' o `,', no por `%c'"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "address@hidden' debe ser precedido por `.' o `,', no por `%c'"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "address@hidden' ha sido leÃdo antes que address@hidden', se creará
un nodo `Top'"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "address@hidden' ha sido leÃdo antes que address@hidden', se creará
un nodo `Top'"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "address@hidden' ha sido leÃdo antes que address@hidden', se creará
un nodo `Top'"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "El fichero de imagen `%s' no es accesible: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "error mientras se escribÃa al fichero `%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Comando desconocido `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Comando desconocido `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "no se pudo abrir el fichero `%s'"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: no se pudo abrir --css-file: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr ""
-"address@hidden' consta como una primitiva obsoleta; sus argumentos son "
-"entrecomillados por defecto"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4367,7 +4420,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Argumento erróneo para @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Argumento erróneo para @%s"
@@ -4383,7 +4436,7 @@
msgstr "el uso de address@hidden' no está permitido como argumento de
address@hidden'"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: se necesita nombre de fichero que procesar.\n"
@@ -4458,157 +4511,169 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "address@hidden' carece de sentido bajo la influencia de un bloque
address@hidden'"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: no se pudo abrir --css-file: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Debe estar bajo la influencia del entorno address@hidden' para poder
usar address@hidden'"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "address@hidden' ha sido leÃdo antes que address@hidden', se creará
un nodo `Top'"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "address@hidden' ha sido leÃdo antes que address@hidden', se creará
un nodo `Top'"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: no se pudo abrir --css-file: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Se esperaba `%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s carece de sentido si se da fuera de entornos como address@hidden'"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: se necesita nombre de fichero que procesar.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Argumento erróneo para @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: argumento de %s debe ser numérico, asà que `%s' no es válido.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: `--footnote-style' toma como argumentos `separate' o `end', no `%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Ya existe un Ãndice llamado `%s'"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "No se pudo crear el directorio `%s': %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: no se pudo abrir --css-file: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "No se pudo crear el directorio `%s': %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "No existe un menú en este nodo."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(fuera de nodo alguno)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Nodo `%s' no fue encontrado."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "address@hidden' debe ser precedido por `.' o `,', no por `%c'"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "address@hidden' debe ser precedido por `.' o `,', no por `%c'"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "El fichero de imagen `%s' no es accesible: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Nodo `%s' no fue encontrado."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Note...} produce una referencia no deseada en Info; reescrÃbalo "
+#~ "para que esto no ocurra"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "address@hidden' debe ser precedido por `.' o `,', no por `%c'"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: precaución: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Ya existe un Ãndice llamado `%s'"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: opción inválida -- %c\n"
Index: po/fr.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/fr.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- po/fr.po 20 Mar 2011 21:20:25 -0000 1.73
+++ po/fr.po 9 Apr 2011 00:10:39 -0000 1.74
@@ -11,7 +11,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.7.90\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2004-12-06 08:00-05:00\n"
"Last-Translator: Laurent Bourbeau <address@hidden>\n"
"Language-Team: French <address@hidden>\n"
@@ -86,11 +86,11 @@
msgid "memory exhausted"
msgstr "mémoire virtuelle épuisée"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Avancer d'un caractère"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Reculer d'un caractère"
@@ -102,11 +102,11 @@
msgid "Move to the end of this line"
msgstr "Se déplacer à la fin de cette ligne"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Avancer d'un mot"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Reculer d'un mot"
@@ -187,6 +187,7 @@
msgstr "Une seule complétion"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Une complétion:\n"
@@ -200,6 +201,7 @@
msgstr "Insérer la complétion"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Construction des complétions..."
@@ -226,10 +228,12 @@
msgstr "Rechercher une chaîne dans l'index pour ce fichier"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Recherche des entrées d'index..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Aucun indice retrouvé."
@@ -245,10 +249,12 @@
"\\[index-search] » "
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Aucune autre chaîne de fouille d'index."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Aucune entrée d'index."
@@ -300,13 +306,13 @@
"\n"
"* Menu: Noeuds dont les indices contiennent \"%s\":\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Utiliser --help pour plus d'informations.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -316,12 +322,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "aucune entrée d'index retrouvée pour « %s »\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -329,7 +335,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -339,7 +345,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -347,7 +353,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -355,13 +361,13 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly Être compatible au synthétiseur de voix.\n"
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -371,7 +377,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -381,13 +387,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -401,7 +407,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -414,72 +420,72 @@
"vos questions et autre discussion à address@hidden"
"Site de Texinfo: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Ne peut pas trouver le noeud « %s »."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Ne peut pas trouver le noeud « (%s)%s »."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Ne peut pas trouver une fenêtre permanente!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Le point courant n'apparaît pas dans ce noeud de fenêtre!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Ne peut pas éliminer la dernière fenêtre."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Aucun menu dans ce noeud."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Aucune note de bas de page dans ce noeud."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Aucune référence croisée dans ce noeud."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Aucun pointeur « %s » pour ce noeud."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Commande Info « %c> » inconnue; essayer « ? » pour de l'aide."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Le type de terminal « %s » n'est pas en mesure de rouler Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Vous êtes déjà au point terminal de ce noeud."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Vous êtes déjà au point initial de ce noeud."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Une seule fenêtre."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "La fenêtre résultante sera trop petite."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Pas assez de place pour une fenêtre d'aide, fermer svp une fenêtre."
@@ -826,10 +832,12 @@
"occurrence.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Le chemin de fouille courant est:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -838,6 +846,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -855,6 +864,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -862,62 +872,62 @@
"Les commandes suivantes ne peuvent pas être invoquées:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Afficher le message d'aide"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Visiter le noeud Info « (info)Help »"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Imprimer la documentation relative à KEY"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Décrire la clé: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s est non défini."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s est non défini."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s est défini à %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Montrer quoi écrire afin d'exécuter une commande donnée"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Où se trouve la commande: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "« %s » ne se trouve pas sur une clé quelconque"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s peut être invoqué uniquement via %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s peut être invoqué via %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Il n'y a pas de fonction nommée « %s »"
@@ -931,91 +941,102 @@
"Sélection d'autres modes:\n"
"------------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "nombre incorrect d'arguments"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "Ne peut ouvrir le fichier d'entrée « %s »."
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "Ne peut pas créer le fichier de sortie « %s »."
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "erreur d'écriture dans « %s »"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "erreur de fermeture du fichier de sortie « %s »."
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "séquence de clé trop longue"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "séquence de clé manquante"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "Caractère NUL (\\000) n'est pas permis"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "Caractère NUL (^%c) n'est pas permis"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "nom de l'action manquant"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "section trop longue"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "action inconnue « %s »."
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "nom de l'action trop long"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "caractères superflues détectés après l'action « %s »."
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "nom de variable manquant"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "« = » manquant immédiatement après le nom de la variable"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "nom de variable trop long"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "valeur trop longue"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "« %s », ligne %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1089,12 +1110,14 @@
"pour le mettre à jour"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"Données erronées dans le fichier infokey -- quelques jumelages de clés "
"ignorés"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"Données erronées dans le fichier infokey -- quelques initialisations de "
@@ -1113,6 +1136,7 @@
msgstr "Lire le nom d'une commande dans la zone « echo area » et l'exécuter"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Ne peut pas exécuter une commande « echo-area » en cet endroit."
@@ -1178,7 +1202,7 @@
msgid "Select visited node: "
msgstr "Sélectionner un noeud visité: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "La référence est disparue! (%s)."
@@ -1188,7 +1212,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1198,82 +1222,85 @@
"Taper « \\[get-help-window] » pour obtenir de l'aide.\n"
"Taper « \\[menu-item] » pour obtenir un item menu."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Descendre à la ligne suivante"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Monter à la ligne précédente"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Aller à la fin de la ligne"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Aller au début de la ligne"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Noeud « Next »"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Aucun autre noeud dans ce document."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Aucun noeud « Prev » pour ce noeud."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Aucun noeud « Prev » ou « Up » pour ce noeud dans ce document."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Avancer ou descendre à travers la structure de noeuds"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Reculer ou monter à travers la structure de noeuds"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Défiler vers l'avant dans cette fenêtre"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr ""
"Défiler vers l'avant dans cette fenêtre et en fixer la dimension par défaut"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr ""
"Défiler vers l'avant dans cette fenêtre en demeurant à l'intérieur du noeud"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Défiler vers l'avant dans cette fenêtre en demeurant à l'intérieur du noeud "
"et en fixer la dimension par défaut"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Défiler à reculons dans cette fenêtre"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr ""
"Défiler à reculons dans cette fenêtre et en fixer la dimension par défaut"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr ""
"Défiler à reculons dans cette fenêtre en demeurant à l'intérieur de ce noeud"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1281,431 +1308,440 @@
"Défiler à reculons dans cette fenêtre en demeurant à l'intérieur du noeud et "
"en fixer la dimension par défaut"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Aller au point initial de ce noeud"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Aller au point terminal de ce noeud"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Défiler vers le bas par pas de N lignes"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Défiler vers le haut par pas de N lignes"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Défiler vers le bas par pas d'un demi écran"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Défiler vers le haut par pas d'un demi écran"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Sélectionner la fenêtre suivante"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Sélectionner la fenêtre précédente"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Diviser en deux la fenêtre courante"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Éliminer la fenêtre courante"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Ne peut pas éliminer une fenêtre permanente"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Éliminer toutes les autres fenêtres"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Défiler l'autre fenêtre"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Défiler l'autre fenêtre à reculons"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Agrandir (ou réduire) cette fenêtre"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Répartir l'espace écran disponible parmi les fenêtres visibles"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Basculer l'état du remplissage de ligne dans la fenêtre courante"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Sélectionner le noeud « Next »"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Sélectionner le noeud « Prev »"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Sélectionner le noeud « Up »"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Sélectionner le dernier noeud dans ce fichier"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Cette fenêtre a aucun noeud additionnel"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Sélectionner le premier noeud dans ce fichier"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Sélectionner le dernier item dans ce menu de noeuds"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Sélectionner cet item menu"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Il n'y a pas %d items dans ce menu."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Item menu (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Item menu: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Suivre xref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Suivre xref: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Lire un item menu et sélectionner son noeud"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr ""
"Lire une note de bas de page ou une référence croisée et sélectionner son "
"noeud"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Aller au point initial de ce menu de noeuds"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Visiter d'un seul coup autant d'items menu que possible"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Lire un nom de noeud et sélectionner ce noeud"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Aller au noeud: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Aucun menu dans le noeud « %s »."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Aucun item menu « %s » dans le noeud « %s »."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Incapable de trouver le noeud référencé par « %s » dans « %s »."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Lire une liste de menus en partant de « dir » et les suivre"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Suivre les menus: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Trouver le noeud décrivant l'invocation au programme"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Trouver le noeud Invocation de [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Lire une référence de page-manuel et la sélectionner"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Obtenir la Page-manuel: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Sélectionner le noeud « Top » dans ce fichier"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Sélectionner le noeud « (dir) »"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Effacer le noeud (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Ne peut pas effacer le noeud « %s »"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Ne peut pas effacer le dernier noeud"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Choisir le noeud qui a été le plus récemment sélectionné"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Effacer ce noeud"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Lire le nom d'un fichier et le sélectionner"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Trouver le fichier: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Ne peut pas trouver « %s »."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Ne peut pas créer le fichier de sortie « %s »."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Terminé."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Écriture du noeud « %s »..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Acheminer les contenus de ce noeud à travers INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Ne peut ouvrir un tube de communication à « %s »."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Impression du noeud « %s »..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "Effacer du point courant jusqu'au début de la ligne"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Fouille du sous-fichier « %s »..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr ""
"Lire une chaîne et en faire la fouille en distinguant les majuscules et "
"minuscules"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Lire une chaîne et en faire la fouille"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Lire une chaîne et en faire la fouille à reculons"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s pour la chaîne [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr " en distinguant les casses majuscules et minuscules "
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Fouiller à reculons"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Fouiller"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Fouille infructueuse."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Répéter la dernière fouille dans la même direction"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Aucune chaîne de fouille antérieure"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Répéter la dernière fouille dans la direction inverse"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Fouiller interactivement pour une chaîne telle que vous la tapez"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "Fouille I-search à reculons: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "Fouille I-search à reculons: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "Fouille I-search: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "Fouille I-search: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Échec "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Aller à la référence croisée précédente"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Aller à la prochaine référence croisée"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Sélectionner la référence ou l'item menu apparaissant sur cette ligne"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Annuler l'opération courante"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Quitter"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Déplacer le curseur sur une ligne spécifique de la fenêtre"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Redessiner l'affichage écran"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Quitter en utilisant Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Exécuter la commande liée à cette variante de touche en minuscule"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Commande inconnue (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "« %s » est invalide"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "« %s » est invalide"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Ajouter ce chiffre à l'argument numérique courant"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Enclencher (ou multiplier par 4) l'argument numérique courant"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Utilisé internement par \\[universal-argument]"
@@ -1826,31 +1862,26 @@
msgid " Subfile: %s"
msgstr " Sous-fichier: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: avertissement: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " pour %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\\tUtiliser « %s --help » pour une liste complète des options.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Usage: %s [OPTION]... FICHIER-TEXINFO...\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1864,7 +1895,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1880,7 +1911,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1895,7 +1926,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1911,14 +1942,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1930,7 +1961,7 @@
"vos questions et autre discussion à address@hidden"
"Site de Texinfo: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1968,64 +1999,68 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: ne peut pas lire (%s) et ne peut pas créer (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: fichier vide"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY non apparié avec END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY non apparié avec START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: a déjà un fichier répertoire: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Spécifier le fichier Info seulement une fois.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "excédent d'argument de ligne de commande « %s »"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Aucun fichier d'entrée spécifié; utiliser --help pour plus d'informations."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Aucun fichier dir spécifié; utiliser --help pour plus d'informations."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "aucune entrée répertoire Info dans « %s »"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "aucune entrée trouvée pour « %s »; rien n'a été éliminé"
@@ -2097,6 +2132,7 @@
msgstr "caractère %c improbable dans la macro @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "argument de la macro @sc tout en majuscules, alors aucun effet"
@@ -2106,6 +2142,7 @@
msgstr "« { » attendu, mais a vu « %c »"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "fin de fichier à l'intérieur du bloc verbe"
@@ -2114,7 +2151,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "« } » attendu, mais a vu « %c »"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2127,7 +2166,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s est périmé"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "La macro @sp exige un argument numérique positif, pas « %s »"
@@ -2137,17 +2176,17 @@
msgid "Bad argument to %c%s"
msgstr "Mauvais argument à %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "« asis »"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "« none »"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Mauvais argument à @%s"
@@ -2156,32 +2195,33 @@
msgid "insert"
msgstr "insérer"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Mauvais argument à @%s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Accolade « } » manquante dans @def arg"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Doit être dans une insertion « @%s » afin d'utiliser « @%s »."
@@ -2202,10 +2242,11 @@
msgstr "« %s » omis avant l'écriture sur la sortie standard"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Tampon de sortie n'est pas vide."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2225,11 +2266,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Accolade fermante « } » manquante pour la note de bas de page « %s »"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "La note de bas de page est définie sans noeud parent"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Les notes de bas de page récursives ne sont pas permises"
@@ -2243,21 +2286,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: ne peut ouvrir --css-file: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s%d: --css-file terminé dans le commentaire"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[inattendu] pas d'étiquette html à dépiler"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[inattendu] nom de noeud invalide: « %s »"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Nom d'index inconnu « %s »"
@@ -2286,14 +2330,14 @@
msgid "(line %*d)"
msgstr "(ligne %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Nom d'index « %s » inconnu dans @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Entrée pour l'index « %s » à l'extérieure de tout noeud"
@@ -2303,6 +2347,7 @@
msgstr "(à l'extérieur de tout noeud)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item n'est pas permis dans l'agument @itemize"
@@ -2311,6 +2356,7 @@
msgstr "Type impossible dans la fonction insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Débordement de la pile d'énumérations"
@@ -2319,7 +2365,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "débordement du lettrage, reprise à partir de %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2330,14 +2376,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "%cenvironnements float ne peuvent être imbriqués"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "« @end » s'attendait à « %s », mais a vu « %s »"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2349,20 +2395,23 @@
msgstr "%s exige une lettre ou un chiffre"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "fin de fichier à l'intérieur du bloc verbatim"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @float »"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu vu avant le premier @node, création du noeud « Top »"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
@@ -2370,11 +2419,12 @@
"dans @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu vu avant le premier noeud, création du noeud « Top »"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2386,9 +2436,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @titlepage »"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2399,14 +2449,14 @@
msgid "`%c%s' needs something after it"
msgstr "« %c%s » a besoin de quelque chose après lui"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Mauvais argument « %s » à « @%s » utilisant « %s »"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "macro @%s inactive à l'intérieur d'un bloc « %s »"
@@ -2451,17 +2501,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s s'attend à argument « i » ou « j », non pas « %c »"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s attend un argument d'un seul caractère « i » ou « j »"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro « %s » déjà définie précédemment"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ici se trouve la définition précédente de « %s »"
@@ -2477,53 +2527,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Macro « %s » appelée à la ligne %d avec trop d'arguments"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "macro %cend non trouvée"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "macro @end %s non balancée avec @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Beaucoup trop d'erreurs! Abandon.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: avertissement: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "%c égarée ou mal placée"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Utiliser « %s --help » pour plus d'informations.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Usage: %s [OPTION]... FICHIER-TEXINFO...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2531,7 +2583,7 @@
"Traduire une documentation Texinfo source en divers autres formats:\n"
"Fichiers Info adéquats pour lire en ligne avec Emacs ou GNU Info autonome\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, fuzzy, c-format
msgid ""
"General options:\n"
@@ -2558,7 +2610,7 @@
" -v, --verbose En mode bavard, expliquer ce qui a été fait.\n"
" --version Afficher la version du logiciel et quitter.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, fuzzy, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2573,7 +2625,7 @@
" --xml Produire en Texinfo XML plutôt qu'en format
Info.\n"
" --plaintext Produire en formast plein texte plutôt qu'en
format Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
#, fuzzy
msgid ""
"General output options:\n"
@@ -2607,7 +2659,7 @@
" -o, --output=FICHIER produire la sortie dans le FICHIER (répertoire "
"si division en HTML),\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, fuzzy, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2646,7 +2698,7 @@
" --split-size=NUM séparer les fichiers Info selon la taille NUM (par "
"défaut %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
#, fuzzy
msgid ""
"Options for HTML:\n"
@@ -2661,7 +2713,7 @@
"sortie HTML;\n"
" lire de stdin si le FICHIER est -.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, fuzzy, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2675,7 +2727,7 @@
" Si VAL vaut 0, les espaces pouvant être "
"ignorés sont éliminés.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2695,7 +2747,7 @@
" -U VAR Rendre indéfinie une variable, comme avec "
"@clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2735,7 +2787,7 @@
" Aussi pour l'options --no-ifFORMAT, ne pas traiter le textuel "
"@ifnotFORMAT.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2751,7 +2803,7 @@
"» ;\n"
"en génération XML, --ifxml est « on » et les autres sont « off ».\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2786,38 +2838,38 @@
" makeinfo --no-split foo.texi Écrire un fichier Info même "
"volumineux\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: valeur TEXINFO_OUTPUT_FORMAT non reconnue est ignoré « %s »\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: l'argument %s doit être numérique, non pas « %s ».\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: ne peut ouvrir la sortie d'expansion de macro « %s »"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: ignorer la sortie de l'expansion de la seconde macro « %s »\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: ne peut ouvrir la sortie d'expansion de macro « %s »"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: ignorer la sortie de l'expansion de la seconde macro « %s »\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
@@ -2825,50 +2877,50 @@
"ou\n"
"« asis », non pas « %s ».\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: l'argument de l'option --footnote-style doit être « separate » ou\n"
"« end », non pas « %s ».\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: absence d'un argument fichier.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Commande multilignes %c%s utilisé de manière incorrecte"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "« %s » attendue"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Ne peut créer le répertoire « %s »: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Aucun « %s » trouvé dans « %s »"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Sauter l'expansion de macro qui irait sur stdout comme la sortie Info.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Fabrication du fichier %s « %s » à partir de « %s ».\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2876,14 +2928,14 @@
"%s: Enlèvement du fichier de sortie de macro « %s » à cause d'erreurs;\n"
"utiliser l'option --force pour préserver.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Enlèvement du fichier de sortie « %s » à cause d'erreurs;\n"
"utiliser l'option --force pour préserver.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2892,98 +2944,101 @@
"%s: Enlèvement du fichier de sortie « %s » à cause d'erreurs;\n"
"utiliser l'option --force pour préserver.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Commande inconnue « %s »."
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr ""
"Utiliser des accolades pour donner une commande comme argument à « @%s »"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s accolades attendues"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Accolade « } » non appariée"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "NOM_INCONNU!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s accolade fermante manquante"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "commande @image dans un fichier (pour HTML) « %s » illisible: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Aucun fichier « %s »"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "commande @image avec un fichier (texte) « %s » illisible: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "commande @image ayant un argument fichier absent"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "fanion indéfini: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Aucune valeur pour « %s »}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s exige un nom"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Fin de fichier rencontré avant l'appariement de @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr ""
"« %.40s... » est trop long pour l'expansion; n'a pas fait d'expansion"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Accolade « } » manquante dans un patron @multitable"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "abandon du texte orphelin « %s » après la commande @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Trop de colonnes dans un item de multitable (%d max)"
@@ -2994,7 +3049,8 @@
msgstr ""
"[inattendu] ne peut pas sélectionner la colonne #%d dans une multitable."
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "inhibition d'une commande @tab à l'extérieur d'une multitable"
@@ -3034,11 +3090,13 @@
msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
"Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Renommer cette ancre ou utiliser l'option « --no-split »"
@@ -3053,6 +3111,7 @@
msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
"Commande @anchor ignorée; les références vers celle-ci ne fonctionneront pas"
@@ -3090,16 +3149,16 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "« %s » n'a pas de champ Up (à moins d'un sectionnement incorrect?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Le noeud « %s » manque d'un item menu pour « %s » en dépit d'être son noeud "
"« Up » cible"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "noeud « %s » non référencé"
@@ -3144,27 +3203,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "noeud %ctop utilisé avant %cnode, %s implicitement"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "commande @image avec un fichier « %s » illisible: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem comme dernier item de @multitable produit des documents Docbook "
"invalides"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "de"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "sur"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Premier argument de références croisée peut ne pas être vide"
@@ -3174,6 +3237,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3183,11 +3247,12 @@
msgstr "« . » ou « , » doit suivre une référence croisée, non pas %c"
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Aucune référence croisée dans ce noeud."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Premier argument de @inforef peut ne pas être vide"
@@ -3259,15 +3324,15 @@
msgid "%s is not a valid region code"
msgstr "%s n'est pas un code ISO 639 valide pour l'identification de langue"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: l'argument de l'option --footnote-style doit être « separate » ou\n"
"« end », non pas « %s ».\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3405,82 +3470,82 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: option non reconnue « --%s »\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "Ne peut pas créer le fichier de sortie « %s »."
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Ne peut créer le répertoire « %s »: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: fichier vide"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Trouver le fichier: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Le noeud « %s » défini antérieurement à la ligne %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s exige un nom"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "« %s » attendue"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr ""
"Utiliser des accolades pour donner une commande comme argument à « @%s »"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
@@ -3488,7 +3553,7 @@
"ou\n"
"« asis », non pas « %s ».\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
@@ -3496,581 +3561,568 @@
"ou\n"
"« asis », non pas « %s ».\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: l'argument de l'option --footnote-style doit être « separate » ou\n"
"« end », non pas « %s ».\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Nom d'index inconnu « %s »"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Nom d'index inconnu « %s »"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: l'argument %s doit être numérique, non pas « %s ».\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: l'argument %s doit être numérique, non pas « %s ».\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Ne peut créer le répertoire « %s »: %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Ne peut pas trouver « %s »."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "noeud « %s » non référencé"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "noeud « %s » non référencé"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "L'index « %s » existe toujours"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Enlèvement du fichier de sortie « %s » à cause d'erreurs;\n"
"utiliser l'option --force pour préserver.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: avertissement: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: avertissement: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(ligne %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(ligne %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Accolade « } » manquante dans @def arg"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Ancre « %s » et mode « %s » pointe vers le même nom de fichier"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Les notes de bas de page récursives ne sont pas permises"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Commande inconnue « %s »."
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Mauvais argument à @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: fichier vide"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "noeud « %s » non référencé"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Premier argument de @inforef peut ne pas être vide"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s réfère à un noeud « %s » inexistant (à mois d'un sectionnement incorrect?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "commande @image avec un fichier « %s » illisible: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Macro « %s » appelée à la ligne %d avec trop d'arguments"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ dans l'expansion de macro suivie par « %s » au lieu du nom de paramètre"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "aucune entrée d'index retrouvée pour « %s »\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item n'est pas permis dans l'agument @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "L'index « %s » existe toujours"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "macro « %s » déjà définie précédemment"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Accolade fermante « } » manquante pour la note de bas de page « %s »"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s est périmé"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s est périmé"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu vu avant le premier @node, création du noeud « Top »"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "macro « %s » déjà définie précédemment"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s accolades attendues"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: fichier vide"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "inhibition d'une commande @tab à l'extérieur d'une multitable"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s s'attend à argument « i » ou « j », non pas « %c »"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Commande inconnue « %s »."
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "commandes indéfinie: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s accolade fermante manquante"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s accolade fermante manquante"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: ne peut ouvrir --css-file: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "aucune entrée d'index retrouvée pour « %s »\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: ne peut ouvrir --css-file: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "commande @image avec un fichier « %s » illisible: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Ne peut pas trouver le noeud « %s »."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "commande @image dans un fichier (pour HTML) « %s » illisible: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Note...} produit une table douteuse de références croisées dans "
-"Info; réécrire pour éviter cela"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "« . » ou « , » doit suivre une référence croisée, non pas %c"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "« . » ou « , » doit suivre une référence croisée, non pas %c"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu vu avant le premier @node, création du noeud « Top »"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu vu avant le premier @node, création du noeud « Top »"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu vu avant le premier @node, création du noeud « Top »"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "commande @image avec un fichier « %s » illisible: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "erreur d'écriture dans « %s »"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Commande inconnue « %s »."
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Commande inconnue « %s »."
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "Ne peut ouvrir le fichier d'entrée « %s »."
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: ne peut ouvrir --css-file: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4122,7 +4174,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Mauvais argument à @%s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Mauvais argument à @%s"
@@ -4138,7 +4190,7 @@
msgstr "@item n'est pas permis dans l'agument @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: absence d'un argument fichier.\n"
@@ -4211,158 +4263,170 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "macro @%s inactive à l'intérieur d'un bloc « %s »"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: ne peut ouvrir --css-file: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Doit être dans une insertion « @%s » afin d'utiliser « @%s »."
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu vu avant le premier @node, création du noeud « Top »"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu vu avant le premier @node, création du noeud « Top »"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: ne peut ouvrir --css-file: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "« %s » attendue"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s n'a aucun sens à l'extérieur de l'environnement « @float »"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: absence d'un argument fichier.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Mauvais argument à @%s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: l'argument %s doit être numérique, non pas « %s ».\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: l'argument de l'option --footnote-style doit être « separate » ou\n"
"« end », non pas « %s ».\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "L'index « %s » existe toujours"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Ne peut créer le répertoire « %s »: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: ne peut ouvrir --css-file: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Ne peut créer le répertoire « %s »: %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Aucun menu dans ce noeud."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(à l'extérieur de tout noeud)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Ne peut pas trouver le noeud « %s »."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "« . » ou « , » doit suivre une référence croisée, non pas %c"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "« . » ou « , » doit suivre une référence croisée, non pas %c"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "commande @image avec un fichier « %s » illisible: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Ne peut pas trouver le noeud « %s »."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Note...} produit une table douteuse de références croisées dans "
+#~ "Info; réécrire pour éviter cela"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "« . » ou « , » doit suivre une référence croisée, non pas %c"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: avertissement: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "L'index « %s » existe toujours"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: option illégale -- %c\n"
Index: po/he.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/he.po,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- po/he.po 20 Mar 2011 21:20:25 -0000 1.63
+++ po/he.po 9 Apr 2011 00:10:39 -0000 1.64
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2002-04-03 12:31+0300\n"
"Last-Translator: Eli Zaretskii <address@hidden>\n"
"Language-Team: Hebrew <address@hidden>\n"
@@ -80,11 +80,11 @@
msgid "memory exhausted"
msgstr "éìàèøéåä ïåøëæä øîâð"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "äîéã÷ ãçà åú ïîñ ææä"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "äøåçà ãçà åú ïîñ ææä"
@@ -96,11 +96,11 @@
msgid "Move to the end of this line"
msgstr "äøåùä óåñì ïîñ ææä"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "äîéã÷ úçà äìéî ïîñ ææä"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "äøåçà úçà äìéî ïîñ ææä"
@@ -181,6 +181,7 @@
msgstr "äãéçé äîìùä"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr " :úçà äîìùä\n"
@@ -194,6 +195,7 @@
msgstr "äîìùä óñåä"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "...úåîìùä úîéùø áéëøî"
@@ -218,10 +220,12 @@
msgstr "äæ õáå÷ ìù ñ÷ãðéàá úæåøçî ùôç"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "...íéñ÷ãðéàä ìë úà ÷øåñ"
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr ".ñ÷ãðéà óà àöîð àì"
@@ -235,10 +239,12 @@
msgstr "äðåøçà `\\[index-search]' úãå÷ôî úæåøçî íàåúä óñåð ñ÷ãðéà èéøô ùôç"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr ".ñ÷ãðéàá ùåôéçì úîãå÷ úæåøçî ïéà"
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr ".ñ÷ãðéà éèéøô åàöîð àì"
@@ -288,13 +294,13 @@
"\n"
"* Menu: (úåîéàúîä úåà÷ñôäå \"%s\" íéìéëîä ñ÷ãðéà éèéøô)\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr ".øúåé áø òãéî úâöäì --help äñð\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -304,12 +310,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -317,7 +323,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -327,7 +333,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -335,7 +341,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -343,13 +349,13 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" .øåáéã æúðñîì åîéàúäì éãë êñîì äáéúë ïôåà äðù -b, --speech-friendly\n"
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -359,7 +365,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -369,13 +375,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -389,7 +395,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -402,72 +408,72 @@
" address@hidden ïåéãì íéàùåðå úåéììë úåìàùå\n"
" .http://www.gnu.org/software/texinfo/ :Texinfo ìù úéáä óã"
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr ".äàöîð àì `%s' ä÷ñéô"
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr ".äàöîð àì `%s' õáå÷á `%s' ä÷ñéô"
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "!ïåìç óà àöîð àì"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "!äæ ïåìçá úâöåîä ä÷ñéôá àöîð åðéà ïîñä"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr ".ãéçé ïåìç ÷åçîì ïúéð àì"
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr ".íééìåù úåøòä ïéà åæ ä÷ñéôá"
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr ".%sì äééðôä ïéà åæ ä÷ñéôá"
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr ".äøæò úìá÷ì `?' äñð ;Info-ì úøëåî äðéà `%c' äãå÷ô"
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr ".Info õéøäì éãë åéã ììëåùî åðéà `%s' âåñî âö"
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr ".åæ ä÷ñéô ìù ïåøçàä ãåîòá øáë ä/úà"
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr ".åæ ä÷ñéô ìù ïåùàøä ãåîòá øáë ä/úà"
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr ".ãçà ïåìç ÷ø íéé÷"
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr ".éãî øúåé ïè÷ äéä ïåìçä"
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ".åäùìë ïåìç ÷åçîì àð ;äøæò ïåìç âéöäì íå÷î ÷éôñî ïéà"
@@ -794,10 +800,12 @@
" .úæåøçîä äàöîð äá ä÷ñéôì øåáòå\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr " :àéä úéçëåð ùåôéç úîéùø\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -806,6 +814,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -823,6 +832,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -830,62 +840,62 @@
" :ììë äìòôäì úåðúéð ïðéà úåàáä úåãå÷ôä\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "äøæò êñî âöä"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Info úëøòîá ùåîéùì êéøãî âöä"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "íéåñî ù÷î øåáò ãåòéú âöä"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Describe key: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr ".øãâåî åðéà \"ESC %s\""
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr ".øãâåî åðéà \"%s\""
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s is defined to %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "úîéåñî äãå÷ô úìòôäì ãéì÷äì äî âöä"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Where is command: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "åäùìë ù÷îì äøåù÷ äðéà `%s' äãå÷ôä"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr ".`%s' úìòôäì äãéçéä êøãä àåä `%s'"
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr ".%s äãå÷ôä úà ìéòôé %s"
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr ".úîéé÷ äðéà `%s' íùá äéö÷ðåô"
@@ -898,91 +908,102 @@
" :úåøçà úåà÷ñéôá äøéçá\n"
" ---------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "éåâù äãå÷ôì íéèðîåâøàä øôñî"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "`%s' èì÷ õáå÷ úçéúôá äì÷ú"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "`%s' èìô õáå÷ úøéöéá äì÷ú"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "`%s'-ì äáéúëá äì÷ú"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "`%s' èìô õáå÷ úøéâñá äì÷ú"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "éãî äëåøà íéù÷î úøãñ"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "äøñç íéù÷î úøãñ"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "øåñà (\\000) ÷éø åúá ùåîéùä"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "øåñà (^%c) ÷éø åúá ùåîéùä"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "äãå÷ô íù øñç"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "éãî êåøà ÷ìç"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "äòåãé äððéà `%s' äãå÷ô"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "éãî êåøà äãå÷ô íù"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "`%s' äãå÷ôì êùîäá íéøúåéî íéåú"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "äðúùîä íù øñç"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "äðúùîä íù éøçà ãéî `=' øñç"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "éãî êåøà äðúùîä íù"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "éãî êåøà êøò"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\" õáå÷á %u äøåùá "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1047,10 +1068,12 @@
msgstr "åðåëãò êøåöì infokey õøä -- (éåâù ÷ìç ãå÷) ïé÷ú åðéà `%s' infokey õáå÷"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "äðìòôú àì úåãçà íéù÷î úåøãâä -- infokey õáå÷á íééåâù íéðåúð"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "ó÷åúá àì úåãçà íéðúùî úåøãâä -- infokey õáå÷á íééåâù íéðåúð"
@@ -1067,6 +1090,7 @@
msgstr "äúåà òöáå úåãå÷ôä úøåùî äãå÷ô ìù íù àø÷"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr ".äæ áöîá `echo-area' úãå÷ô òöáì ïúéð àì"
@@ -1130,7 +1154,7 @@
msgid "Select visited node: "
msgstr "Select visited node: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "!íìòð (%s) øåùé÷ä ìù ãòéä"
@@ -1140,7 +1164,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1149,326 +1173,334 @@
".âöåîä èéøôúäî äøéçáì \\[menu-item] ,àøæò úìá÷ì \\[get-help-window] ù÷ä .%s "
"àñøéâ Info úéðëúì íéàáä íéëåøá"
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "äàáä äøåùì ïîñ ææä"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "úîãå÷ä äøåùì ïîñ ææä"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "äøåùä óåñì ïîñ ææä"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "äææ ñîï ìúçéìú äùåøä"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Next äãù"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr ".äæ êîñîá úåà÷ñéô øúåé ïéà"
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr ".åæ ä÷ñéôá `Prev' øåùé÷ ïéà"
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr ".åæ ä÷ñéô øåáò `Up'-å `Prev' ììåë åðéà äæ êîñî"
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr ".úåà÷ñéôä äðáîá øúåé ÷åîò åà äîéã÷ òåð"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr ".úåà÷ñéôä äðáîá äìòî éôìë åà äøåçà òåð"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr ".äæ ïåìçá äîéã÷ ìåìâ"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "ïåìç ìãåâ ìù ç\"îøá êøò äðùå äæ ïåìçá äîéã÷ ìåìâ"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äîéã÷ ìåìâ"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"ïåìç ìãåâ ìù ç\"îøá êøò äðùå úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äîéã÷ ìåìâ"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "äæ ïåìçá äøåçà ìåìâ"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "ïåìç ìãåâ ìù ç\"îøá êøò äðùå äæ ïåìçá äøåçà ìåìâ"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äøåçà ìåìâ"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
msgstr ""
"ïåìç ìãåâ ìù ç\"îøá êøò äðùå úéçëåðä ä÷ñéôäî úàöì éìáî äæ ïåìçá äøåçà ìåìâ"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "åæ ä÷ñéô úìéçúì ïîñ ææä"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "åæ ä÷ñéô óåñì ïîñ ææä"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "äèî éôìë úåøåù N ìåìâ"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "äìòî éôìë úåøåù N ìåìâ"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "äèî éôìë äâåöú éöç ìåìâ"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "äìòî éôìë äâåöú éöç ìåìâ"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "àáä ïåìçá øçá"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "íãå÷ä ïåìçá øçá"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "íééðùì éçëåðä ïåìçä ÷ìç"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "éçëåðä ïåìçä úà øñä"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "òåá÷ ïåìç øéñäì ïúéð àì"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "éçëåðä ãáìî úåðåìçä ìë úà øñä"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "àáä ïåìçá ìåìâ"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "àáä ïåìçá äøåçà ìåìâ"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "äæ ïåìç (ïè÷ä åà) ìãâä"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "íéâöåîä úåðåìçä ìë ïéá äâåöúä çèù ÷ìç"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "éçëåðä ïåìçá åùìâù úåøåù úâöä áöî äðù"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "äàáä ä÷ñéôá øåáò"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "úîãå÷ä ä÷ñéôì øåáò"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "ìòîù ä÷ñéôì øåáò"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "äæ êîñîá äðåøçàä ä÷ñéôì øåáò"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "äæ ïåìçá úåà÷ñéô øúåé ïéà"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "äæ êîñîá äðåùàøä ä÷ñéôì øåáò"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "åæä ä÷ñéôä èéøôúî ïåøçàä óéòñá øçá"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "èéøôúäî äæ óéòñá øçá"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr ".íéôéòñ %d ïéà äæ èéøôúá"
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menu item (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menu item: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Follow xref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Follow xref: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "äîéàúîä ä÷ñéôì øåáòå èéøôúî óéòñ íù àø÷"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "äîéàúîä ä÷ñéôì øåáòå øåùé÷ åà äøòä ìù íù àø÷"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "åæ ä÷ñéôá èéøôúä úìéçúì ïîñ ææä"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "äæ èéøôúî íéôéòñ ìù øùôàä ìëë áø øôñî âöä"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "äéìà øåáòå ä÷ñéô ìù íù àø÷"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Goto node: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr ".íéèéøôú `%s' ïéà ä÷ñéôá"
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr ".`%s' óéòñ ïéà `%s' ä÷ñéô ìù èéøôúá"
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr ".`%s' óéòñá äéìà øù÷î `%s'-á èéøôúä øùà ä÷ñéô éúàöî àì"
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "íäéøçà áå÷òå dir-î äìéçúîä èéøôú éôéòñ úøãéñ àø÷"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Follow menus: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "úéðëúä õéøäì ãöéë úøàúîä ä÷ñéôä úà àöî"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Find Invocation node of [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "åúåà âöäå manpage-ì äééðôä àø÷"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Get Manpage: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "äæ êîñîá (`Top') úéùàøä ä÷ñéôì øåáò"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "`(dir)' ä÷ñéôì øåáò"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Kill node (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "`%s' ä÷ñéô ÷ìñì úåøùôà ïéà"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "äãéçé ä÷ñéô ÷ìñì úåøùôà ïéà"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "äâöåäù äðåøçàä ä÷ñéôì øåæç"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "åæ ä÷ñéô ÷ìñ"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "åúåà âöäå õáå÷ ìù íù àø÷"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Find file: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr ".àöîð àì `%s' õáå÷"
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr ".`%s' èìô õáå÷ úøéöéá äì÷ú"
@@ -1476,187 +1508,191 @@
# Note that this needs to make sense when displayed to the _right_ of
# the translated "Writing node foo..." and "Printing node foo...",
# no matter whether the following word is masculine or feminine!
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "á äçìöä"
# No ellipsis because that would look awkward when the translation of
# "Done." is appended.
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "`%s' ä÷ñéô èìô"
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "INFO_PRINT_COMMAND êøã åæ ä÷ñéô ïëåú ñôãä"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr ".`%s'-ì ÷éôà úçéúôá äì÷ú"
# No ellipsis because that would look awkward when the translation of
# "Done." is appended.
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "%s ä÷ñéô úñôãä"
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "äøåù úìéçú ãò ÷çî"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "... %s õáå÷-úú ÷øåñ"
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "úåéùéøá úåáùçúä êåú äúåà ùôçå úæåøçî àø÷"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "äúåà ùôçå úæåøçî àø÷"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "äøåçà äúåà ùôçå úæåøçî àø÷"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%sfor string [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr " case-sensitively "
# The following 4 are untranslated because they are used with the
# format string above in a prompt, and we don't translate prompts.
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Search backward"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Search"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr ".äàöîð àì úæåøçîä"
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "ïååéë åúåàá ïåøçà ùåôéç ìò øåæç"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "ïåøçà ùåôéçî úæåøçî ïéà"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "êåôä ïååéëá ïåøçà ùåôéç ìò øåæç"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "äúåà ä/ãéì÷î ä/úàù éãë êåú úæåøçî ùôç"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "I-search backward: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I-search backward: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "I-search: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I-search: "
# Untranslated because is used with the I-search: prompt.
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Failing "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "íãå÷ä øåùé÷ì ïîñ ææä"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "àáä øåùé÷ì ïîñ ææä"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "úéçëåðä äøåùá òéôåîä èéøôúî óéòñ åà øåùé÷ øçà áå÷ò"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "úéçëåð äìåòô ìèá"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "ìèåá"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "äæ ïåìçá úîéåñî äøåùì ïîñ ææä"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "äâåöú ùãç"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Info úéðëåúî àö"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "äæ ù÷î ìù úåðè÷ úåéúåà úñøéâì äøåù÷ä äãå÷ô ìòôä"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr ".(%s) úøëåî-éúìá äãå÷ô"
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" äéåâù äãå÷ô"
-#: info/session.c:4973
+#: info/session.c:4965
#, fuzzy, c-format
msgid "`%s' is invalid"
msgstr "\"%s\" äéåâù äãå÷ô"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "éçëåð éøîåð èðîåâøàì åæ äøôñ óñåä"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "4-á íéé÷ êøò ìåôë åà ,éøîåð èðîåâøà ìù äãì÷ä ìçúä"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "åæ äãå÷ôá ùîúùî \\[universal-argument]"
@@ -1765,31 +1801,26 @@
msgid " Subfile: %s"
msgstr " Subfile: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: warning: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " for %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr ".íéðééôàî ìù äàìî äîéùø úìá÷ì `%s --help' äñð\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1803,7 +1834,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1819,7 +1850,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1834,7 +1865,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1850,14 +1881,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1869,7 +1900,7 @@
" address@hidden ïåéãì íéàùåðå úåéììë úåìàùå\n"
" .http://www.gnu.org/software/texinfo/ :Texinfo ìù úéáä óã"
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, fuzzy, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1904,63 +1935,67 @@
"\n"
"* Menu:\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s õáå÷ ìù (%s) äàéø÷á ïäå (%s) äøéöéá ïä äì÷ú\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "÷éø åðéä %s õáå÷"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "íàåú END-INFO-DIR-ENTRY àìì START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "íàåú START-INFO-DIR-ENTRY àìì END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr ""
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr ".ãáìá úçà íòô %s-ì Info õáå÷ ïééöì ïúéð\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "`%s' øúåéî èðîåâøà"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ".äøæò úìá÷ì --help äñð ;èì÷ õáå÷ ïåéö ïéà"
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ".äøæò úìá÷ì --help äñð ;dir õáå÷ ïåéö ïéà"
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "`%s'-á éùàø èéøôú éôéòñ ïéà"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "÷çîð àì íåìë ;`%s' øåáò èéøôú éôéòñ åàöîð àì"
@@ -2032,6 +2067,7 @@
msgstr "@var êåúá %c øéáñ-éúìá åú"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "è÷ôà ìë @sc-ì ïéà ïëì ,úåìåãâ úåéúåàá åìåë @sc ìù èðîåâøà"
@@ -2041,6 +2077,7 @@
msgstr "%c àöîð êà ,`{' ì\"ö"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "verb êåúá õáå÷ óåñ"
@@ -2049,7 +2086,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "%c àöîð êà ,`}' ì\"ö"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2060,7 +2099,7 @@
msgid "%c%s is obsolete"
msgstr "ïùåéî åðéä %c%s"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "`%s' àì ,éáåéç øôñî àåäù èðîåâøà ùøåã @sp"
@@ -2070,17 +2109,17 @@
msgid "Bad argument to %c%s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "àåäù åîë"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "ïéà"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "%c%s-ì éåâù èðîåâøà"
@@ -2089,32 +2128,33 @@
msgid "insert"
msgstr ""
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "@def ìù èðîåâøàá `}' øñç"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, fuzzy, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "`%s' êåúá ÷øå êà ùåîéùá øúåî `%sx'"
@@ -2135,10 +2175,11 @@
msgstr ""
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr ""
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2158,11 +2199,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "`}'-á úîééúñî äðéà `%s' íééìåù úøòä"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "ä÷ñéôì õåçî íééìåù úøòä"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "íééìåù úåøòä êåúá íééìåù úåøòäá äëéîú ïéà"
@@ -2175,21 +2218,22 @@
msgid "%s: could not open --css-file: %s"
msgstr ""
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr ""
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr ""
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, fuzzy, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "`%s' :éåâù (node) ä÷ñéô íù"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
@@ -2218,14 +2262,14 @@
msgid "(line %*d)"
msgstr ""
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "@printindex-á `%s' øëåî-éúìá ñ÷ãðéà"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "ä÷ñéô ìëì õåçî øãâåî `%s' ñ÷ãðéà èéøô"
@@ -2235,6 +2279,7 @@
msgstr "(ä÷ñéô ìëì õåçî)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr ""
@@ -2243,6 +2288,7 @@
msgstr "insertion_type_pname-á éåâù type"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "@enumerate-á úéðñçî úùéìâ"
@@ -2251,7 +2297,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "%c-á ùãçî ìéçúî ,åìöåð úåéúåàä ìë"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2262,14 +2308,14 @@
msgid "%cfloat environments cannot be nested"
msgstr ""
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "`%s' àöîð íìåà ,`%s' ì\"ö address@hidden' éøçà"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2281,30 +2327,34 @@
msgstr "äøôñ åà úåà ùøåã %s"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "verbatim êåúá õáå÷ óåñ"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, fuzzy, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "address@hidden' êåúá @%s-ì úåòîùî ïéà"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "address@hidden íå÷îá @ifnottex-á úô÷åî úåéäì äúéä äëéøö @top ú÷ñéô éë
ïëúééä"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @detailmenu"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2314,9 +2364,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "address@hidden' êåúá @%s-ì úåòîùî ïéà"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2327,14 +2377,14 @@
msgid "`%c%s' needs something after it"
msgstr "åéøçà àåáéù åäùî êéøö `%c%s'"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, fuzzy, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "`%s'-ì èðîåâøàë íéàúî åðéà `%s'-ù íåùî `%s'-á éúùîúùä"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "address@hidden' êåúá @%s-ì úåòîùî ïéà"
@@ -2379,17 +2429,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "èðîåâøàë `j' åà `i' ãéçé åú ìá÷î %c%s"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "äðåùàøì øãâåä `%s' ïàë"
@@ -2404,54 +2454,56 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "àöîð àì %cend macro"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@end %s úà íàåú åðéà @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr ".íééãé éúîøä !úàéâù éãî øúåé\n"
# Not translated because Emacs recognizes warningsby this template.
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: warning: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "åîå÷îá åðéàù %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr ".`%s --help' äñð øúé èåøôì\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "%s [íéðééôàî]... TEXINFO-õáå÷... :ùåîéùä ïôåà\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2459,7 +2511,7 @@
" ìãçî úøéøáë ,íéøçà íéðåù íéèîøåôì Texinfo øå÷î úôùá ãåòéú íâøú\n"
".GNU Info úéðëú åà Emacs úøæòá äàéø÷ì íéîéàúîä Info éöá÷ øöééî \n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, fuzzy, c-format
msgid ""
"General options:\n"
@@ -2483,7 +2535,7 @@
" .úéðëúä úìåòô ìò èåøô âöä -v, --verbose\n"
" .àöå äðëúä úñøéâ éáâì òãéî âöä --version\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, fuzzy, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2497,7 +2549,7 @@
" .Info íå÷îá HTML èîøåôá èìô ïëä --html\n"
" .Info íå÷îá XML èîøåôá èìô ïëä --xml\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
#, fuzzy
msgid ""
"General output options:\n"
@@ -2527,7 +2579,7 @@
" .èìô õáå÷á úåà÷ñéôå íé÷øô øøôñ --number-sections\n"
" .(HTML èìô íà äé÷éú) FILE õáå÷ì èìô áåúë -o, --output=FILE\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, fuzzy, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2561,7 +2613,7 @@
" .øå÷îá äúéäù éôë äææä ìò øåîù ,`asis'\n"
" .(%d ç\"îøá) NUM ìãåâá íéöá÷-úúì Info ÷ìç --split-size=NUM\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2572,7 +2624,7 @@
" produce file names in ASCII transliteration.\n"
msgstr ""
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2582,7 +2634,7 @@
"dropped.\n"
msgstr ""
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
#, fuzzy
msgid ""
"Input file options:\n"
@@ -2599,7 +2651,7 @@
" address@hidden ìù ùåôéç úîéùø ùàøá DIR óñåä -P DIR\n"
" address@hidden úãå÷ôá åîë ,VAR äðúùî úøãâä ìèá -U VAR\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
#, fuzzy
msgid ""
"Conditional processing in input:\n"
@@ -2629,7 +2681,7 @@
" address@hidden èñëè ãáòú ìà --no-ifplaintext\n"
" address@hidden @iftex-á èñëè ãáòú ìà --no-iftex\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
#, fuzzy
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
@@ -2643,7 +2695,7 @@
" .íéìòôåî íðéà øúéä ìëå ìòôåî --ifinfo ,èñëè åà Info àåä èìôä íà\n"
" .íéìòôåî íðéà øúéä ìëå ìòôåî --ifplaintext ,èñëè àåä èìôä íà\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2670,192 +2722,195 @@
" úåà÷ñéô øåøôñ íò Info èìô makeinfo --number-sections foo.texi\n"
" äéäéù ìëë ìåãâ ,ãéçé õáå÷á Info èìô makeinfo --no-split foo.texi\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, fuzzy, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, fuzzy, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr ".õáå÷ íù øñç %s úéðëúì\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr ""
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "`%s' éåôö äéä ïàë"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "`%s' àöîð àì `%s' õáå÷á"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr "%s: .íùì ïååëî èìôù íåùî åèîùåé éð÷ú èìô õåøòì åø÷àî úåáçøä\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr ".%s èîøåôá `%s'-ì `%s' õáå÷ ãáòî\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' åø÷àî úåáçøä õáå÷\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' èìô õáå÷\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
"preserve.\n"
msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' èìô õáå÷\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "`%s' úøëåî-éúìá äàøåä"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, fuzzy, c-format, perl-format
msgid "%c%s expected braces"
msgstr "`{...}'-ì äôéö %c%s"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "âåæ-ïá åì ïéàù }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "NO_NAME!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s-ì øñç éðîé øâåñ"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, fuzzy, c-format
msgid "No such file `%s'"
msgstr "`%s' àöîð àì `%s' õáå÷á"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "(èñëè øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image úàøåäá øñç õáå÷ íù"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{No value for `%s'}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "íù ùøåã %c%s"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "íàåú @end %s éðôì øîâð èì÷ õáå÷"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "áçøåé àì ;åáéçøäì éãëî êåøà `%.40s...'"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "} øñç @multitable ìù úéðáúá"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "@multiline éøçà `%s' øúåéî èñëèî éúîìòúä"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "(%d ãò øúåî) multitable ìù @item-á úåãåîò éãî øúåé"
@@ -2865,7 +2920,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "multitable-á %d 'ñî äãåîò úøéçáá äì÷ú"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "multitable-ì õåçî @tab-î éúîìòúä"
@@ -2906,10 +2962,12 @@
msgstr "õáå÷ íù åúåàì úåîâøåúî `%s' øåùé÷ úéåúå `%s' ä÷ñéô"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì åæ @anchor úàøåä"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "`--no-split' ïééôàîá ùîúùä åà úéåúä íù äðù"
@@ -2924,6 +2982,7 @@
msgstr "õáå÷ íù åúåàì úåîâøåúî `%s-å `%s' øåùé÷ úåéåú"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "åìòôé àì åæ úéåú ìà íéøåùé÷ ;òöåáú àì @anchor úàøåä"
@@ -2957,14 +3016,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr ""
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "äøæçá òéáöîù èéøôú óéòñ ïéà ìáà ,`%s' ìò òéáöî `%s' ä÷ñéô ìù Up äãù"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
@@ -3009,25 +3068,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "éîöòá @node éúôñåä ,%cnode éðôì %ctop-á äùîúùä %s ä÷ñéô"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "of"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "on"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "÷éø úåéäì ìåëé åðéà øåùé÷ ìù ïåùàø èðîåâøà"
@@ -3037,6 +3100,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3046,11 +3110,12 @@
msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr ".íéøåùé÷ ïéà åæ ä÷ñéôá"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "÷éø úåéäì ìåëé åðéà @inforef ìù ïåùàø èðîåâøà"
@@ -3120,14 +3185,14 @@
msgid "%s is not a valid region code"
msgstr "ISO 639 é\"ò íéøëåîä ïåùìä éðîéñî ãçà åðéà %s"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3248,661 +3313,651 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s úéðëú øåáò `--%s' ääåæî-éúìá ïééôàî\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "`%s' èìô õáå÷ úøéöéá äì÷ú"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "÷éø åðéä %s õáå÷"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Find file: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "`%s' ä÷ñéô úøãâä øáë %d äøåùá"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "íù ùøåã %c%s"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "`%s' éåôö äéä ïàë"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "íéìñìåñî íééøâåñá êøåö ùé ,@%s-ì èðîåâøà äéäú äàøåäù éãë"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: `%s' àì ,`asis'/`none'/éøîåð úåéäì --paragraph-indent ìù èðîåâøà ìò\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "`%s' øëåî-éúìá ñ÷ãðéà"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr ".àöîð àì `%s' õáå÷"
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "øãâåî øáë `%s' ñ÷ãðéà"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr "%s: .åøîùì --force-á ùîúùä ;úåì÷ú á÷ò ÷çîéé `%s' èìô õáå÷\n"
# Not translated because Emacs recognizes warningsby this template.
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: warning: "
# Not translated because Emacs recognizes warningsby this template.
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: warning: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "@def ìù èðîåâøàá `}' øñç"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "õáå÷ íù åúåàì úåîâøåúî `%s' øåùé÷ úéåúå `%s' ä÷ñéô"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "íééìåù úåøòä êåúá íééìåù úåøòäá äëéîú ïéà"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "`%s' úøëåî-éúìá äàøåä"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "÷éø åðéä %s õáå÷"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "øåùé÷ óà ïéà `%s' ä÷ñéôì"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "÷éø úåéäì ìåëé åðéà @inforef ìù ïåùàø èðîåâøà"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%sá `%s' úîéé÷ äððéàù ä÷ñéôì äééðôä"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "éãî íéáø íéèðîåâøà úììåë `%s' åø÷àîì %d äøåùá äúìéçúù äàéø÷"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "øèîøô íù åà \\ íå÷îá ,åø÷àî úáçøäá \\ úåá÷òá `%s'"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "øãâåî øáë `%s' ñ÷ãðéà"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "`}'-á úîééúñî äðéà `%s' íééìåù úøòä"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "ïùåéî åðéä %c%s"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "ïùåéî åðéä %c%s"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "íãï÷ øãâåä øáë `%s' åø÷àî"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "`{...}'-ì äôéö %c%s"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "÷éø åðéä %s õáå÷"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "multitable-ì õåçî @tab-î éúîìòúä"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "`j' åà `i' úåéäì áééç øùà ,%c%s ìù èðîåâøà úåéäì íéàúî åðéà `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "`%s' úøëåî-éúìá äàøåä"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "`%s' úøëåî-éúìá äàøåä"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s-ì øñç éðîé øâåñ"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s-ì øñç éðîé øâåñ"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "`%s' úæåøçî íéìéëîä ñ÷ãðéà éèéøô ïéà\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr ".äàöîð àì `%s' ä÷ñéô"
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "(HTML øåáò ùøãð) @image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "`%s'-ì äáéúëá äì÷ú"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "`%s' úøëåî-éúìá äàøåä"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "`%s' úøëåî-éúìá äàøåä"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "`%s' èì÷ õáå÷ úçéúôá äì÷ú"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -3953,7 +4008,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "%c%s-ì éåâù èðîåâøà"
@@ -3969,7 +4024,7 @@
msgstr "%c%s-ì éåâù èðîåâøà"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr ".õáå÷ íù øñç %s úéðëúì\n"
@@ -4042,157 +4097,161 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "address@hidden' êåúá @%s-ì úåòîùî ïéà"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "`%s' êåúá ÷øå êà ùåîéùá øúåî `%sx'"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "`Top' ú÷ñéô øöåé ,äðåùàøä ä÷ñéôä éðôì àöîð @menu"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "`%s' éåôö äéä ïàë"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "address@hidden' êåúá @%s-ì úåòîùî ïéà"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr ".õáå÷ íù øñç %s úéðëúì\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "%c%s-ì éåâù èðîåâøà"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr ".%s ïééôàî øåáò %s é\"ò ùøãðë ,éøîåð èðîåâøà åðéà `%s'\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: `%s' àì ,`end' åà `separate' úåéäì --footnote-style ìù èðîåâøà ìò\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "øãâåî øáë `%s' ñ÷ãðéà"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "`%s' åø÷àî úåáçøä èìô úçéúôá äì÷ú"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "`%s' äé÷éú úøéöéá (%s) äì÷ú"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr ".íéèéøôú ïéà åæ ä÷ñéôá"
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(ä÷ñéô ìëì õåçî)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr ".äàöîð àì `%s' ä÷ñéô"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image øåáò `%s' õáå÷ úàéø÷á (%s) äì÷ú"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr ".äàöîð àì `%s' ä÷ñéô"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "%c àìå `,' åà `.' àåáì êéøö øåùé÷ éøçà"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: warning: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "øãâåî øáë `%s' ñ÷ãðéà"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: é÷åç-éúìá ïééôàî -- %c\n"
Index: po/hr.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/hr.po,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- po/hr.po 20 Mar 2011 21:20:26 -0000 1.63
+++ po/hr.po 9 Apr 2011 00:10:39 -0000 1.64
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2002-04-26 13:49-MET+DST (UTC+2)\n"
"Last-Translator: Mirsad Todorovac <address@hidden>\n"
"Language-Team: Croatian <address@hidden>\n"
@@ -81,11 +81,11 @@
msgid "memory exhausted"
msgstr ""
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Pomakni se znak unaprijed"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Pomakni se znak unazad"
@@ -97,11 +97,11 @@
msgid "Move to the end of this line"
msgstr "Pomakni se na kraj tekuæe linije"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Pomakni se rijeè unaprijed"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Pomakni se rijeè unazad"
@@ -182,6 +182,7 @@
msgstr "Jedino moguæe kompletiranje"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Jedno kompletiranje:\n"
@@ -195,6 +196,7 @@
msgstr "Umetni kompletiranje"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Izgraðujem varijante kompletiranja..."
@@ -219,10 +221,12 @@
msgstr "Potra¾i niz u indeksu ove datoteke"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Tra¾im stavke indeksa..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Nije pronaðen indeks."
@@ -238,10 +242,12 @@
"naredbe"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Nema prethodnog zadanog niza za pretra¾ivanje indeksa."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Nema stavaka indeksa."
@@ -291,13 +297,13 @@
"\n"
"* Meni: Èvorovi èiji indeksi sadr¾e \"%s\":\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Poku¹ajte --help za vi¹e informacija.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -307,12 +313,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "nijedna stavka indeksa nije naðena za `%s'\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -320,7 +326,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -330,7 +336,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -338,7 +344,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -346,14 +352,14 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly budi vi¹e prijateljski prema sintetizatorima "
"govora.\n"
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -363,7 +369,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -373,13 +379,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -393,7 +399,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -407,72 +413,72 @@
"Texinfo matièna stranica: http://www.gnu.org/software/texinfo/\n";
"Pitanja i kritike glede translacije slati na adresu address@hidden"
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Ne mogu naæi èvor `%s'."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Ne mogu naæi èvor `(%s)%s'."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Ne mogu naæi prozor!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Toèka se ne nalazi unutar èvora ovog prozora!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Ne mogu dokinuti zadnji prozor."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Nema menija u ovom èvoru."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Nema fusnota u ovom èvoru."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Nema unakrsnih referenci u ovom èvoru."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Nema `%s' pokazivaèa za ovaj èvor."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Nepoznata Info naredba `%c'; poku¹ajte `?' za pomoæ."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Terminal tipa `%s' nema dovoljno sposobnosti da izvodi Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Veæ se nalazite na zadnjoj stranici ovog èvora."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Veæ se nalazite na prvoj stranici ovog èvora."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Samo jedan prozor."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Nastali prozor bi bio premalen."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Nema dovoljno mjesta za prozor za pomoæ, molimo dokinite jedan prozor."
@@ -810,10 +816,12 @@
" i selektiraj èvor u kojem je slijedeæa pojava niza naðena.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Trenutni put pretra¾ivanja je:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -822,6 +830,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -839,6 +848,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -846,62 +856,62 @@
"Slijedeæe naredbe ne mogu uopæe biti pozvane:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Ispi¹i poruku za pomoæ"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Posjeti Info èvor `(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Ispi¹i dokumentaciju za TIPKU"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Opi¹i tipku: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s nije definiran."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s nije definiran."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s je definiran kao %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Poka¾i ¹to otipkati da se izvr¹i data naredba"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Gdje je naredba: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' nije niti na jednoj tipki"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s mo¾e biti pozvan samo putem %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s mo¾e biti pozvan putem %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Ne postoji funkcija `%s'"
@@ -914,93 +924,104 @@
"Izabir drugih èvorova:\n"
"----------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "pogre¹an broj argumenata"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "ne mogu otvoriti ulaznu datoteku `%s'"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "ne mogu kreirati izlaznu datoteku `%s'"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "gre¹ka pri pisanju u `%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "gre¹ka pri zatvaranju izlazne datoteke `%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "niz tipaka predugaèak"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "nedostaje niz tipaka"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL znak (\\000) nije dozvoljen"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NUL znak (^%c) nije dozvoljen"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "nedostaje ime akcije"
# this needs to be clarified and verified against info program, since
# I'm not sure what kind of section they're talking about
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "predugaèki odlomak"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "nepoznata akcija `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "predugaèko ime akcije"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "suvi¹ni znaci slijede akciju `%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "nedostaje ime varijable"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "nedostaje `=' odmah iza imena varijable"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "ime varijable predugaèko"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "predugaèka vrijednost"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", redak %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1071,11 +1092,13 @@
"se obnovi"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"Pogre¹ni podaci u infokey datoteci -- neka povezivanja tipki zanemarena"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "Pogre¹ni podaci u infokey datoteci -- neke var postavke ignorirane"
@@ -1092,6 +1115,7 @@
msgstr "Proèitaj ime naredbe u echo podruèju i izvr¹i je"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Ne mogu izvr¹iti komandu za echo podruèje ovdje."
@@ -1155,7 +1179,7 @@
msgid "Select visited node: "
msgstr "Izaberi posjeæeni èvor: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Referenca je nestala! (%s)."
@@ -1165,7 +1189,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1174,80 +1198,83 @@
"Dobrodo¹li u Info verzija %s. Otipkajte \\[get-help-window] za pomoæ, "
"\\[menu-item] za stavku menija."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Pomakni se dolje to slijedeæeg retka"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Pomakni se gore do prethodnog retka"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Pomakni se do kraja retka"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Pomakni se na poèetak retka"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Next"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Nema vi¹e èvorova u ovom dokumentu."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Nema `Prev' (prethodni) za ovaj èvor."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Nema `Prev' ni `Up' za ovaj èvor unutar dokumenta."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Idi naprijed ili nani¾e kruz strukturu èvorova"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Idi unatrag ili gore kroz strukturu èvorova"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "'Skrolaj' prema gore u ovom prozoru"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr ""
"'Skrolaj' prema dolje u ovom prozoru i postavi inicijalnu velièinu prozora"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "'Skrolaj' prema dolje u ovom prozoru ostajuæi unutar èvora"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"'Skrolaj' prema dolje u ovom prozoru ostajuæi unutar èvora i postavi "
"inicijalnu velièinu prozora"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "'Skrolaj' prema gore u ovom prozoru"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr ""
"'Skrolaj' prema gore u ovom prozoru i postavi inicijalnu velièinu prozora"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "'Skrolaj' prema gore u ovom prozoru ostajuæi unutar èvora"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1255,428 +1282,437 @@
"'Skrolaj' prema gore u ovom prozoru ostajuæi unutar èvora i postavi "
"inicijalnu velièinu prozora"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Pomakni se na poèetak trenutnog èvora"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Pomakni se na kraj trenutnog èvora"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "'Skrolaj' dolje za redaka"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "'Skrolaj' gore za redaka"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "'Skrolaj' dolje za polovinu velièine ekrana"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "'Skrolaj' gore za polovinu velièine ekrana"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Selektiraj slijedeæi prozor"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Selektiraj prethodni prozor"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Raspolovi trenutni prozor"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Obri¹i trenutni prozor"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Ne mogu obrisati permanentni prozor"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Obri¹i sve ostale prozore"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "'Skrolaj' drugi prozor"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "'Skrolaj' drugi prozor unazad"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Poveæaj (ili smanji) ovaj prozor"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Podijeli vidljivu povr¹inu ekrana izmeðu vidljivih prozora"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Promijeni stanje prelamanja linija u trenutnom prozoru"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Prika¾i Next (slijedeæi) èvor"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Prika¾i Prev (prethodni) èvor"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Prika¾i Up (gornji) èvor"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Prika¾i posljednji èvor u ovoj datoteci"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Ovaj prozor nema dodatnih èvorova"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Prika¾i prvi èvor u ovoj datoteci"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Prika¾i zadnji èvor u ovoj datoteci"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Selektiraj ovu stavku menija"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Nema %d stavaka u ovom meniju."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Stavka menija (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Stavka menija: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Slijedi xref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Slijedi xref: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Èitaj stavku menija i selektiraj njen èvor"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Èitaj fusnotu ili referencu i selektiraj njezin èvor"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Idi na poèetak menija ovog èvora"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Posjeti ¹to je vi¹e moguæe stavki odjednom"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Èitaj ime èvora i selektiraj ga"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Idi na èvor: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Nema menija u èvoru `%s'."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Nema stavke menija `%s' u èvoru `%s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Ne mogu naæi èvor referenciran od `%s' u `%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Èitaj listu menija poèev¹i od dir i slijedi ih"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Slijedi menije: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Pronaði èvor koji opisuje pozivanje programa"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Naði èvor pozivanja (Invocation) od [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Proèitaj referentnu man stranicu i selektiraj je"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Dobavi man stranicu: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Selektiraj èvor `Top' u ovoj datoteci"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Selektiraj èvor `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Poni¹ti èvor (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Ne mogu poni¹titi èvor `%s'"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Ne mogu poni¹titi zadnji èvor"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Selektiraj najzadnji odabrani èvor"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Poni¹ti ovaj èvor"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Proèitaj ime datoteke i selektiraj ga"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Naði datoteku: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Ne mogu naæi `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Gotovo."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Ispisujem èvor %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr ""
"Propusti sadr¾aj ovog èvora kroz cjevovod (pipe) prema INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Ne mogu otvoriti cjevovod (pipe) prema `%s'."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Ispisujem èvor %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "Obri¹i tekst do poèetka retka"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Tra¾im poddatoteku %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Èitaj niz znakova i kreni u potragu za njim (case-sensitive)"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Èitaj niz znakova i potra¾i ga"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Èitaj niz znakova i potra¾i ga unatrag"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%sza niz znakova [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr " (case-sensitive) "
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Tra¾i unazad"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Tra¾i"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Pretra¾ivanje neuspjelo."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Ponovi zadnje pretra¾ivanje u istom pravcu"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Nema prethodnog tra¾enog niza"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Ponovi zadnje pretra¾ivanje u suprotnom pravcu"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Tra¾i niz interaktivno kako ga tipkate"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "I-pretraga unazad: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I-pretraga unazad: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "I-pretraga: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I-pretraga: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Neuspjela "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Idi na prethodnu referencu"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Idi na slijedeæu referencu"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Selektiraj referencu ili stavku menija koja se pojavljuje u retku"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Poni¹ti trenutnu operaciju"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Zavr¹i (Quit)"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Pomakni kurzor na specificirani redak prozora"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Osvje¾i prikaz"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Zavr¹i kori¹tenje Info-a"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Izvr¹i naredbu povezanu s malim slovom varijantom ove tipke"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Nepoznata naredba (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" je neispravno"
-#: info/session.c:4973
+#: info/session.c:4965
#, fuzzy, c-format
msgid "`%s' is invalid"
msgstr "\"%s\" je neispravno"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Dodaj ovu znamenku trenutnom numerièkom argumentu"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Zapoèni (ili pomno¾i s 4) trenutni numerièki argument"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Interno kori¹ten od \\[universal-argument]"
@@ -1788,31 +1824,26 @@
msgid " Subfile: %s"
msgstr " Poddatoteka: %s"
-#: install-info/install-info.c:221
+#: install-info/install-info.c:285
#, c-format
-msgid "%s: warning: "
+msgid "%s for %s"
msgstr ""
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
-msgstr ""
-
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr ""
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr ""
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1826,7 +1857,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1842,7 +1873,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1857,7 +1888,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1873,14 +1904,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1893,7 +1924,7 @@
"Texinfo matièna stranica: http://www.gnu.org/software/texinfo/\n";
"Pitanja i kritike glede translacije slati na adresu address@hidden"
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1913,63 +1944,67 @@
"%s\n"
msgstr ""
-#: install-info/install-info.c:627
+#: install-info/install-info.c:640
#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr ""
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr ""
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr ""
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr ""
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr ""
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr ""
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr ""
@@ -2041,6 +2076,7 @@
msgstr ""
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr ""
@@ -2050,6 +2086,7 @@
msgstr ""
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr ""
@@ -2058,7 +2095,9 @@
msgid "`}' expected, but saw `%c'"
msgstr ""
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2069,7 +2108,7 @@
msgid "%c%s is obsolete"
msgstr ""
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr ""
@@ -2079,17 +2118,17 @@
msgid "Bad argument to %c%s"
msgstr ""
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr ""
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr ""
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr ""
@@ -2098,32 +2137,33 @@
msgid "insert"
msgstr ""
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr ""
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr ""
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr ""
@@ -2144,10 +2184,11 @@
msgstr ""
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr ""
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2167,11 +2208,13 @@
msgid "No closing brace for footnote `%s'"
msgstr ""
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr ""
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr ""
@@ -2184,21 +2227,22 @@
msgid "%s: could not open --css-file: %s"
msgstr ""
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr ""
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr ""
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr ""
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr ""
@@ -2227,14 +2271,14 @@
msgid "(line %*d)"
msgstr ""
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr ""
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr ""
@@ -2244,6 +2288,7 @@
msgstr ""
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr ""
@@ -2252,6 +2297,7 @@
msgstr ""
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr ""
@@ -2260,7 +2306,7 @@
msgid "lettering overflow, restarting at %c"
msgstr ""
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2271,14 +2317,14 @@
msgid "%cfloat environments cannot be nested"
msgstr ""
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr ""
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2290,30 +2336,34 @@
msgstr ""
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr ""
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr ""
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr ""
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr ""
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2323,9 +2373,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr ""
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2336,14 +2386,14 @@
msgid "`%c%s' needs something after it"
msgstr ""
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr ""
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr ""
@@ -2388,17 +2438,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr ""
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr ""
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr ""
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr ""
@@ -2413,59 +2463,61 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr ""
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr ""
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr ""
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr ""
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr ""
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr ""
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr ""
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr ""
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2480,7 +2532,7 @@
" --version display version information and exit.\n"
msgstr ""
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2490,7 +2542,7 @@
" --plaintext output plain text rather than Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2509,7 +2561,7 @@
" -o, --output=FILE output to FILE (or directory if split HTML).\n"
msgstr ""
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2531,7 +2583,7 @@
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2542,7 +2594,7 @@
" produce file names in ASCII transliteration.\n"
msgstr ""
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2552,7 +2604,7 @@
"dropped.\n"
msgstr ""
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2562,7 +2614,7 @@
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2582,7 +2634,7 @@
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2591,7 +2643,7 @@
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2607,190 +2659,193 @@
" makeinfo --no-split foo.texi write one Info file however big\n"
msgstr ""
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, fuzzy, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr ""
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr ""
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
"preserve.\n"
msgstr ""
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr ""
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr ""
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr ""
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr ""
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr ""
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr ""
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, fuzzy, c-format
msgid "No such file `%s'"
msgstr "Nema menija u èvoru `%s'."
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr ""
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr ""
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr ""
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr ""
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr ""
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr ""
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr ""
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr ""
@@ -2800,7 +2855,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr ""
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr ""
@@ -2840,10 +2896,12 @@
msgstr ""
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr ""
@@ -2858,6 +2916,7 @@
msgstr ""
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
@@ -2891,14 +2950,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr ""
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr ""
@@ -2943,25 +3002,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr ""
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr ""
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr ""
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr ""
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -2971,6 +3034,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -2980,11 +3044,12 @@
msgstr ""
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Nema unakrsnih referenci u ovom èvoru."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -3052,13 +3117,13 @@
msgid "%s is not a valid region code"
msgstr ""
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3151,651 +3216,639 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: nepoznata opcija `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "ne mogu kreirati izlaznu datoteku `%s'"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "ne mogu kreirati izlaznu datoteku `%s'"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, perl-format
msgid "%s not writable"
msgstr ""
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Naði datoteku: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "%s je definiran kao %s."
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%s: opcija `%s' tra¾i neophodan argument\n"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, perl-format
msgid "Expected @end %s"
msgstr ""
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Ne mogu naæi èvor referenciran od `%s' u `%s'."
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "ne mogu kreirati izlaznu datoteku `%s'"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Ne mogu naæi `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, perl-format
msgid "File empty for renamed node `%s'"
msgstr ""
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr ""
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr ""
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, perl-format
msgid "%s:%d: warning: %s\n"
msgstr ""
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, perl-format
msgid "Missing `}' on @%s line"
msgstr ""
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr ""
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr ""
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Nepoznata naredba (%s)."
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, perl-format
msgid "@%s (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
msgid "empty multitable"
msgstr ""
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr ""
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, perl-format
msgid "First argument to @%s may not be empty"
msgstr ""
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
msgid "@image file name"
msgstr ""
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, perl-format
msgid "Macro `%s' called with too many args"
msgstr ""
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "nijedna stavka indeksa nije naðena za `%s'\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr ""
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, perl-format
msgid "@%s already set"
msgstr ""
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "%s je definiran kao %s."
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, perl-format
msgid "No closing brace for specially handled command %s"
msgstr ""
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, perl-format
msgid "%c%s is obsolete."
msgstr ""
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, perl-format
msgid "%c%s is obsolete; %s"
msgstr ""
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, perl-format
msgid "@%s seen before first @node"
msgstr ""
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, perl-format
msgid "Float label `%s' previously defined %s"
msgstr ""
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, perl-format
msgid "@%s expected braces"
msgstr ""
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, perl-format
msgid "@%s in empty multitable"
msgstr ""
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
msgid "ignoring @tab in empty multitable"
msgstr ""
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Nepoznata naredba (%s)."
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Nepoznata naredba (%s)."
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "nedostaje ime akcije"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "nedostaje ime akcije"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "nijedna stavka indeksa nije naðena za `%s'\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, c-format
-msgid "address@hidden file `%s' unreadable: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
-msgstr "Ne mogu naæi èvor `%s'."
-
-#: texi2html/formats/html.init:2485
-#, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
msgstr ""
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
+msgstr "Ne mogu naæi èvor `%s'."
-#: texi2html/formats/info.init:1188
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
+#: texi2html/formats/html.pm:2485
+#, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr ""
-#: texi2html/formats/info.init:1352
-msgid "`.' or `,' must follow address@hidden"
+#: texi2html/formats/info.pm:1352
+msgid "`.' or `,' must follow @xref."
msgstr ""
-#: texi2html/formats/info.init:1357
-#, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
-msgid "address@hidden before first node"
+#: texi2html/formats/info.pm:2780
+msgid "@menu before first node"
msgstr ""
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+msgid "@direntry after first node"
msgstr ""
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+msgid "@dircategory after first node"
msgstr ""
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr ""
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "gre¹ka pri pisanju u `%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Nepoznata naredba (%s)."
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Nepoznata naredba (%s)."
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "ne mogu otvoriti ulaznu datoteku `%s'"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -3846,7 +3899,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, perl-format
msgid "Superfluous argument to @%s"
msgstr ""
@@ -3862,7 +3915,7 @@
msgstr ""
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: opcija `%s' tra¾i neophodan argument\n"
@@ -3935,151 +3988,143 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr ""
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
+
+#: tp/Texinfo/Parser.pm:3490
#, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3533
-msgid "@dircategory after first node"
-msgstr ""
-
-#: tp/Texinfo/Parser.pm:3683
-msgid "@direntry after first node"
-msgstr ""
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
msgid "Unexpected @"
msgstr ""
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr ""
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: opcija `%s' tra¾i neophodan argument\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
-#: tp/Texinfo/Structuring.pm:201
-msgid "@top already exists"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "ne mogu kreirati izlaznu datoteku `%s'"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "Ne mogu kreirati izlaznu datoteku `%s'."
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "ne mogu kreirati izlaznu datoteku `%s'"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Nema menija u ovom èvoru."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, perl-format
msgid "@%s outside of any node"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Ne mogu naæi èvor `%s'."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Ne mogu naæi èvor `%s'."
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: nedozvoljena opcija -- %c\n"
Index: po/hu.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/hu.po,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- po/hu.po 20 Mar 2011 21:20:26 -0000 1.37
+++ po/hu.po 9 Apr 2011 00:10:39 -0000 1.38
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: info\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2006-02-18 16:00+0100\n"
"Last-Translator: Mate LABADI <address@hidden>\n"
"Language-Team: hungarian <address@hidden>\n"
@@ -82,11 +82,11 @@
msgid "memory exhausted"
msgstr ""
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "1 karakterrel elÅre"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "1 karakterrel hátra"
@@ -98,11 +98,11 @@
msgid "Move to the end of this line"
msgstr "Ugrás a sor végére"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "1 szóval elÅre"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "1 szóval hátra"
@@ -184,6 +184,7 @@
msgstr "Egyszerű kiegészÃtés"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "1 kiegészÃtés:\n"
@@ -197,6 +198,7 @@
msgstr "KiegészÃtés beszúrása"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "KiegészÃtések felépÃtése ..."
@@ -221,10 +223,12 @@
msgstr "Szöveg keresése a fájl tárgymutatójában"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Tárgymutatóbejegyzések keresése..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Nincs tárgymutató."
@@ -239,10 +243,12 @@
"Ugrás az elÅbbi â\\[index-search]â paranccsal talált tárgymutató
bejegyzéshez"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Nincs korábbi keresési feltétel"
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Nincs tárgymutató."
@@ -294,13 +300,13 @@
"\n"
"* Menü: Oldalak, amelyek tárgymutatói tartalmazzák â%sâ-t:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "A --help több információt ad.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -310,12 +316,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "Nincs tárgymutató ehhez: %s\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -323,7 +329,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -333,7 +339,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -341,7 +347,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -349,11 +355,11 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -363,7 +369,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -373,13 +379,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -393,7 +399,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -407,77 +413,77 @@
"cÃmre küldhetÅk.\n"
"Texinfo honlap: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "A(z) â%sâ oldal nem található."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "A(z) â(%s)%sâ oldal nem található."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Nem található ablak!"
# ATNEZNI LM
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "A pont nem jelenik meg az ablakon látható oldalon!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Az utolsó ablak nem törölhetÅ!"
# node = csomópont? LM
# vagy csak pont? sas
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Nincs menü ezen az oldalon."
# node = csomópont? LM
# vagy csak pont? sas
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Nincs lábjegyezet ezen az oldalon."
# node = csomópont? LM
# vagy csak pont? sas
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Ez az oldal nem tartalmaz kereszthivatkozást."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Nincs â%sâ utalás ezen az oldalon."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Ismeretlen Info parancs: â%câ. A â?â súg."
# smart = okos vagy smart = modern vagy smart = fejlett ? LM
# sztem fejlett: sas
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "A â%sâ termináltÃpus nem elég fejlett az Info futtatásához."
# tegez/magáz? LM
# talán egy kicsit jobb a magázás itt, de ahogy tetszik, de 1séges legyen
- sas
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Ãn már az oldal utolsó lapját látja."
# tegez/magáz? LM
# talán egy kicsit jobb a magázás itt, de ahogy tetszik, de 1séges legyen
- sas
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Ãn már az oldal legelsÅ lapját látja."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Csak egy ablak."
@@ -485,13 +491,13 @@
# vagy
# resulting window = létrejövÅ/keletkezÅ ablak
# LM
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Az eredményablak túl kicsi lenne."
# tegez/magáz LM
# ha lehet, legjobb elkerülni, például be kell zárni egy ablakot, amúgy
itt: talán egy kicsit jobb a magázás, de ahogy tetszik, de 1séges legyen -
sas
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Nincs elég hely súgóablakhoz, kérem zárjon be egy ablakot!."
@@ -864,10 +870,12 @@
" és az elsŠtalálat által mutatott oldal kiválasztása.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Az aktuális keresési útvonal::\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -876,6 +884,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -891,6 +900,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -900,71 +910,71 @@
# súgó szöveg legyen vagy inkább segÃtÅ szöveg ? LM
# súgó - sas
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Súgó szöveg megjelenÃtése"
# node = oldal ? LM
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Info oldal â(info)Helpâ meglátogatása"
# KEY ? LM
# utána kell nézni, mire vonatkozik, talán dokumentáció kiÃrása a
kulcsszóhoz - sas
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Dokumentáció nyomtatása KEY-hez"
# key = kulcs ?
# key = billentyű / karakter ? LM
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "LeÃró billentyű: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s nincs definiálva."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s nincs definiálva."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s %s-ként van definiálva."
# esetleg egy jobb forditas ide ? LM
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Egy adott parancs futtatásához szükséges utasÃtás
megjelenÃtése"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Hol van a parancs: "
# key = kulcs
# key = billentyű ? LM
# sztem itt billentyű - sas
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "â%sâ egy billyentyűn sincs"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s csak %s-n át hÃvható meg."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s meghÃvható %s-n keresztül."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Nincs â%sâ nevű függvény"
@@ -981,107 +991,118 @@
# argument = argumentum
# argument = paraméter ? LM
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "érvénytelen számú argumentum"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "a(z) â%sâ input fájl nem nyitható meg."
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "a(z) â%sâ output fájl nem hozható létre."
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "hiba â%sâ Ãrásakor."
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "hiba a(z) â%sâ output fájl bezárásakor"
# key sequence = billentyűkombináció ? LM
# valsz inkább egymás után leütendŠbillentyűsorozoat - sas
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "a billentyűkombináció túl hosszú"
# key sequence = billentyűkombináció ? LM
# lehet, hogy inkább egymás után leütendŠbillentyűsorozoat - sas
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "hiányzó billentyűkombináció "
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "A NUL karakter (\\000) tilos"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "A NUL karakter (^%c) tilos"
# action=művelet ? LM
# általában az - sas
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "hiányzó műveletnév"
# section=szakasz?
# A mondat eleje nagybetu vagy kisbetu? LM
# túl hosszú szakad - ez a biztos - sas
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "túl hosszú szakasz"
# action=művelet ? LM
# általában az - sas
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "ismeretlen művelet: â%sâ."
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "túl hosszú műveletnév"
# action=muvelet? LM
# általában az - sas
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "`%s' művelet utáni extra karakterek"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "hiányzó változónév"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "hiányzó â=â jel közvetlen egy változónév után"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "túl hosszú változónév"
# long = hosszú vagy
# long = nagy ? LM
# nagy - kiváló fordÃtási stÃlus! - sas
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "túl nagy érték"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "â%sâ, %u. sor: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1134,10 +1155,12 @@
msgstr ""
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
@@ -1156,6 +1179,7 @@
# FORDITANI
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr ""
@@ -1222,7 +1246,7 @@
msgid "Select visited node: "
msgstr "Meglátogatott oldal kiválasztása: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "A hivatkozás eltünt! (%s)."
@@ -1232,7 +1256,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1241,84 +1265,87 @@
"Ãdvözöljük az Info %s verziójában. SegÃtség kéréséhez a(z)
â\\[get-help-"
"window]â-t, a menühöz ugráshoz a(z) â\\[menu-item]â-t kell
begépelni"
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Ugrás a következŠsorra"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Ugrás az elÅzÅ sorra"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Ugrás a sor végére"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Ugrás a sor elejére"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "KövetkezÅ"
# node=oldal ? LM
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Nincs több oldal e dokumentumban."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Nincs âElÅzÅâ oldala e pontnak."
# ATNEZNI LM
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Nincs ElÅzÅ vagy Fel lehetÅség e ponthoz e dokumentumban."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Mozgás elÅre vagy le az oldal szerkeztében"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Mozgás hátra vagy fel az oldal szerkezetében"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Görgetés elÅre az ablakban"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Görgetés elÅre az ablakban és beállÃtása alapértelmezett
méretre"
# aktuális ? LM
# Nem. [semmi], e, jelen, stb. - sas
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Görgetés elÅre az ablakban ezen oldalon maradva"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Görgetés elÅre az ablakban ezen oldalon maradva, és az alap ablakméret "
"beállÃtása"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Görgetés hátra az ablakban"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Görgetés hátra az ablakban és beállÃtása alapértelmezett
méretre"
# aktuális ? LM
# Nem. [semmi], e, jelen, stb. - sas
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Görgetés hátra az ablakban ezen oldalon maradva"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1326,458 +1353,467 @@
"Görgetés hátra az ablakban ezen oldalon maradva, és az alap ablakméret "
"beállÃtása"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Ugrás az oldal elejére"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Ugrás az oldal végére"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Görgetés soronként le"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Görgetés soronként fel"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Görgetés egy fél képernyÅnyit le"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Görgetés egy fél képernyÅnyit fel"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "KövetkezŠablak kiválasztása"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "ElÅzÅ ablak kiválasztása"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Jelen ablak felosztása"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Jelen ablak törlése"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Egy állandó ablakot nem lehet törölni"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Többi ablak bezárása"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Másik ablak görgetése"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "A másik ablak görgetése hátra"
# aktuális ? LM
# Nem. [semmi], e, jelen, stb. - sas
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Jelen ablak növelése (csökkentése)"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "ElérhetÅ képernyÅhely felosztása a látható ablakok közt"
# FORDITANI
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr ""
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "KövetkezŠoldal kiválasztása"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "ElÅzÅ oldal kiválasztása"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "SzülŠoldal kiválasztása"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "A fájl utolsó oldala kiválasztása"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Jelen ablaknak nincsenek további oldalai"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "A fájl elsŠoldala kiválasztása"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Az oldal menüjében található utolsó elem kiválasztása"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "A menüelem kiválasztása"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Nincs %d elem e menüben."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menüelem (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menüelem: "
# miért nem Krhiv? :))) - sas
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Kereszthiv (%s) követése: "
# miért nem Krhiv? :))) - sas
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Kereszthiv követése: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Egy menüelem elolvasása és oldalának kiválasztása"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr ""
"Egy lábjegyzet vagy kereszthivatkozás elolvasása és oldalának
kiválasztása"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Ugrás az oldalhoz tartozó menü elejére"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "A lehetŠlegtöbb menüelem meglátogatása egyszerre"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Egy oldalnév elolvasása és kiválasztása"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Ugrás az oldalra: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Nincs menü a(z) â%sâ oldalon."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Nincs â%sâ menüelem a(z) â%sâ oldalon."
# található / találom ? LM
# lelem, találom, nincs - sas
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Nincs a(z) â%sâ által hivatkozott oldal ebben: â%sâ."
# FORDITANI
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr ""
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Menük követése: "
# FORDITANI
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr ""
# FORDITANI
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr ""
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Egy kéziköny oldal hivatkozás olvasása és kiválasztása"
# Kézikönyv ? LM
# Manpage = kézikönyv oldal. Adott esetben egyszerűen manlapként vagy
manoldalként is hivatkozhatunk rájuk, mivel kissé elavultak. A GNU rendszer
alapértelemzett dokumentációformátuma az Info. Ezért is olyan fontos a
fordÃtás, amit készÃtesz :-) (és amibe ey icipicit besegÃtek ...) - sas
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Kézikönyv oldal: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "LegfelsŠoldal kiválasztása e fájban"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "A â(dir)â oldal kiválasztása"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Oldal törlése (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "A(z) â%sâ oldal nem törölhetÅ"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Az utolsó oldal nem törölhetÅ"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "A legutóbb választott oldal kiválasztása"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Ezen oldal törlése"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Fájlnév beolvasása és kiválasztása"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Fájl keresése: "
# található / találom
# a mondatszerkezet miatt itt jó a nem található - sas
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "â%sâ nem található."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "A kimeneti fájl (â%sâ) nem hozható létre."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Kész."
# Ãrás / mentés ? LM
# Ãrás - sas
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "â%sâ oldal Ãrása..."
# pipe/csÅ ? LM
# elolvasva, nekem a csÅ tetszik - sas
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Ezen oldal tartalmának csÅbe irányÃtása INFO_PRINT_COMMAND -al"
# pipe / csÅ ? LM
# semmiképen nem pipe - sas
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Nem hozható létre csÅ ehhez: â%sâ."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "%s oldal nyomtatása..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "Törlés a sor elejéig"
# alállomány ? LM
# passz - sas
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "â%sâ alállomány keresése..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Szöveg beolvasása és keresése kis/nagybetű érzékenyen"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Szöveg beolvasása és keresése "
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Szöveg beolvasása és keresése fel"
# FORDITANI
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%sa sztringhez [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
# érzékenyen / érzékenység
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr "kis/nagybetű érzékenyen"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Keresés felfelé"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Keresés"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "A keresés sikertelen volt."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Utolsó keresés ismétlése azonos irányba"
# keresési feltétel / keresési szöveg / keresett szöveg ? LM
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Nincs korábbi keresési feltétel"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Utolsó keresés ismétlése ellenirányban"
# JAVITANI ?
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Egy szöveg interaktÃv keresése gépeléskor"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "I.-keresés fel: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I.-keresés fel: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "I.-keresés: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I.-keresés: "
# checkit
# FORDITANI
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Sikertelen"
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Ugrás az elÅzÅ kereszthivatkozásra"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Ugrás a következŠkereszthivatkozásra"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "A sorban megjelenŠhivatkozás vagy menüelem kiválasztása"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Jelen művelet törlése"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Kilépés"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "A kurzor mogatása az ablak egy adott sorára "
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "KépernyÅ frissÃtése"
# rövidebb forma? Kilépés az Info-ból ? LM
# általában NAON.! fontos a RÃV.SÃG, de itt kivételesen szerintem
maradhat ez - sas
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Az Info használatának befejezése"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "E karakter kisbetűs változatához rendelt parancs futtatása"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Ismeretlen parancs (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" érvénytelen"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "â%sâ érvénytelen"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Add hozzá ezt a számjegyet az aktuális numerikus argumentumhoz"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Start (vagy szorozd be 4-gyel) az aktuális numerikus argumentumot"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "BelsŠhasználatra a \\[universal-argument]-nek"
@@ -1889,31 +1925,26 @@
msgid " Subfile: %s"
msgstr "Alfájl: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: figyelem: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " ehhez: %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tAz opciók teljes listájához próbálja meg a â%s --helpâ
parancsot!\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Használat: %s [OPCIÃK] ... TEXINFO-FÃJL...\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1927,7 +1958,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1943,7 +1974,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1958,7 +1989,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1974,14 +2005,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1994,7 +2025,7 @@
"cÃmre küldhetÅk.\n"
"Texinfo honlap: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2014,67 +2045,71 @@
"%s\n"
msgstr ""
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s:nem lehet beolvasni (%s) és nem lehet létrehozni (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: üres fájl"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY-nek nincs END-INFO-DIR-ENTRY párja"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY-nek nincsSTART-INFO-DIR-ENTRY párja"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: már van dir fájl: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Az Info fájlt csak egyszer kell megadni!\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "felesleges parancssori argumentum: â%sâ"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Nem lett input fájl megadva; további információért próbálja meg a
--help-t!"
# dir ? LM
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Nem lett dir fájl megadva; további információért próbálja meg a
--help-t!"
# dir ? LM
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "nincs info dir bejegyzés â%sâ-ben"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "â%sâ-hez nem találtam bejegyzést; nincs mit törölni"
@@ -2146,6 +2181,7 @@
msgstr "nem kedvelt karakter %c a @var-ban"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@sc argumentuma végig nagybetűs, Ãgy nincs hatása"
@@ -2155,6 +2191,7 @@
msgstr "â{â-t vártam, de â%câ-t láttam"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr ""
@@ -2163,7 +2200,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "â}â-t vártam, de â%câ-t láttam"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2174,7 +2213,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s elavult"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp egy pozitÃv szám argumentumot vár, nem â%sâ-t"
@@ -2185,17 +2224,17 @@
msgstr "Rossz argumentum ide: %c%s"
# elég / ahogy van ? LM
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr ""
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "nincs"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Rossz argumentum ide: @%s"
@@ -2204,32 +2243,33 @@
msgid "insert"
msgstr "beszúr"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Rossz argumentum ide: %s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "@%s on vagy off-t vártam, â%sâ helyett"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Hiányzó â}â a(z) @def arg.-ban"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Csak a(z) address@hidden környezetben használható a(z)
address@hidden"
@@ -2250,10 +2290,11 @@
msgstr "â%sâ mellÅzve lett, mivel a stdout-ra Ãrok"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "A kimeneti puffer nem üres."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2273,11 +2314,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "A(z) â%sâ lábjegyzet záró kapcsoszárójele hiányzik "
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "SzülŠnélkül definiált lábjegyzet"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Lábjegyzetben nem lehet lábjegyzet"
@@ -2291,21 +2334,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file kommenttel végzÅdik"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[váratlan] nincs html tag, amit ki lehetne venni"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[váratlan] érvénytelen oldalnév: â%sâ"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Ismeretlen tárgymutató â%sâ"
@@ -2334,14 +2378,14 @@
msgid "(line %*d)"
msgstr "(%*d sor)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Ismeretlen tárgymutató â%sâ itt: @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "A(z) â%sâ tárgymutató bejegyzése az oldalakon kÃvülre esik"
@@ -2351,6 +2395,7 @@
msgstr "(az oldalakon kÃvül)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item nem szerepelhet az @itemize argumentumaként"
@@ -2361,6 +2406,7 @@
msgstr ""
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr ""
@@ -2370,7 +2416,7 @@
msgstr ""
# %citem ist ein Texinfo-Befehl
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2382,14 +2428,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "A %cfloat környezetet nem lehet beágyazni"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden vártam â%sâ, de â%sâ-t találtam"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2401,32 +2447,36 @@
msgstr "%s betűt vagy számjegyet tartalmazhat"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "fájlvégét találtam egy nyitott blokkban"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "A(z) @%s -nek nincs értelme a address@hidden környezeten kÃvül"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr ""
"@menu-t találtam az elsÅ @node elÅtt. Létrehozom a âSzülÅâ (Top)
oldalt"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "esetleg a @top oldalt @ifnottex-be kellene tenni, @ifinfo helyett"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr ""
"@detailmenu-t találtam az elsÅ @node elÅtt. Létrehozom a âSzülÅâ
(Top) oldalt"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2438,9 +2488,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "A(z) @%s -nek nincs értelme a address@hidden környezeten kÃvül"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2451,14 +2501,14 @@
msgid "`%c%s' needs something after it"
msgstr "â%c%sâ után még Ãrni kell valamit"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "â%sâ rossz argument ehhez:: address@hidden, â%sâ-t használom"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s -nek nincs jelentése a(z) address@hidden blokkon belül"
@@ -2504,17 +2554,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s âiâ-t vagy âjâ-t vár argumentumként, nem â%câ-t"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s egy âiâ vagy âjâ karakter vár argumentumként"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "a(z) â%sâ makró már korábban definiált lett"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "â%sâ korábbi definÃciója"
@@ -2529,59 +2579,61 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "A(z) â%sâ makró túl sok argumentummal lett meghÃvva a %d sorban"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend makró nem található"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr ""
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Túl sok hiba! Feladom.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: figyelem: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Rossz helyen levÅ %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "További információért próbálja meg a â%s --helpâ-t.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Használat: %s [OPCIÃK] ... TEXINFO-FÃJL...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2596,7 +2648,7 @@
" --version display version information and exit.\n"
msgstr ""
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2611,7 +2663,7 @@
" --xml Texinfo XML kimenet Info helyett\n"
" --plaintext sima szöveg kimenet Info helyett\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2630,7 +2682,7 @@
" -o, --output=FILE output to FILE (or directory if split HTML).\n"
msgstr ""
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2652,7 +2704,7 @@
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2663,7 +2715,7 @@
" produce file names in ASCII transliteration.\n"
msgstr ""
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2673,7 +2725,7 @@
"dropped.\n"
msgstr ""
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2683,7 +2735,7 @@
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2703,7 +2755,7 @@
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2713,7 +2765,7 @@
msgstr ""
# Die "." am Zeilenende habe ich entfernt. -ke-
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2729,93 +2781,93 @@
" makeinfo --no-split foo.texi write one Info file however big\n"
msgstr ""
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
"%s: Figyelmen kÃvül hagyom a fel nem ismert TEXINFO_OUTPUT_FORMAT értéket
"
"(â%sâ).\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: a(z) %s argumentumának numerikusnak kell lennie, â%sâ
helyett.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: nem tudom a makrókiterjesztés â%sâ kimenetét megnyitni"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr ""
"%s: a második makrókiterjesztés â%sâ kimenetét figyelmen kÃvül
hagyom.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: nem tudom a makrókiterjesztés â%sâ kimenetét megnyitni"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr ""
"%s: a második makrókiterjesztés â%sâ kimenetét figyelmen kÃvül
hagyom.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: a --paragraph-indent argumentumának numerikusnak, ânoneâ-nak vagy "
"âasisâ-nek kell lennie, â%sâ helyett.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: a --footnote-style argumentumának âseparateâ-nek vagy âendâ-nek
kell "
"lennie, â%sâ helyett.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: hiányzó fájl argumentum.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "A többsoros %c%s parancs helytelenül van használva"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "â%sâ-t várok"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "A(z) â%sâ könyvtár nem hozható létre: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Nem található â%sâ ebben: â%sâ"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: A makrókiterjesztést átirányÃtom a stdout-ra, mivel az Info kimete
oda "
"megy.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "%s fájl (â%sâ) készÃtése â%sâ-ból.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2823,14 +2875,14 @@
"%s: A fellépett hibák miatt eltávolÃtom a(z) â%sâ makró kimeneti
állományt; "
"a megtartásához használja --force opciót.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: A fellépett hibák miatt eltávolÃtom a(z) â%sâ kimeneti
állományt; a "
"megtartásához használja --force opciót.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2839,100 +2891,103 @@
"%s: A fellépett hibák miatt eltávolÃtom a(z) â%sâ kimeneti
állományt; a "
"megtartásához használja --force opciót.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Ismeretlen parancs: â%sâ"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Kapcsos zárójelekkel egy parancsot is megadhat @%s argumentumaként"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s kapcsos zárójelpárt vár"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Pár nélküli }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "NINCS_NÃV!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s hiányzó kapcsos bezárójel"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image a(z) â%sâ fájl (HTML) nem olvasható: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Nincs ilyen fájl: â%sâ"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image a(z) â%sâ fájl (szöveges) nem olvasható: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image hiányzó fájlnév argumentum"
# flag ? LM
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "ismeretlen flag: %s"
# checkit
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{â%sâ-hoz nincs érték}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s egy nevet igényel"
# AATNEZNI ? LM
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Korábban találtam fájl vége jelet, mint @end-t %s "
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr ""
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Hiányzó } a @multitable sablonban"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr ""
"figyelmen kÃvül hagyom a @multitable után álló felesleges â%sâ
szöveget"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Túl sok oszlop szerepel a multitable elemben (max %d)"
@@ -2942,7 +2997,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[váratlan] nem lehet a(z) %d. oszlopot a multitable-ben kiválasztani"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "figyelmen kÃvül hagyom a multitable-n kÃvül esÅ @tab-ot"
@@ -2985,12 +3041,14 @@
msgstr "A(z) â%sâ horgony és a(z) â%sâ oldal ugyanarra a fájlnévre
mutatnak"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
"Ez az @anchor parancs figyelmen kÃvül lett hagyva; bármely rá való "
"hivatkozás nem fog működni"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Nevezze át ezt a horgonyt vagy használja a â--no-splitâ opciót"
@@ -3006,6 +3064,7 @@
msgstr "A(z) â%sâ és â%sâ horgonyok ugyanarra a fájlnévre mutatnak"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
"az @anchor parancs figyelmen kÃvül lett hagyva; bármely rá való
hivatkozás "
@@ -3046,15 +3105,15 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "â%sâ-nek nincs SzülÅ (Up) mezÅje (esetleg hibás
szekcionálás?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"A(z) â%sâ oldal nem tartalmaz menüelemet â%sâ-hez, bár ez uóbbi a
szülÅje"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "nem hivatkozott oldal â%sâ"
@@ -3100,12 +3159,15 @@
msgstr ""
"%ctop korábban szerepel, mint %cnode, az alapértelmezett %s-t használom"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image a(z) â%sâ fájl nem olvasható: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
@@ -3114,15 +3176,16 @@
# of ? LM
# Na, ezt nem tudjuk. Vagy elÃrás és on-off (be-ki), vagy valamibÅl
valamire alkalmazva: of, on: innen: ide: . MI EZ??? TESZTELNI KELL!
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr ""
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr ""
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -3132,6 +3195,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3143,11 +3207,12 @@
# node = csomópont? LM
# vagy csak pont? sas
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Ez az oldal nem tartalmaz kereszthivatkozást."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -3217,15 +3282,15 @@
msgid "%s is not a valid region code"
msgstr "%s nem egy ISO 639 szabvány szerinti nyelvkód"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: a --footnote-style argumentumának âseparateâ-nek vagy âendâ-nek
kell "
"lennie, â%sâ helyett.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3320,668 +3385,660 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: ismeretlen opció â--%sâ\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "a(z) â%sâ output fájl nem hozható létre."
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "A(z) â%sâ könyvtár nem hozható létre: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: üres fájl"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Fájl keresése: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "A(z) â%sâ oldal korábban már definiálva lett a(z) %d. sorban"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s egy nevet igényel"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "â%sâ-t várok"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Kapcsos zárójelekkel egy parancsot is megadhat @%s argumentumaként"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: a --paragraph-indent argumentumának numerikusnak, ânoneâ-nak vagy "
"âasisâ-nek kell lennie, â%sâ helyett.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: a --paragraph-indent argumentumának numerikusnak, ânoneâ-nak vagy "
"âasisâ-nek kell lennie, â%sâ helyett.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: a --footnote-style argumentumának âseparateâ-nek vagy âendâ-nek
kell "
"lennie, â%sâ helyett.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Ismeretlen tárgymutató â%sâ"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Ismeretlen tárgymutató â%sâ"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: a(z) %s argumentumának numerikusnak kell lennie, â%sâ
helyett.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: a(z) %s argumentumának numerikusnak kell lennie, â%sâ
helyett.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "A(z) â%sâ könyvtár nem hozható létre: %s"
# található / találom
# a mondatszerkezet miatt itt jó a nem található - sas
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "â%sâ nem található."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "nem hivatkozott oldal â%sâ"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "nem hivatkozott oldal â%sâ"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "â%sâ tárgymutató már létezik"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: A fellépett hibák miatt eltávolÃtom a(z) â%sâ kimeneti
állományt; a "
"megtartásához használja --force opciót.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: figyelem: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: figyelem: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(%*d sor)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(%*d sor)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Hiányzó â}â a(z) @def arg.-ban"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "A(z) â%sâ horgony és a(z) â%sâ oldal ugyanarra a fájlnévre
mutatnak"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Lábjegyzetben nem lehet lábjegyzet"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Ismeretlen parancs: â%sâ"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Rossz argumentum ide: @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: üres fájl"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "nem hivatkozott oldal â%sâ"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "@%s argumentuma(i) figyelmen kÃvül lett(ek) hagyva"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s egy nem létezÅ oldalra (â%sâ) hivatkozik (esetleg hibás
szekcionálás?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image a(z) â%sâ fájl nem olvasható: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "A(z) â%sâ makró túl sok argumentummal lett meghÃvva a %d sorban"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "Nincs tárgymutató ehhez: %s\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item nem szerepelhet az @itemize argumentumaként"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "â%sâ tárgymutató már létezik"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "a(z) â%sâ makró már korábban definiált lett"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "A(z) â%sâ lábjegyzet záró kapcsoszárójele hiányzik "
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s elavult"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s elavult"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr ""
"@menu-t találtam az elsÅ @node elÅtt. Létrehozom a âSzülÅâ (Top)
oldalt"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "a(z) â%sâ makró már korábban definiált lett"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s kapcsos zárójelpárt vár"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: üres fájl"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "figyelmen kÃvül hagyom a multitable-n kÃvül esÅ @tab-ot"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s âiâ-t vagy âjâ-t vár argumentumként, nem â%câ-t"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Ismeretlen parancs: â%sâ"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Definiálatlan parancs: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s hiányzó kapcsos bezárójel"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s hiányzó kapcsos bezárójel"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "Nincs tárgymutató ehhez: %s\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image a(z) â%sâ fájl nem olvasható: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "A(z) â%sâ oldal nem található."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image a(z) â%sâ fájl (HTML) nem olvasható: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-
-#: texi2html/formats/info.init:1352
-msgid "`.' or `,' must follow address@hidden"
+#: texi2html/formats/info.pm:1352
+msgid "`.' or `,' must follow @xref."
msgstr ""
-#: texi2html/formats/info.init:1357
-#, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr ""
"@menu-t találtam az elsÅ @node elÅtt. Létrehozom a âSzülÅâ (Top)
oldalt"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
msgstr ""
+"@menu-t találtam az elsÅ @node elÅtt. Létrehozom a âSzülÅâ (Top)
oldalt"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
msgstr ""
+"@menu-t találtam az elsÅ @node elÅtt. Létrehozom a âSzülÅâ (Top)
oldalt"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image a(z) â%sâ fájl nem olvasható: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "hiba â%sâ Ãrásakor."
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Ismeretlen parancs: â%sâ"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Ismeretlen parancs: â%sâ"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "a(z) â%sâ input fájl nem nyitható meg."
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4032,7 +4089,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Rossz argumentum ide: %s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Rossz argumentum ide: @%s"
@@ -4048,7 +4105,7 @@
msgstr "@item nem szerepelhet az @itemize argumentumaként"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: hiányzó fájl argumentum.\n"
@@ -4123,161 +4180,159 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s -nek nincs jelentése a(z) address@hidden blokkon belül"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: A CSS fájl nem nyitható meg: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Csak a(z) address@hidden környezetben használható a(z)
address@hidden"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr ""
-"@menu-t találtam az elsÅ @node elÅtt. Létrehozom a âSzülÅâ (Top)
oldalt"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr ""
-"@menu-t találtam az elsÅ @node elÅtt. Létrehozom a âSzülÅâ (Top)
oldalt"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "â%sâ-t várok"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "A(z) @%s -nek nincs értelme a address@hidden környezeten kÃvül"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: hiányzó fájl argumentum.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Rossz argumentum ide: %s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: a(z) %s argumentumának numerikusnak kell lennie, â%sâ
helyett.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: a --footnote-style argumentumának âseparateâ-nek vagy âendâ-nek
kell "
"lennie, â%sâ helyett.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "â%sâ tárgymutató már létezik"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "A(z) â%sâ könyvtár nem hozható létre: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: A CSS fájl nem nyitható meg: %s"
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "A(z) â%sâ könyvtár nem hozható létre: %s"
+
# node = csomópont? LM
# vagy csak pont? sas
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Nincs menü ezen az oldalon."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(az oldalakon kÃvül)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "A(z) â%sâ oldal nem található."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image a(z) â%sâ fájl nem olvasható: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "A(z) â%sâ oldal nem található."
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: figyelem: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "â%sâ tárgymutató már létezik"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: érvénytelen opció -- %c\n"
Index: po/id.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/id.po,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- po/id.po 20 Mar 2011 21:20:26 -0000 1.12
+++ po/id.po 9 Apr 2011 00:10:39 -0000 1.13
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.12.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2008-11-11 17:30+0700\n"
"Last-Translator: Arif E. Nugroho <address@hidden>\n"
"Language-Team: Indonesian <address@hidden>\n"
@@ -81,11 +81,11 @@
msgid "memory exhausted"
msgstr "kehabisan memori"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Pindah kedepan satu karakter"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Pinda kebelakang satu karakter"
@@ -97,11 +97,11 @@
msgid "Move to the end of this line"
msgstr "Pindah ke akhir dari baris ini"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Pindah kedepan satu kata"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Pindah kebelakang satu kata"
@@ -182,6 +182,7 @@
msgstr "Sole komplesi"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Satu komplesi:\n"
@@ -195,6 +196,7 @@
msgstr "Masukan komplesi"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Buat komplesi..."
@@ -220,10 +222,12 @@
msgstr "Mencari sebuah string dalam indeks untuk berkas ini"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Mencari masukan indeks..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Tidak ada indices ditemukan."
@@ -239,10 +243,12 @@
"search]'"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Tidak ada indeks pencarian string sebelumnya."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Tidak ada masukan indeks."
@@ -294,13 +300,13 @@
"\n"
"* Menu: Titik yang indices berisi `%s':\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Coba --help untuk informasi lebih lanjut.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -317,12 +323,12 @@
"TIDAK ADA GARANSI, sampai batas yang masih diijinkan oleh hukum yang "
"berlaku.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "tidak ada masukan indeks ditemukan untuk `%s'\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -333,7 +339,7 @@
"\n"
"Baca dokumentasi dalam format Info.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -350,7 +356,7 @@
"BERKAS.\n"
" -f, --file=NAMA BERKAS spesifikasikan berkas Info untuk dikunjungi."
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -364,7 +370,7 @@
"dikunjungi pertama.\n"
" -o, --output=NAMA BERKAS keluarkan titik yang dipilih ke NAMA BERKAS."
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -377,11 +383,11 @@
"BERKAS.\n"
" -O, --show-options, --usage pergi ke titik opsi baris-perintah."
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly jadi ramah untuk berbicara synthesizer."
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -396,7 +402,7 @@
" --version tampilkan informasi versi dan keluar.\n"
" -w, --where, --location tampilkan lokasi pisik dari berkas Info."
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -414,7 +420,7 @@
"Argumen sisa yang ada akan diperlakukan sebagai nama dari daftar menu\n"
"relatif ke titik inisial yang dikunjungi."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -422,7 +428,7 @@
"\n"
"Untuk sebuah ringkasan dari binding kunci, ketik h didalam Info."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -448,7 +454,7 @@
" info --subnodes -o out.txt emacs dump seluruh manual ke out.txt\n"
" info -f ./foo.info tampilkan berkas ./foo.info, bukan mencari dir"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -461,72 +467,72 @@
"pertanyaan umum dan diskusi ke address@hidden"
"Texinfo home page: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Tidak dapat menemukan titik `%s'."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Tidak dapat menemukan titik `(%s)%s'."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Tidak dapat menemukan sebuah jendela!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Titik tidak kelihatan didalam titik jendela ini!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Tidak dapat menghapus jendela terakhir."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Tidak ada menu di titik ini."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Tidak ada catatan kaki di titik ini."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Tidak ada referensi silang di titik ini."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Tidak ada `%s' penunjuk untuk titik ini."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Perintah Info `%c' tidak diketahui; coba `?' untuk bantuan."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Tipe terminal `%s' tidak cukup pintar untuk menjalankan Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Anda telah berada di akhir halaman dari titik ini."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Anda telah berada di halaman pertama dari titik ini."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Hanya satu jendela."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Menghasilkan jendela yang akan terlalu kecil."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ""
"Tidak cukup ruang untuk sebuah jendela bantuan, mohon hapus sebuah jendela."
@@ -840,10 +846,12 @@
" dan pilih titik dimana kejadian selanjutnya ditemukan.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Jalur pencarian saat ini adalah:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -852,6 +860,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -869,6 +878,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -876,63 +886,63 @@
"Perintah berikut tidak dapat dipanggil sama sekali:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Tampilkan pesan bantuan"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Kunjungi titik Info `(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Tampilkan dokumentasi untuk KUNCI"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Jelaskan kunci: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s tidak terdefinisi."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s tidak terdefinisi."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s didefinisikan ke %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr ""
"Tunjukkan apa yang harus diketikan untuk menjalankan perintah yang diberikan"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Dimana perintahnya: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' tidak di kunci apapun"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s hanya dapat dipanggil melalui %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s dapat dipanggil melalui %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Tidak ada fungsi yang bernama `%s'"
@@ -945,91 +955,102 @@
"Memilih titik lain:\n"
"-------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "jumlah dari argumen tidak benar"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "tidak dapat membuka berkas masukan `%s'"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "tidak dapat membuat berkas keluaran `%s'"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "error menulis ke `%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "error menutup berkas keluaran `%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "urutan kunci terlalu panjang"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "hilang urutan kunci"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "karakter NULL (\\000) tidak diijinkan"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "karakter NULL (^%c) tidak diijinkan"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "hilang nama aksi"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "daerah terlalu panjang"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "aksi `%s' tidak dikenal"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "nama aksi terlalu panjang"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "karakter ekstra mengikuti aksi `%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "hilang nama variabel"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "hilang `=' langsung setelah nama variabel"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "nama variabel terlalu panjang"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "nilai terlalu panjang"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", naris %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1100,10 +1121,12 @@
"untuk mengupdatenya"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Data buruk dalam berkas infokey -- beberapa kunci binding diabaikan"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "Data buruk dalam berkas infokey -- beberapa konfigurasi var diabaikan"
@@ -1120,6 +1143,7 @@
msgstr "Baca sebuah nama perintah dalam daerah echo dan jalankan itu"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Tidak dapat menjalankan sebuah perintah `echo-area' disini."
@@ -1187,7 +1211,7 @@
msgid "Select visited node: "
msgstr "Pilih titik yang dikunjungi: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Referensi menghilang! (%s)."
@@ -1197,7 +1221,7 @@
msgid "regexp error: %s"
msgstr "regexp error: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1206,78 +1230,81 @@
"Selamat datang ke Info versi %s. Ketik \\[get-help-window] untuk bantuan, "
"\\[menu-item] untuk item menu."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Pindah kebawah ke baris selanjutnya"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Pindah keatas ke baris sebelumnya"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Pindah ke akhir dari baris"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Pindah ke awal dari baris"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Selanjutnya"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Tidak ada titik lagi didalam dokumen ini."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Tidak ada `Prev' untuk titik ini."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Tidak ada `Prev' atau `Up' untuk titik ini didalam dokumen ini."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Pindah kedepan atau kebawah melalui struktur titik"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Pindah kebelakang atau keatas melalui struktur node"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Scroll kedepan di jendela ini"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Scroll kedepan dalam jendela ini dan set ukuran baku jendela"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Scroll kedepan dalam jendela ini tetap dalam titik"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Scroll kedepan dalam jendela ini tetap dalam titik dan set ukuran baku "
"jendela"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Scroll kebelakang dalam jendela ini"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Scroll kebelakang dalam jendela ini dan set ukuran baku jendela"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Scroll kebelakang dalam jendela ini tetap dalam titik"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1285,423 +1312,432 @@
"Scroll kebelakan dalam jendela ini tetap dalam titik dan set ukuran baku "
"jendela"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Pindah ke awal dari titik ini"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Pindah ke akhir dari titik ini"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Scroll ke bawah dengan baris"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Scroll ke atas dengan baris"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Scroll kebawah dengan setengah ukuran layar"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Scroll keatas dengan setengah ukuran layar"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Pilih jendela selanjutnya"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Pilih jendela sebelumnya"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Pisahkan jendela sekarang"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Hapus jendela sekarang"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Tidak dapat menghapus sebuah jendela permanen"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Hapus seluruh jendela lain"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Scroll ke jendela lain"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Scroll ke jendela lain terbalik"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Naikan (atau turunkan) jendela ini"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Bagi ruang layar yang tersedia diantara jendela yang terlihat"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Toggle keadaan dari baris wrapping dalam jendela sekarang"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Toggle penggunaan dari ekspresi regular dalam pencarian"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Menggunakan ekspresi regular untuk pencarian."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "Menggunakan string literal untuk pencarian."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Pilih titik Sebelumnya"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Pilih titik Selanjutnya"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Pilih titik Atas"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Pilih titik terakhir dalam berkas ini"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Jendela ini tidak memiliki titik tambahan"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Pilih titik pertama dalam berkas ini"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Pilih item terakhir dalam menu titik ini"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Pilih menu item ini"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Disana tidak ada %d item dalam menu ini."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menu item (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menu item: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Mengikuti xref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Mengikuti xref: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Baca sebuah item menu dan pilih titiknya"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Baca sebuah catatan kaki atau referensi silang dan pilih titiknya"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Pindah ke awal dari titik menu ini"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Kunjungi banyak menu item sekaligus jika memungkinkan"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Baca sebuah nama titik dan pilih itu"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Pergi ke titik: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Tidak ada menu dalam titik `%s'."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Tidak ada menu item `%s' dalam titik `%s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Tidak dapat menemukan titik direferensikan oleh `%s' dalam `%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Baca sebuah daftar dari menu berawal dari dir dan ikuti tersebut"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Ikuti menus: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Cari titik yang menjelaskan pemanggilan aplikasi"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Cari titik pemanggilan dari [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Baca sebuah referensi halaman manual dan pilih itu"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Dapatkan Halaman manual: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Pilih titik `Top' dalam berkas ini"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Pilih titik `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Bunuh titik (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Tidak dapat membunuh titik `%s'"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Tidak dapat membunuh titik terakhir"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Pilih titik yang dipilih paling baru"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Bunuh titik ini"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Baca nama dari sebuah berkas dan pilih itu"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Cari berkas: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Tidak dapat menemukan `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Tidak dapat membuat berkas keluaran `%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Selesai."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Menulis titik %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Pipe isi dari titik ini melalui INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Tidak dapat membuka pipe ke `%s'."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Mencetak titik %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "Pencarian dilanjutkan dari akhir dari dokumen."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "Pencarian dilanjutkan dari awal dari dokumen."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Pencarian subfile %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Baca sebuah string dan cari itu dengan tidak membedakan besar huruf"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Baca sebuah string dan cari itu"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Baca sebuah string dan cari kebelakang untuk itu"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Pencarian regexp"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " tidak membedakan besar huruf"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " kebelakang"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Pencarian"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Pencarian gagal."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Ulangi pencarian terakhir dalam arah yang sama"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Tidak ada string pencarian sebelumnya"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Ulangi pencarian terakhir dalam arah terbalik"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr ""
"Pencarian secara interaktif untuk sebuah string seperti anda mengetikkannya"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "Regexp I-search kebelakang: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I-search kebelakang: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "Regexp I-search: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I-search: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Menggagalkan "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Pindah ke referensi silang sebelumnya"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Pindah ke referensi silang selanjutnya"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Pilih referensi atau menu item muncul dalam baris ini"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Batalkan operasi sekarang"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Berhenti"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Pindah kursor ke baris spesifik dari jendela"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Gambar kembali tampilan"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Berhenti menggunakan Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Jalankan perintah terikat variasi kunci huruf kecil ini"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Perintah (%s) tidak diketahui."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" tidak valid"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "`%s' tidak valid"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Tambahkan digit ini ke argumen numerik sekarang"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Awal (atau kelipatan dari 4) argumen numerik sekarang"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Secara internal digunakan oleh \\[argumen-universal]"
@@ -1816,32 +1852,27 @@
msgid " Subfile: %s"
msgstr " Subfile: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: peringatan: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " untuk %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tCoba `%s --help' untuk sebuah daftar lengkap dari opsi.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Penggunaan: %s [OPSI]... [BERKAS-INFO [BERKAS-DIR]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
"Tambah atau hapus masukan dalam BERKAS-INFO dari direktori Info BERKAS-DIR."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1866,7 +1897,7 @@
" sama dengan menggunakan argumen BERKAS-DIR.\n"
" --dry-run sama seperti --test."
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1896,7 +1927,7 @@
" masukan ditentukan dari berkas Info tidak ada,\n"
" dan nama dasar dari berkas Info tidak ditemukan juga."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1924,7 +1955,7 @@
" --no-indent jangan format masukan baru dalam berkas DIR.\n"
" --quiet tekan peringatan."
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1954,7 +1985,7 @@
" dari informasi dalam berkas Info itu sendiri.\n"
" --section R SEC sam dengan --regex=R --section=SEC --add-once."
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1964,7 +1995,7 @@
" --test tekang pengupdatan dari BERKAS-DIR.\n"
" --version tampilkan informasi versi dan keluar."
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1974,7 +2005,7 @@
"pertanyaan umum dan diskusi ke address@hidden"
"Texinfo halaman rumah: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2011,67 +2042,71 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: tidak dapat membaca (%s) dan tidak dapat membuat (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: berkas kosong"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY tanpat pasangan END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY tanpa pasangan START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: telah memiliki berkas dir: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Spesifikasikan berkas Info hanya sekali.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Ekstra ekspresi regular dispesifikasikan, mengabaikan `%s'"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Error dalam ekspresi regular `%s': %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "kelebihan argumen baris perintah `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Tidak ada berkas masukan dispesifikasikan; coba --help untuk informasi lebih "
"lanjut."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Tidak ada berkas direktori dispesifikasikan; coba --help untuk informasi "
"lebih lanjut."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "tidak ada masukan direktori info dalam `%s'"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "tidak ada masukan ditemukan untuk `%s'; tidak ada yang dihapus"
@@ -2143,6 +2178,7 @@
msgstr "tidak seperti karakter %c dalam @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@sc argumen semuanya huruf besar, jadi tidak ada efek"
@@ -2152,6 +2188,7 @@
msgstr "`{' diduga, tetapi terlihat `%c'"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "akhir dari berkas didalam blok verb"
@@ -2160,7 +2197,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "`}' diduga, tetapi terlihat `%c'"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2173,7 +2212,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s sudah ditinggalkan"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp membutuhkan sebuah argumen numerik positif, bukan `%s'"
@@ -2183,17 +2222,17 @@
msgid "Bad argument to %c%s"
msgstr "Argumen ke %c%s buruk"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "kosong"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Argumen ke @%s buruk"
@@ -2202,32 +2241,33 @@
msgid "insert"
msgstr "masukan"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Argumen ke @%s: %s buruk"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "Diduga @%s on atau off, bukan `%s'"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Hanya @%s 10 atau 11 yang didukung, bukan `%s'"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Hilang `}' dalam @def arg"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Harus berada dalam lingkungan address@hidden' untuk menggunakan
address@hidden'"
@@ -2248,10 +2288,11 @@
msgstr "`%s' diabaikan karena menulis ke stdout"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Buffer keluaran tidak kosong."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "Tipe float `%s' yang diminta belum digunakan sebelumnya"
@@ -2271,11 +2312,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Tidak ada kurung penutup untuk catatan kaki `%s'"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Catatan kaki didefinisikan tanpa titik orang tua"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Catatan kaki didalam catatan kaki tidak diijinkan"
@@ -2288,21 +2331,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file berakhir dalam komentar"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[unexpected] tidak ada tag html untuk pop"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[unexpected] nama titik tidak valid: `%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Indeks `%s' tidak diketahui"
@@ -2331,14 +2375,14 @@
msgid "(line %*d)"
msgstr "(baris %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Indeks `%s' tidak diketahui dalam @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Masukan untuk indeks `%s' diluar dari titik apapun"
@@ -2348,6 +2392,7 @@
msgstr "(diluar dari titik apapun)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item tidak diijinkan dalam argume ke @itemize"
@@ -2356,6 +2401,7 @@
msgstr "Broken-Type dalam insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Enumerasi stack overflow"
@@ -2364,7 +2410,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "lettering overflow, memulai di %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2375,14 +2421,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "%cfloat lingkungan tidak dapat nested"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden' diduga `%s', tetapi terlihat `%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2394,31 +2440,35 @@
msgstr "%s membutuhkan huruf atau angka"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "akhir dari berkas didalam blok satu per satu"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s tidak berarti diluar lingkungan address@hidden'"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu terlihat sebelum @node pertama, membuat titik `Top'"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"mungkin titik @top anda seharusnya wrapped dalam @ifnottex daripada @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu terlihat sebelum titik pertama, membuat titik `Top'"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%s tidak berarti diluar lingkunga address@hidden' dan address@hidden'"
@@ -2428,9 +2478,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s tidak berarti diluar lingkungan address@hidden'"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2441,14 +2491,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s' membutuhkan sesuatu setelah itu"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Argumen `%s' ke address@hidden' buruk, menggunakan `%s'"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s tidak berarti didalam blok address@hidden'"
@@ -2493,17 +2543,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s diduga `i' atau `j' sebagai sebuah argumen, bukan `%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s menduga sebuah karakter tunggal `i' atau `j' sebagai argumen"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro `%s' telah didefinisikan sebelumnya"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "disini adalah definisi sebelumnya dari `%s'"
@@ -2518,53 +2568,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makro `%s' dipanggil di baris %d dengan terlalu banyak args"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend makro tidak ditemukan"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion sudah ditinggalkan; lebih baik mohon gunakan @rmacro"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "@quote-arg sudah ditinggalkan; argumen telah diquote secara baku"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "tidak cocok @end %s dengan @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Terlalu banyak errors! Menyerah.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: peringatan: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Salah tempat %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Coba `%s --help' untuk informasi lebih lanjut.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Penggunaan: %s [OPSI]... BERKAS-TEXINFO...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2573,7 +2625,7 @@
"Berkas info yang sesuai untuk pembacaan online dengan Emacs atau standalone "
"GNU Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2599,7 +2651,7 @@
" -v, --verbose jelaskan apa yang sedang dilakukan.\n"
" --version tampilkan informasi versi dan keluar.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2614,7 +2666,7 @@
" --xml keluarkan Texinfo XML daripada Info.\n"
" --plaintext keluarkan plain teks daripada Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2647,7 +2699,7 @@
" -o, --output=BERKAS keluarkan ke BERKAS (atau direktori jika split "
"HTML).\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2689,7 +2741,7 @@
" `asis', jaga indentasi yang sudah ada.\n"
" --split-size=NUM pisah berkas Info di ukuran NUM (baku %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2709,7 +2761,7 @@
" hasilkan nama berkas dalam transliterasi "
"ASCII.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2723,7 +2775,7 @@
" Jika VAL adalah 0, abaikan spasi jika "
"didrop.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2740,7 +2792,7 @@
" -U VAR tidak definisikan variabel VAR, sama dengan "
"@clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2778,7 +2830,7 @@
"\n"
" Juga, untuk opsi --no-ifFORMAT, jangan proses @ifnotFORMAT teks.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2793,7 +2845,7 @@
"off;\n"
" jika menghasilkan XML, --ifxml adalah on dan yang lain adalah off.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2821,87 +2873,87 @@
" makeinfo --no-split foo.texi tulis satu berkas Info walaupun "
"besar\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Mengabaikan nilai TEXINFO_OUTPUT_FORMAT tidak dikenal `%s'.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s arg harus berupa numerik, bukan `%s'.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: tidak dapat membuka ekspansi makro keluaran `%s'"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: mengabaikan keluaran ekspansi makro kedua `%s'.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: tidak dapat membuka keluaran link internal `%s'"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: mengabaikan keluaran link internal kedua `%s'.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: hilang argumen berkas.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Perintah multi baris %c%s digunaka secara tidak benar"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Diduga `%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Tidak dapat membuat direktori `%s': %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Tidak ada `%s' ditemukan dalam `%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Melewatkan ekspansi makro ke stdout sebaga keluaran Info akan pergi "
"kesana.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Membuat %s berkas `%s' dari `%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2909,14 +2961,14 @@
"%s: Menghapus makro berkas keluaran `%s' karena error; gunakan --force untuk "
"menjaga.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Menghapus berkas keluaran `%s' karena adanya errors; gunakan --force "
"untuk menjaga.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2925,97 +2977,100 @@
"%s: Menghapus internal links berkas keluaran `%s' karena errors; gunakan --"
"force untuk menjaga.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Perintah `%s' tidak diketahui"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr ""
"Gunakan kurung untuk memberi sebuah perintah sebagai sebuah argumen ke @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s diduga kurung"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Tidak cocok }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "NO_NAME!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s hilang kurung penutup"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image berkas `%s' (untuk HTML) tidak dapat dibaca: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Tidak ada berkas seperti itu `%s'"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image berkas `%s' (untuk teks) tidak dapat dibaca: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image hilang argumen nama berkas"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "opsi tidak terdefinisi: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Tidak ada nilai untuk `%s'}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s membutuhkan sebuah nama"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Mencapai eof sebelum cocok @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' terlalu panjang untuk ekspansi; tidak diekspan"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Hilang } dalam @multitable template"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "mengabaikan stray teks `%s' setelah @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Terlalu banyak kolom dalam multitable item (maksimal %d)"
@@ -3025,7 +3080,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[tidak terduga] tidak dapat memiliki kolom @%d dalam multitable"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "mengabaikan @tab diluar dari multitabel"
@@ -3065,10 +3121,12 @@
msgstr "Anchor `%s' dan titik `%s' peta di nama beraks yang sama"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "Perintah @anchor ini diabaikan; referensi ke itu tidak akan bekerja"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Ubah nama anchor ini atau gunakan opsi `--no-split'"
@@ -3083,6 +3141,7 @@
msgstr "Anchor `%s' dan `%s' memetakan ke nama berkas yang sama"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "perintah @anchor diabaikan; referensi ke itu tidak akan bekerja"
@@ -3119,14 +3178,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "`%s' tidak memiliki field Up (mungkin pembagian tidak benar?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Titik `%s' kurang item menu untuk `%s' dariapda target Up nya"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "titik `%s' tidak tereferensi"
@@ -3171,27 +3230,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%c puncak digunakan sebelum %c titik, membakukan ke %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image berkas `%s' tidak dapat dibaca: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem sebagai item terakhir dari @multitable menghasilkan dokumen "
"Docbook tidak valid"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "of"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "on"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Argumen pertama ke referensi silang tidak boleh kosong"
@@ -3201,6 +3264,7 @@
msgstr "Nama berkas kosong utuk referensi silang HTML dalam `%s'"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Akhir dari berkas tercapai ketika melihat untuk `.' atau `,'"
@@ -3210,10 +3274,12 @@
msgstr "`.' atau `,' harus mengikuti @%s, bukan `%c'"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "untuk referensi silang dalam tanda kurung, gunakan @pxref"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Argumen pertama ke @inforef tidak boleh kosong"
@@ -3285,14 +3351,14 @@
msgid "%s is not a valid region code"
msgstr "%s bukan sebuah kode bahasa ISO 639 yang valid"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3430,667 +3496,654 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: opsi tidak dikenal `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "tidak dapat membuat berkas keluaran `%s'"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Tidak dapat membuat direktori `%s': %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: berkas kosong"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Cari berkas: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Titik `%s' telah didefinisikan sebelumnya di baris %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s membutuhkan sebuah nama"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Diduga `%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr ""
"Gunakan kurung untuk memberi sebuah perintah sebagai sebuah argumen ke @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: --paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent arg harus berupa numerik/`none'/`asis', bukan `%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Indeks `%s' tidak diketahui"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Indeks `%s' tidak diketahui"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s arg harus berupa numerik, bukan `%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s arg harus berupa numerik, bukan `%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Tidak dapat membuat direktori `%s': %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Tidak dapat menemukan `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "titik `%s' tidak tereferensi"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "titik `%s' tidak tereferensi"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Indeks `%s' telah ada"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Menghapus berkas keluaran `%s' karena adanya errors; gunakan --force "
"untuk menjaga.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: peringatan: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: peringatan: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(baris %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(baris %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Hilang `}' dalam @def arg"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Anchor `%s' dan titik `%s' peta di nama beraks yang sama"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Catatan kaki didalam catatan kaki tidak diijinkan"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Perintah `%s' tidak diketahui"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Argumen ke @%s buruk"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: berkas kosong"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "titik `%s' tidak tereferensi"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Argumen pertama ke @inforef tidak boleh kosong"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s referensi ke titik yang tidak ada `%s' (mungkin pembagian tidak benar?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image berkas `%s' tidak dapat dibaca: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makro `%s' dipanggil di baris %d dengan terlalu banyak args"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "\\ dalam ekspansi makro diikuti oleh `%s' daripada nama parameter"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "tidak ada masukan indeks ditemukan untuk `%s'\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item tidak diijinkan dalam argume ke @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Indeks `%s' telah ada"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "makro `%s' telah didefinisikan sebelumnya"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Tidak ada kurung penutup untuk catatan kaki `%s'"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s sudah ditinggalkan"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s sudah ditinggalkan"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu terlihat sebelum @node pertama, membuat titik `Top'"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "makro `%s' telah didefinisikan sebelumnya"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s diduga kurung"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: berkas kosong"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "mengabaikan @tab diluar dari multitabel"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s diduga `i' atau `j' sebagai sebuah argumen, bukan `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Perintah `%s' tidak diketahui"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Perintah: %s tidak terdefinisi"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s hilang kurung penutup"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s hilang kurung penutup"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "tidak ada masukan indeks ditemukan untuk `%s'\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image berkas `%s' tidak dapat dibaca: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "@quote-arg sudah ditinggalkan; argumen telah diquote secara baku"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Tidak dapat menemukan titik `%s'."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image berkas `%s' (untuk HTML) tidak dapat dibaca: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Note...} menghasilkan sebuah referensi silang spurious dalam Info; "
-"reword ke untuk menghindari"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "`.' atau `,' harus mengikuti @%s, bukan `%c'"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' atau `,' harus mengikuti @%s, bukan `%c'"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu terlihat sebelum @node pertama, membuat titik `Top'"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu terlihat sebelum @node pertama, membuat titik `Top'"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu terlihat sebelum @node pertama, membuat titik `Top'"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image berkas `%s' tidak dapat dibaca: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "error menulis ke `%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Perintah `%s' tidak diketahui"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Perintah `%s' tidak diketahui"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "tidak dapat membuka berkas masukan `%s'"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "@quote-arg sudah ditinggalkan; argumen telah diquote secara baku"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4141,7 +4194,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Argumen ke @%s: %s buruk"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Argumen ke @%s buruk"
@@ -4157,7 +4210,7 @@
msgstr "@item tidak diijinkan dalam argume ke @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: hilang argumen berkas.\n"
@@ -4230,157 +4283,169 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s tidak berarti didalam blok address@hidden'"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: tidak dapat membuka --css-file: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Harus berada dalam lingkungan address@hidden' untuk menggunakan
address@hidden'"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu terlihat sebelum @node pertama, membuat titik `Top'"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu terlihat sebelum @node pertama, membuat titik `Top'"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Diduga `%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s tidak berarti diluar lingkungan address@hidden'"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: hilang argumen berkas.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Argumen ke @%s: %s buruk"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s arg harus berupa numerik, bukan `%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: --footnote-style arg harus berupa `separate' atau `end', bukan `%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Indeks `%s' telah ada"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Tidak dapat membuat direktori `%s': %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: tidak dapat membuka --css-file: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Tidak dapat membuat direktori `%s': %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Tidak ada menu di titik ini."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(diluar dari titik apapun)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Tidak dapat menemukan titik `%s'."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "`.' atau `,' harus mengikuti @%s, bukan `%c'"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "`.' atau `,' harus mengikuti @%s, bukan `%c'"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image berkas `%s' tidak dapat dibaca: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Tidak dapat menemukan titik `%s'."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Note...} menghasilkan sebuah referensi silang spurious dalam "
+#~ "Info; reword ke untuk menghindari"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "`.' atau `,' harus mengikuti @%s, bukan `%c'"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: peringatan: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Indeks `%s' telah ada"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: opsi tidak legal -- %c\n"
Index: po/it.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/it.po,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- po/it.po 20 Mar 2011 21:20:27 -0000 1.14
+++ po/it.po 9 Apr 2011 00:10:39 -0000 1.15
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.13\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2010-12-02 20:25+0100\n"
"Last-Translator: Francesco Groccia <address@hidden>\n"
"Language-Team: Italian <address@hidden>\n"
@@ -81,11 +81,11 @@
msgid "memory exhausted"
msgstr "memoria esaurita"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Avanti di un carattere"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Indietro di un carattere"
@@ -97,11 +97,11 @@
msgid "Move to the end of this line"
msgstr "Vai alla fine di questa riga"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Avanti di una parola"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Indietro di una parola"
@@ -182,6 +182,7 @@
msgstr "Completamento esclusivo"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Un completamento:\n"
@@ -195,6 +196,7 @@
msgstr "Inserisci completamento"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Creazione dei completamenti..."
@@ -220,10 +222,12 @@
msgstr "Cerca un testo nell'indice di questo file"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Ricerca indice delle voci..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Nessun indice trovato."
@@ -239,10 +243,12 @@
"«\\[index-search]»"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Nessun precedente testo di ricerca dell'indice."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Nessuna voce dell'indice."
@@ -292,13 +298,13 @@
"\n"
"* Menù: nodi i cui indici contengono «%s»:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Usare «--help» per maggiori informazioni.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -313,12 +319,12 @@
"Questo è software libero: siete liberi di modificarlo e ridistribuirlo.\n"
"Non c'è ALCUNA GARANZIA, per quanto consentito dalle leggi vigenti.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "nessuna voce dell'indice trovata per «%s»\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -329,7 +335,7 @@
"\n"
"Legge la documentazione nel formato Info.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -346,7 +352,7 @@
"FILE.\n"
" -f, --file=FILE specifica il file Info da visitare."
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -360,7 +366,7 @@
"visitato.\n"
" -o, --output=FILE salva i nodi selezionati nel file FILE."
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -376,12 +382,12 @@
" -O, --show-options, --usage vai al nodo delle opzioni della linea di "
"comando."
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly compatibilità con il sintetizzatore vocale."
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -397,7 +403,7 @@
" --version mostra le informazioni di versione ed esce.\n"
" -w, --where, --location mostra la locazione fisica del file Info."
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -415,7 +421,7 @@
"Tutti gli argomenti restanti sono considerati come nomi di voci di menù\n"
"relativi al nodo iniziale visitato."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -424,7 +430,7 @@
"Per un riepilogo delle associazioni dei tasti, digitare «h» all'interno di "
"Info."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -451,7 +457,7 @@
" info -f ./foo.info mostra il file «./foo.info» senza cercare la "
"cartella"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -464,72 +470,72 @@
"per domande generali e discussioni: address@hidden"
"Sito web di Texinfo: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Impossibile trovare il nodo «%s»."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Impossibile trovare il nodo «(%s)%s»."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Impossibile trovare una finestra!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Il cursore non appare nel nodo di questa finestra!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Impossibile eliminare l'ultima finestra."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Nessun menù in questo nodo."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Nessun piè di pagina in questo nodo."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Nessun riferimento incrociato in questo nodo."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Nessun puntatore a «%s» per questo nodo."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Comando Info «%c» sconosciuto; usare «?» per l'aiuto."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Il tipo di terminale «%s» non è in grado di avviare il programma
Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Sei già all'ultima pagina di questo nodo."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Sei già alla prima pagina di questo nodo."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Solo una finestra."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "La finestra risultante sarebbe troppo piccola."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ""
"Non c'è abbastanza spazio sullo schermo per visualizzare una\n"
@@ -844,10 +850,12 @@
" e seleziona il nodo in cui viene trovata l'occorrenza.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Percorso di ricerca corrente:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -856,6 +864,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -873,6 +882,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -880,62 +890,62 @@
"I seguenti comandi non possono essere invocati in alcun modo:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Visualizza il messaggio di aiuto"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Visita il nodo Info «(info)Help»"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Stampa la documentazione per la chiave CHIAVE"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Descrizione della chiave: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s non è stato definito."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s non è stato definito."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s è stato definito come %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Mostra cosa digitare per un comando specifico"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Dov'è il comando: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "«%s» non è su alcun tasto"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "«%s» può essere invocato solo mediante «%s»"
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "«%s» può essere invocato mediante %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Non esiste una funzione di nome «%s»"
@@ -948,91 +958,102 @@
"Selezionare altri nodi:\n"
"-----------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "numero di argomenti errato"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "impossibile aprire il file di input «%s»"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "impossibile creare il file di output «%s»"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "errore durante la scrittura del file «%s»"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "errore durante la chiusura del file di output «%s»"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "sequenza di tasti troppo lunga"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "sequenza di tasti mancante"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "carattere NUL (\\000) non permesso"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "carattere NUL (^%c) non permesso"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "nome dell'azione assente"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "sezione troppo lunga"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "azione «%s» sconosciuta"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "nome azione troppo lungo"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "caratteri in più dopo il nome dell'azione «%s»"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "nome variabile assente"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "carattere «=» assente dopo il nome della variabile"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "nome variabile troppo lungo"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "valore troppo lungo"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", riga %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1103,11 +1124,13 @@
"per aggiornarlo"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"Dati errati nel file infokey -- alcune combinazioni di tasti saranno ignorate"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"Dati errati nel file infokey -- alcune impostazioni delle variabili "
@@ -1126,6 +1149,7 @@
msgstr "Leggi il nome di un comando nell'area echo ed eseguilo"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Impossibile eseguire un comando «echo-area» qui."
@@ -1191,7 +1215,7 @@
msgid "Select visited node: "
msgstr "Seleziona il nodo visitato: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Il riferimento è scomparso! (%s)."
@@ -1201,7 +1225,7 @@
msgid "regexp error: %s"
msgstr "Errore nell'espressione regolare: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1210,81 +1234,84 @@
"Questo è Info, versione %s. Digitare \\[get-help-window] per l'aiuto,\n"
"\\[menu-item] per selezionare un voce di menù."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Vai alla riga successiva"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Vai alla riga precedente"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Vai alla fine della riga"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Vai all'inizio della riga"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Avanti"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Nessun altro nodo in questo documento."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Nessun «Prev» nodo."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Questo nodo non contiene nessun «Prev» o «Up» in questo documento."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Vai avanti o in basso attravero la struttura del nodo"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Vai indietro o in alto attraverso la struttura del nodo"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Avanti in questa finestra"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr ""
"Avanti in questa finestra e imposta la dimensione predefinita della finestra"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Avanti in questa finestra e resta all'interno del nodo"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Avanti in questa finestra, resta all'interno del nodo e imposta\n"
"la dimensione predefinita della finestra"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Indietro in questa finestra"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr ""
"Indietro in questa finestra e imposta la dimensione predefinita della "
"finestra"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Indietro in questa finestra e resta all'interno del nodo"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1292,425 +1319,434 @@
"Indietro in questa finestra, resta all'interno del nodo e imposta\n"
"la dimensione predefinita della finestra"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Vai all'inizio di questo nodo"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Vai alla fine di questo nodo"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Vai giù per righe"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Vai su per righe"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Vai giù per metà schermo"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Vai su per metà schermo"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Seleziona la finestra successiva"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Seleziona la finestra precedente"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Dividi la finestra attuale"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Elimina la finestra attuale"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Impossibile eliminare una finestra permanente"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Elimina tutte le altre finestra"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Scorri l'altra finestra"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Scorri indietro l'altra finestra"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Ingrandisci (o riduci) questa finestra"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Dividi lo spazio sullo schermo tra le finestre visibili"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr ""
"Attiva o disattiva la modalità a capo automatico nella finestra corrente"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Attiva o disattiva l'uso delle espressioni regolari nelle ricerche"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Usa le espressioni regolari nelle ricerche."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "Usa il testo letterale nelle ricerche"
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Seleziona il nodo successivo"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Seleziona il nodo precedente"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Seleziona il nodo superiore"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Seleziona l'ultimo nodo in questo file"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Questa finestra non ha nodi aggiuntivi"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Seleziona il primo nodo in questo file"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Seleziona l'ultima voce del menù in questo nodo"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Seleziona questa voce di menù"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Non ci sono %d voci in questo menù."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Voce di menù (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Voce di menù: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Segui collegamento (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Segui link: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Leggi una voce di menù e seleziona il nodo corrispondente"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr ""
"Leggi una nota a piè di pagina o un riferimento incrociato e seleziona il "
"nodo corrispondente"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Vai al menù principale di questo nodo"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Visita in una sola volta quante più voci di menù possibile"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Leggi il nome di un nodo e selezionalo"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Vai al nodo: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Nessun menù nel nodo «%s»."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Nessuna voce di menù «%s» nel nodo «%s»."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Impossibile trovare il nodo referenziato da «%s» in «%s»."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Leggi l'elenco dei menù a partire dalla cartella specificata e
seguili"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Segui i menù: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Cerca il nodo che descrive l'invocazione del programma in questione"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Cerca il nodo di invocazione di [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Leggi un riferimento alla pagina del manuale e selezionala"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Cerca pagina di manuale: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Seleziona il nodo «Principale» in questo file"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Seleziona il nodo «(dir)»"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Elimina nodo (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Impossibile eliminare il nodo «%s»"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Impossibile eliminare l'ultimo nodo"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Seleziona il nodo selezionato più recentemente"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Elimina questo nodo"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Leggi il nome di un file e selezionalo"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Cerca un file: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Impossibile trovare «%s»."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Impossibile creare il file «%s»."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Fatto."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Scrittura del nodo %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Scarica i contenuti di questo nodo mediante INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Impossibile scaricare su «%s»."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Stampa nodo %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "Ricerca continuata a partire dalla fine del documento."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "Ricerca continuata a partire dall'inizio del documento."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Cerca il subfile %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Leggi e cerca un testo (distinguendo le lettere maiuscole/minuscole)"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Leggi e cerca un testo"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Leggi un testo e cerca all'indietro"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Cerca (espressione regolare)"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " distingue maiuscole/minuscole"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " indietro"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Cerca"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Ricerca fallita."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Ripeti l'ultima ricerca nella stessa direzione"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Nessun testo di ricerca precedente"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Ripeti l'ultima ricerca nella direzione opposta"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Cerca interattivamente un testo durante la digitazione"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "Ricerca incrementale all'indietro mediante espressione regolare: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "Ricerca incrementale all'indietro: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "Ricerca incrementale mediante espressione regolare: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "Ricerca incrementale: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Fallita "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Vai al riferimento incrociato precedente"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Vai al riferimento incrociato successivo"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Seleziona il riferimento o la voce di menù in questa riga"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Annulla l'operazione corrente"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Esci"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Sposta il cursore a una riga specifica della finestra"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Ridisegna lo schermo"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Esci dal programma Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Esegui il comando associato a questa variante di tasto minuscolo"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Comando sconosciuto (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" non è valido"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "«%s» non è valido"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Aggiungi questa cifra all'argomento numerico attuale"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Inizia (o moltiplica per quattro) l'argomento numerico attuale"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Usato internamente da \\[universal-argument]"
@@ -1831,32 +1867,27 @@
msgid " Subfile: %s"
msgstr " Subfile: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: avvertimento: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " per %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\\tUsare «%s --help» per l'elenco completo delle opzioni.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Uso: %s [OPZIONE]... [INFO-FILE [DIR-FILE]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
"Aggiungi o rimuovi voci nel file INFO-FILE dalla cartella di Info DIR-FILE."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1881,7 +1912,7 @@
" equivale a usare l'argomento DIR-FILE.\n"
" --dry-run equivale a «--test»."
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1912,7 +1943,7 @@
"presente\n"
" e il nome di base del file Info non è stato trovato."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1939,7 +1970,7 @@
" --no-indent non formattare le nuove voci nel FILE-INDICE.\n"
" --quiet ignora gli avvertimenti."
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1972,7 +2003,7 @@
" --section REGEXP SECTION equivalente a «--regex=REGEXP --section=SECTION --"
"add-once»."
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1982,7 +2013,7 @@
" --test ignora l'aggiornamento del DIR-FILE.\n"
" --version mostra le informazioni di versione ed esce."
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1992,7 +2023,7 @@
"per domande generali e discussioni: address@hidden"
"Sito web di Texinfo: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2030,65 +2061,69 @@
"\n"
" %s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: impossibile leggere (%s) e creare (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: file vuoto"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY senza la corrispondente END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY senza la corrispondente START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: ha già un file indice: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Specifica il file Info solo una volta.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Espressione regolare specificata in più, ignoro «%s»"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Errore nell'espressione regolare «%s»: %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "Troppi argomenti sulla riga di comando «%s»"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Nessun file in entrata specificato; usare «--help» per maggiori
informazioni."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"File di indice non specificato; usare «--help» per maggiori informazioni."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "nessuna voce dell'indice in «%s»"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "nessuna voce trovata per «%s»; nulla da eliminare"
@@ -2160,6 +2195,7 @@
msgstr "carattere %c strano in @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr ""
"Tutti gli argomenti per la @sc sono in maiuscolo, perciò non hanno alcun "
@@ -2171,6 +2207,7 @@
msgstr "si aspettava il carattere «{», ma è stato letto il carattere «%c»"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "fine del file dentro al blocco \"verb\""
@@ -2179,7 +2216,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "si aspettava il carattere «}», ma è stato letto il carattere «%c»"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2192,7 +2231,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s è obsoleto"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp richiede un argomento numerico positivo, non «%s»"
@@ -2202,17 +2241,17 @@
msgid "Bad argument to %c%s"
msgstr "Argomento errato per %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "nulla"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Argomento errato per @%s"
@@ -2221,32 +2260,33 @@
msgid "insert"
msgstr "inserisci"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Argomento errato per @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "Si aspettava la lettura @%s \"on\" oppure \"off\", non «%s»"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Solo @%s \"10\" o \"11\" è supportata, non «%s»"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Carattere «}» assente nella costruzione di address@hidden arg»"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Deve essere nell'ambiente address@hidden per usare address@hidden"
@@ -2267,10 +2307,11 @@
msgstr "«%s» omesso dal momento della scrittura sullo standard output"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Buffer di uscita non vuoto."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "Il tipo a virgola mobile «%s» non è stato usato in precedenza"
@@ -2290,11 +2331,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Nessuna parentesi di chiusura per le note a piè di pagina «%s»"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Note a piè di pagina definite senza un nodo di riferimento"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Le note a piè di pagina all'interno di se stesse non sono permesse"
@@ -2307,21 +2350,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: impossibile aprire --css-file: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file termina con un commento"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[inaspettato] nessun etichetta HTML da estrarre"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[inaspettato] nome del nodo non valido: «%s»"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Indice «%s» sconosciuto"
@@ -2350,14 +2394,14 @@
msgid "(line %*d)"
msgstr "(riga %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Indice «%s» sconosciuto in @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Voce per l'indice «%s» non presente in alcun nodo"
@@ -2367,6 +2411,7 @@
msgstr "(non presente in alcun nodo)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item non permesso come argomento di @itemize"
@@ -2375,6 +2420,7 @@
msgstr "Tipo errato in «insertion_type_pname»"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Stack overflow da enumerazione"
@@ -2383,7 +2429,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "overflow dei caratteri, ricomincia dal carattere %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2394,15 +2440,15 @@
msgid "%cfloat environments cannot be nested"
msgstr "gli ambienti %cfloat non possono essere innestati"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr ""
"address@hidden si aspettava il carattere «%s», ma è stato letto il
carattere «%s»"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2414,20 +2460,23 @@
msgstr "%s richiede una lettera o un numero"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "fine del file all'interno del blocco letterale"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s è privo di significato aldifuori dell'ambiente address@hidden"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu è stato letto prima del primo @node, creazione del nodo «Top»"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
@@ -2435,12 +2484,13 @@
"sotto @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr ""
"@detailmenu è stato letto prima del primo nodo, creazione del nodo «Top»"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2452,9 +2502,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s è privo di significato aldifuori dell'ambiente address@hidden"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2465,14 +2515,14 @@
msgid "`%c%s' needs something after it"
msgstr "«%c%s» necessita di un argomento dopo la sua dichiarazione"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Argomento «%s» errato per address@hidden, usare «%s»"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s è privo di significato all'interno del blocco address@hidden"
@@ -2517,17 +2567,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s si aspettava «i» o «j» come argomento, non «%c»"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s si aspettava un singolo carattere «i» o «j» come argomento"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro «%s» già definita precedentemente"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ecco la definizione precedente di «%s»"
@@ -2544,53 +2594,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "La macro «%s» chiamata sulla riga %d contiene troppi argomenti"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend macro non trovata"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion è deprecata; al suo posto usare @rmacro"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "@quote-arg è deprecata; gli argomenti vengono quotati come
predefinito"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@end %s mancante con @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Troppi errori! Rinuncio.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: avvertimento: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "%c fuori luogo"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Usare «%s --help» per maggiori informazioni.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Uso: %s [OPZIONE]... FILE-TEXINFO...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2599,7 +2651,7 @@
"per impostazione predefinita i file Info sono adatti alla lettura con Emacs\n"
"oppure con GNU Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2627,7 +2679,7 @@
" -v, --verbose spiega cosa sta facendo.\n"
" --version mostra le informazioni di versione ed esce.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2642,7 +2694,7 @@
" --xml genera un file in formato Texinfo.\n"
" --plaintext genera un file in formato testo.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2680,7 +2732,7 @@
"cartella se\n"
" il formato di output è HTML multipagina).\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2723,7 +2775,7 @@
" --split-size=NUM genera un documento multipagina di dimensioni "
"NUM (predefinito %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2743,7 +2795,7 @@
" genera nomi di file nella traslitterazione "
"ASCII.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2758,7 +2810,7 @@
" Se VAL è 0, gli spazi bianchi sono "
"ignorati.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2777,7 +2829,7 @@
" -U VAR indefinisci la variabile VAR, simile a "
"@clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2815,7 +2867,7 @@
"\n"
" Inoltre, per le opzioni «--no-ifFORMAT» non processare @ifnotFORMAT.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2830,7 +2882,7 @@
" se è testo, --ifplaintext è attivo e tutti gli altri no;\n"
" se è XML, --ifxml è attivo e tutti gli altri no.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2862,86 +2914,86 @@
"sezioni numerate\n"
" makeinfo --no-split foo.texi scrive in un solo file Info\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: ignora il valore sconosciuto di TEXINFO_OUTPUT_FORMAT («%s»)\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: l'argomento %s deve essere un numero, non «%s».\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: impossibile aprire il file «%s» per l'espansione della macro"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: ignora il secondo argomento «%s» per l'espansione della macro.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: impossibile aprire i collegamenti interni del file «%s»"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: ignora il secondo argomento «%s» per i collegamenti interni.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: l'argomento --paragraph-indent deve essere numerico/«none»/«asis»,
non "
"«%s».\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: l'argomento --footnote-style deve essere «separate» o «end», non
«%s».\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: nome file mancante.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Comandi multiriga %c%s impropriamente usati"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Si aspettava «%s»"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Impossibile creare la directory «%s»: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Nessun «%s» trovato in «%s»"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr "%s: Ignora l'espansione della macro sullo standard output.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Genera %s file «%s» a partire da «%s».\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2949,13 +3001,13 @@
"%s: Rimuovi file delle macro «%s» a causa degli errori; usa --force per "
"presevarlo.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Rimuovi file «%s» a causa degli errori; usa --force per preservarlo.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2964,96 +3016,99 @@
"%s: Rimuovi il file dei collegamenti interni «%s» a causa degli errori; usa
"
"--force per preservarlo.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Comando «%s» sconosciuto"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Usa le parentesi graffe per dare un comando come argomento a @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s si aspettava le parentesi graffe"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "«}» non corrispondente"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "NO_NAME!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s parentesi di chiusura mancante"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "Il file immagine «%s» non è leggibile (per il formato HTML): %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Il file «%s» non esiste"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "Il file immagine «%s» non è leggibile (per il formato testo): %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image non ha riferimento ad alcun file"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "indicatore non definito: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Nessun valore per «%s»}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s richiede un nome"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Raggiunta la fine del file prima del blocco di chiusura @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "«%.40s...» è troppo lungo per l'espansione; non espanso"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "«}» mancante nel modello @multitable"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "ignora il testo vagante «%s» dopo @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Troppe colonne nell'elemento multitabella (max %d)"
@@ -3064,7 +3119,8 @@
msgstr ""
"[inaspettato] impossibile selezionare la colonna #%d nella multitabella"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "ignora @tab fuori della multitabella"
@@ -3104,11 +3160,13 @@
msgstr "Il collegamento «%s» e il nodo «%s» puntano allo stesso file"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
"Questo comando @anchor sarà ignorato; i riferimenti a esso non funzioneranno"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Rinomina questo collegamento o usa l'opzione «--no-split»"
@@ -3123,6 +3181,7 @@
msgstr "I collegamenti «%s» e «%s» puntano allo stesso file"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "comando @anchor ignorato; i riferimenti a esso non funzioneranno"
@@ -3161,16 +3220,16 @@
msgstr ""
"«%s» non ha alcun campo «Up» (forse a causa di un sezionamento errato?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Il nodo «%s» non ha alcuna voce di menù per «%s», nonostante sia
destinata "
"ad «Up»"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "nodo «%s» non referenziato"
@@ -3215,27 +3274,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop usato prima di %cnode, assume %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "file @image «%s» non leggibile: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem come ultimo elemento di @multitable genera documenti Docbook non "
"validi"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "di"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "su"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Il primo argomento di un collegamento non può essere vuoto"
@@ -3245,6 +3308,7 @@
msgstr "Nome del file mancante per il riferimento incrociato HTML «%s»"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Raggiunta la fine del file durante la ricerca di «.» o «,»"
@@ -3254,10 +3318,12 @@
msgstr "«.» o «,» devono seguire @%s, non «%c»"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "per i collegamenti nelle parentesi, usa @pxref"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Il primo argomento di @inforef non dovrebbe essere vuoto"
@@ -3329,14 +3395,14 @@
msgid "%s is not a valid region code"
msgstr "%s non è un codice di lingua valido conforme all'ISO 639"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: l'argomento --footnote-style deve essere «separate» o «end», non
«%s».\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3484,670 +3550,657 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: opzione non riconosciuta «--%s»\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "impossibile creare il file di output «%s»"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Impossibile creare la directory «%s»: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, perl-format
msgid "%s not writable"
msgstr ""
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Cerca un file: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Nodo «%s» definito precedentemente alla riga %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s richiede un nome"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Si aspettava «%s»"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Usa le parentesi graffe per dare un comando come argomento a @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: l'argomento --paragraph-indent deve essere numerico/«none»/«asis»,
non "
"«%s».\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: l'argomento --paragraph-indent deve essere numerico/«none»/«asis»,
non "
"«%s».\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: l'argomento --footnote-style deve essere «separate» o «end», non
«%s».\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Indice «%s» sconosciuto"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Indice «%s» sconosciuto"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: l'argomento %s deve essere un numero, non «%s».\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: l'argomento %s deve essere un numero, non «%s».\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Impossibile creare la directory «%s»: %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Impossibile trovare «%s»."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "nodo «%s» non referenziato"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "nodo «%s» non referenziato"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Indice «%s» già esistente"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Rimuovi file «%s» a causa degli errori; usa --force per preservarlo.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr ""
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: avvertimento: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Carattere «}» assente nella costruzione di address@hidden arg»"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Il collegamento «%s» e il nodo «%s» puntano allo stesso file"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Le note a piè di pagina all'interno di se stesse non sono permesse"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Comando «%s» sconosciuto"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Argomento errato per @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: file vuoto"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "nodo «%s» non referenziato"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Il primo argomento di @inforef non dovrebbe essere vuoto"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s si riferisce al nodo inesistente «%s» (forse a causa di un sezionamento "
"errato?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "file @image «%s» non leggibile: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "La macro «%s» chiamata sulla riga %d contiene troppi argomenti"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ è stato letto nell'espansione della macro seguita da «%s» anziché dal "
"nome del parametro"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "nessuna voce dell'indice trovata per «%s»\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item non permesso come argomento di @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Indice «%s» già esistente"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "macro «%s» già definita precedentemente"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Nessuna parentesi di chiusura per le note a piè di pagina «%s»"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s è obsoleto"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s è obsoleto"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu è stato letto prima del primo @node, creazione del nodo «Top»"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "macro «%s» già definita precedentemente"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s si aspettava le parentesi graffe"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: file vuoto"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "ignora @tab fuori della multitabella"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s si aspettava «i» o «j» come argomento, non «%c»"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Comando «%s» sconosciuto"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Comando «%s» inesistente"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s parentesi di chiusura mancante"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: impossibile aprire --css-file: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "nessuna voce dell'indice trovata per «%s»\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: impossibile aprire --css-file: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "file @image «%s» non leggibile: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "@quote-arg è deprecata; gli argomenti vengono quotati come
predefinito"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Impossibile trovare il nodo «%s»."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Il file immagine «%s» non è leggibile (per il formato HTML): %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Nota...} produce un riferimento falso; riscrivilo per evitare che "
-"non succeda"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "«.» o «,» devono seguire @%s, non «%c»"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "«.» o «,» devono seguire @%s, non «%c»"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu è stato letto prima del primo @node, creazione del nodo «Top»"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu è stato letto prima del primo @node, creazione del nodo «Top»"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu è stato letto prima del primo @node, creazione del nodo «Top»"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "file @image «%s» non leggibile: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "errore durante la scrittura del file «%s»"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Comando «%s» sconosciuto"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Comando «%s» sconosciuto"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "impossibile aprire il file di input «%s»"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: impossibile aprire --css-file: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "@quote-arg è deprecata; gli argomenti vengono quotati come
predefinito"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4200,7 +4253,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Argomento errato per @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Argomento errato per @%s"
@@ -4216,7 +4269,7 @@
msgstr "@item non permesso come argomento di @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: nome file mancante.\n"
@@ -4289,157 +4342,169 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s è privo di significato all'interno del blocco address@hidden"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: impossibile aprire --css-file: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Deve essere nell'ambiente address@hidden per usare address@hidden"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu è stato letto prima del primo @node, creazione del nodo «Top»"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu è stato letto prima del primo @node, creazione del nodo «Top»"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: impossibile aprire --css-file: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Si aspettava «%s»"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s è privo di significato aldifuori dell'ambiente address@hidden"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: nome file mancante.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Argomento errato per @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: l'argomento %s deve essere un numero, non «%s».\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: l'argomento --footnote-style deve essere «separate» o «end», non
«%s».\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Indice «%s» già esistente"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Impossibile creare la directory «%s»: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: impossibile aprire --css-file: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Impossibile creare la directory «%s»: %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Nessun menù in questo nodo."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(non presente in alcun nodo)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Impossibile trovare il nodo «%s»."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "«.» o «,» devono seguire @%s, non «%c»"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "«.» o «,» devono seguire @%s, non «%c»"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "file @image «%s» non leggibile: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Impossibile trovare il nodo «%s»."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Nota...} produce un riferimento falso; riscrivilo per evitare che "
+#~ "non succeda"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "«.» o «,» devono seguire @%s, non «%c»"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: avvertimento: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Indice «%s» già esistente"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: opzione non lecita -- %c\n"
Index: po/ja.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/ja.po,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -b -r1.66 -r1.67
--- po/ja.po 20 Mar 2011 21:20:27 -0000 1.66
+++ po/ja.po 9 Apr 2011 00:10:39 -0000 1.67
@@ -12,7 +12,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.13\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2010-10-20 15:13+0900\n"
"Last-Translator: Yasuaki Taniguchi <address@hidden>\n"
"Language-Team: Japanese <address@hidden>\n"
@@ -87,11 +87,11 @@
msgid "memory exhausted"
msgstr "ã¡ã¢ãªã使ãæããã¾ãã"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "ä¸æååé²ãã"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "ä¸æååæ»ã"
@@ -103,11 +103,11 @@
msgid "Move to the end of this line"
msgstr "è¡æ«ã«ç§»å"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "åèªä¸ã¤åé²ãã"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "åèªä¸ã¤åæ»ã"
@@ -188,6 +188,7 @@
msgstr "è£å®ãçµãè¾¼ã¿ã¾ãã"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "1 ã¤ã®è£å®:\n"
@@ -201,6 +202,7 @@
msgstr "è£å®ãæ¿å
¥"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "è£å®ãªã¹ããä½æä¸..."
@@ -225,10 +227,12 @@
msgstr "ãã®ãã¡ã¤ã«ã®è¦åºãããæååãæ¤ç´¢ãã"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "è¦åºãé
ç®ãè¦ã¤ãã¦ãã¾ã"
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "é
ç®ãè¦ã¤ããã¾ãã"
@@ -242,10 +246,12 @@
msgstr "ç´åã® `\\[index-search]'
ã³ãã³ãã¨ä¸è´ããè¦åºãã¢ã¤ãã ã辿ã"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "åã®è¦åºãæ¤ç´¢æååãããã¾ãã"
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "è¦åºãé
ç®ãããã¾ãã"
@@ -295,13 +301,13 @@
"\n"
"* ã¡ãã¥ã¼: `%s' ãå«ãè¦åºãé
ç®:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "詳ãã㯠--help ãªãã·ã§ã³ã試ãã¦ã¿ã¦ãã ããã\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -316,12 +322,12 @@
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "`%s' ã«å¯¾ããé
ç®ãè¦ã¤ããã¾ãã\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -332,7 +338,7 @@
"\n"
"Info å½¢å¼ã®ããã¥ã¡ã³ããèªãã\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -348,7 +354,7 @@
" --dribble=ãã¡ã¤ã«å ã¦ã¼ã¶ã¼ãã¼å
¥åã`ãã¡ã¤ã«å'ã«ä¿åããã\n"
" -f, --file=FILENAME åç
§ãã Info
ãã¡ã¤ã«ãæå®ããã"
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -361,7 +367,7 @@
" æå®ããã\n"
" -o, --output=ãã¡ã¤ã«å
é¸æãããã¼ãã`ãã¡ã¤ã«å'ã«åºåããã"
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -375,11 +381,11 @@
" -O, --show-options, --usage
ã³ãã³ãã©ã¤ã³ãªãã·ã§ã³ã表示ãããã¼ãã«ç§»å"
"ããã"
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly
é³å£°åæå¨ã«å¯¾ãã親åæ§ãé«ããã"
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -394,7 +400,7 @@
" --version ãã¼ã¸ã§ã³æ
å
±ã表示ãã¦çµäºããã\n"
" -w, --where, --location
Infoãã¡ã¤ã«ã®ç©ççä½ç½®ã表示ããã"
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -410,7 +416,7 @@
"ã¦è¡¨ç¤ºãã¾ããæ®ãã®å¼æ°å
¨ã¦ã¯åç
§ãããåæãã¼ãã®ç¸å¯¾çãªã¡ãã¥ã¼\n"
"é
ç®ã®ååã¨ãã¦æ±ããã¾ãã"
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -418,7 +424,7 @@
"\n"
"ãã¼è¨å®ã®è¦ç´ã«ã¤ãã¦ã¯ Info å
㧠h ãå
¥åãã¦ãã
ããã"
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -432,7 +438,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -445,72 +451,72 @@
"ä¸è¬çãªè³ªåãè°è«ã¯ address@hidden ã¾ã§ã\n"
"Texinfo ãã¼ã ãã¼ã¸: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "`%s' ãã¼ããè¦ã¤ããã¾ããã"
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "`(%s)%s' ãã¼ããè¦ã¤ããã¾ãã"
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "ã¦ã£ã³ãã¦ãè¦ã¤ããã¾ãã"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "ãã®ã¦ã£ã³ãã¦ãã¼ãå
ã«ãã¤ã³ããç¾ãã¾ããï¼"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "æå¾ã®ã¦ã£ã³ãã¦ã¯åé¤ã§ãã¾ãã"
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "ãã®ãã¼ãã«ã¡ãã¥ã¼ã¯ããã¾ããã"
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "ãã®ãã¼ãã«è注ã¯ããã¾ããã"
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "ãã®ãã¼ãã«ç¸äºåç
§ã¯ããã¾ããã"
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "ãã®ãã¼ãã® `%s' ãã¤ã³ã¿ãããã¾ããã"
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "æªç¥ã® Info ã³ãã³ã `%c' -- `?' ã§ãã«ããè¦ã¦ãã
ããã"
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "端æ«ã¿ã¤ã `%s' 㯠Info
ãåãããã»ã©å©å£ã§ã¯ããã¾ãã"
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "ããã¯ããããã®ãã¼ãã®æçµãã¼ã¸ã§ãã"
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "ããã¯ããããã®ãã¼ãã®æåã®ãã¼ã¸ã§ãã"
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "å¯ä¸ã®ã¦ã£ã³ãã¦ã"
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "çµæã¦ã£ã³ãã¦ãå°ããããæ§ã§ã"
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ""
"ãã«ãã¦ã£ã³ãã¦ç¨ã®å
´æã足ãã¾ãããã¦ã£ã³ãã¦ãä¸ã¤åé¤ãã¦ãã ããã"
@@ -814,16 +820,19 @@
" 次ã«ä¸è´ããæååãè¦ã¤ãã£ãå
´åã¯ãã¼ããé¸æããã\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "ç¾å¨ã®æ¤ç´¢ãã¹:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
msgstr "Info ã¦ã£ã³ãã¦ã§å©ç¨å¯è½ãªã³ãã³ã:\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -839,6 +848,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -846,62 +856,62 @@
"以ä¸ã®ã³ãã³ãã¯ãå
¨ãèµ·åããäºãã§ãã¾ãã:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "使ãæ¹ã表示ãã"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "`(info)Help' ãã¼ãã«ç§»åãã"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "ãã¼æä½ã表示ãã"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "ãã¼ã®èª¬æ: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s ã¯å®ç¾©ããã¦ãã¾ããã"
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s ã¯å®ç¾©ããã¦ãã¾ãã"
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s 㯠%s ã«å®ç¾©ããã¦ãã¾ãã"
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr
"ä¸ããããã³ãã³ããå®è¡ããã®ã«ãä½ãã¿ã¤ããããã表示ãã"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "ã©ã®ã³ãã³ã: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' ã¯ãã¼å²ãå½ã¦ããã¦ãã¾ãã"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s 㯠%s ãéãã¦ã®ã¿å¼ã³åºãã¾ãã"
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s 㯠%s ãéãã¦å¼ã³åºãã¾ã"
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "`%s' ã¨ããæ©è½ã¯ããã¾ãã"
@@ -914,91 +924,102 @@
"ä»ã®ãã¼ããé¸æãã:\n"
"----------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "å¼æ°ã®æ°åãééã£ã¦ãã¾ã"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "å
¥åãã¡ã¤ã« `%s' ãéãã¾ãã"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "åºåãã¡ã¤ã« `%s' ãä½æã§ãã¾ãã"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "`%s' ã¸ã®æ¸ãè¾¼ã¿ä¸ã®ã¨ã©ã¼"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "åºåãã¡ã¤ã« `%s' ãéããéã®ã¨ã©ã¼"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "ãã¼å
¥ååãé·ããã¾ã"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "ãã¼å
¥ååãæ¬ ãã¦ãã¾ã"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL æå (\\000) ã¯ä½¿ãã¾ãã"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NUL æå (^%c) ã¯ä½¿ãã¾ãã"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "ã¢ã¯ã·ã§ã³åãæ¬ ãã¦ãã¾ã"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "ã»ã¯ã·ã§ã³ãé·ããã¾ã"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "ä¸æãªã¢ã¯ã·ã§ã³ `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "ã¢ã¯ã·ã§ã³åãé·ããã¾ã"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "ã¢ã¯ã·ã§ã³ `%s' ã«ä½åãªæåãç¶ãã¦ãã¾ã"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "å¤æ°åãæ¬ ãã¦ãã¾ã"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "å¤æ°åã®ç´å¾ã® `=' ãæ¬ ãã¦ãã¾ã"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "å¤æ°åãé·ããã¾ã"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "å¤ãé·ããã¾ã"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", %u è¡ç®: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1058,12 +1079,14 @@
"å®è¡ãã¦æ´æ°ãã¾ããã"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"infokey ãã¡ã¤ã«ã«ä¸æ£ãªãã¼ã¿ãããã¾ã --
å¹¾ã¤ãã®ãã¼ãã¤ã³ããç¡è¦ããã¾"
"ãã"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"infokey ãã¡ã¤ã«ã«ä¸æ£ãªãã¼ã¿ãããã¾ã --
å¹¾ã¤ãã®å¤æ°è¨å®ãç¡è¦ããã¾ãã"
@@ -1081,6 +1104,7 @@
msgstr "ã¨ã³ã¼é åã§ã³ãã³ãåãèªã¿ãå®è¡ãã"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "ããã§ã¯ `echo-area' ã³ãã³ããå®è¡ã§ãã¾ããã"
@@ -1146,7 +1170,7 @@
msgid "Select visited node: "
msgstr "訪ãããã¼ããé¸æ: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "ãã®åç
§ã¯æ¶ãã¾ãã! (%s)ã"
@@ -1156,7 +1180,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1165,78 +1189,81 @@
"Info ãã¼ã¸ã§ã³ %s ã«ããããã\\[get-help-window]
ã§ä½¿ãæ¹ã\\[menu-item] ã§"
"ã¡ãã¥ã¼é
ç®ãå¼ã³åºãã¾ãã"
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "次ã®è¡ã«ç§»å"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "åã®è¡ã«ç§»å"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "è¡æ«ã«ç§»å"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "è¡é ã«ç§»å"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "次"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr
"ãã®ããã¥ã¡ã³ãã«ã¯ããã以ä¸ã®ãã¼ãã¯ããã¾ããã"
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "ãã®ãã¼ãã® `å' ã¯ããã¾ããã"
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "ãã®ããã¥ã¡ã³ãã§ã¯ããã®ãã¼ãã® `å' ã `ä¸'
ã¯ããã¾ããã"
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "ãã¼ãæ§é ãéãã¦é²ãããä¸ãã£ãããã"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "ãã¼ãæ§é ãéãã¦æ»ã£ããä¸ãã£ãããã"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "ãã®ã¦ã£ã³ãã¦ãã¹ã¯ãã¼ã«ãã¦ã³"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr
"ãã®ã¦ã£ã³ãã¦ãã¹ã¯ãã¼ã«ããããã©ã«ãã¦ã£ã³ãã¦ãµã¤ãºãè¨å®"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "ãã®ã¦ã£ã³ãã¦ããã¼ãç¯å²å
ã§åæ¹ã¹ã¯ãã¼ã«"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"ãã®ã¦ã£ã³ãã¦ããã¼ãç¯å²å
ã§åæ¹ã¹ã¯ãã¼ã«ããããã©ã«ãã¦ã£ã³ãã¦ãµã¤ãºã"
"è¨å®"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "ãã®ã¦ã£ã³ãã¦ãéã¹ã¯ãã¼ã«"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr
"ãã®ã¦ã£ã³ãã¦ãéã¹ã¯ãã¼ã«ããããã©ã«ãã¦ã£ã³ãã¦ãµã¤ãºãè¨å®"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "ãã®ã¦ã£ã³ãã¦ããã¼ãç¯å²å
ã§å¾æ¹ã¹ã¯ãã¼ã«"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1244,422 +1271,431 @@
"ãã®ã¦ã£ã³ãã¦ããã¼ãç¯å²å
ã§å¾æ¹ã¹ã¯ãã¼ã«ããããã©ã«ãã¦ã£ã³ãã¦ãµã¤ãºã"
"è¨å®"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "ãã®ãã¼ãã®æåã«ç§»å"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "ãã®ãã¼ãã®æå¾ã«ç§»å"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "è¡æ°ã«ããã¹ã¯ãã¼ã«"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "è¡æ°ã«ããéã¹ã¯ãã¼ã«"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "ç»é¢ãµã¤ãºã®ååã¹ã¯ãã¼ã«"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "ç»é¢ãµã¤ãºã®ååéã¹ã¯ãã¼ã«"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "次ã®ã¦ã£ã³ãã¦ãé¸æ"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "åã®ã¦ã£ã³ãã¦ãé¸æ"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "ç¾å¨ã®ã¦ã£ã³ãã¦ãåå²"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "ç¾å¨ã®ã¦ã£ã³ãã¦ãåé¤"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "æ°¸ä¹
ã¦ã£ã³ãã¦ã¯åé¤ã§ãã¾ãã"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "ä»ã®ã¦ã£ã³ãã¦ãåé¤"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "ä»ã®ã¦ã£ã³ãã¦ãã¹ã¯ãã¼ã«"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "ä»ã®ã¦ã£ã³ãã¦ãéã¹ã¯ãã¼ã«"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "ãã®ã¦ã£ã³ãã¦ã大ãããã(ã¾ãã¯å°ãããã)"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr
"å¯è¦ã¦ã£ã³ãã¦ã®å©ç¨å¯è½ã¹ã¯ãªã¼ã³ç©ºéãåå²ãã"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "ç¾å¨ã®ã¦ã£ã³ãã¦ã«ç¦åå¦çãæ½ã"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "次 ãã¼ããé¸æ"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "å ãã¼ããé¸æ"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "ä¸ ãã¼ããé¸æ"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "ãã®ãã¡ã¤ã«ã®æå¾ã®ãã¼ããé¸æ"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "ãã®ã¦ã£ã³ãã¦ã«ã¯ãã¼ããä»ãã¦ãã¾ãã"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "ãã®ãã¡ã¤ã«ã®æåã®ãã¼ããé¸æ"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "ãã®ãã¼ãã®ã¡ãã¥ã¼å
ã§ã®æå¾ã®é
ç®ãé¸æ"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "ãã®ã¡ãã¥ã¼é
ç®ãé¸æ"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "ãã®ã¡ãã¥ã¼ã« %d åã®é
ç®ãããã¾ããã"
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "ã¡ãã¥ã¼é
ç® (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "ã¡ãã¥ã¼é
ç®: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "åç
§å
(%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "åç
§å
: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "ã¡ãã¥ã¼ãèªãã§ããã®ãã¼ããé¸æãã"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "è注ãç¸äºåç
§ãèªãã§ããã®ãã¼ããé¸æãã"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "ãã®ãã¼ãã¡ãã¥ã¼ã®å
é ã«ç§»åãã"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "å¯è½ãªéãå¤ãã®ã¡ãã¥ã¼é
ç®ã¸ä¸åº¦ã«è¨ªãã"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "ãã¼ãåãèªãã§ãé¸æãã"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "ãã¼ãã¸ç§»å: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "ãã¼ã `%s' ã«ã¡ãã¥ã¼ãããã¾ããã"
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "ã¡ãã¥ã¼ã¢ã¤ãã `%s' ã¯ãã¼ã `%s'
ä¸ã«ã¯ããã¾ãã"
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "`%s' ããåç
§ããã¦ãããã¼ããè¦ã¤ãããã¾ãã(`%s' ä¸)"
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "dir ããã¡ãã¥ã¼éå§ãªã¹ããèªã¿ãããã辿ã"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "ã¡ãã¥ã¼ã«ç¶ã: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "ããã°ã©ã èµ·åã«é¢ãã説æã®ãã¼ããè¦ã¤ãã"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "[%s] ã®èµ·åãã¼ããè¦ã¤ãã: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "man ãã¼ã¸ã¸ã®åç
§ãèªãã§ãé¸æãã"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Man ãã¼ã¸ã表示: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "ãã®ãã¡ã¤ã«ã® `å
é ' ãã¼ããé¸æ"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "`(dir)'ãã¼ããé¸æãã"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "ãã¼ãã®åãåã (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "`%s' ãã¼ããåãåãã¾ãã"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "æå¾ã®ãã¼ãã¯åãåãã¾ãã"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "æå¾ã«é¸æããããã¼ããé¸æãã"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "ãã®ãã¼ããåãåã"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "ãã¡ã¤ã«åãèªãã§é¸æãã"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "ãã¡ã¤ã«ãè¦ã¤ãã: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "`%s' ãè¦ã¤ãããã¾ããã"
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "åºåãã¡ã¤ã« `%s' ãä½æã§ãã¾ããã"
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "å®äºã"
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "ãã¼ã %s ã®æ¸ãè¾¼ã¿..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "INFO_PRINT_COMMAND ã«ãã£ã¦ãã®ãã¼ãã®å
容ããã¤ããã"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "`%s' ã¸ã®ãã¤ããéãã¾ããã"
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "ãã¼ã `%s' ãå°å·..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "ææ¸ã®æå¾ããæ¤ç´¢ãç¶ç¶ããã"
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "ææ¸ã®æåããæ¤ç´¢ãç¶ç¶ããã"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "å¯ãã¡ã¤ã« %s ãæ¢ãã¦ãã¾ã ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr
"æååãèªã¿ã大æåå°æåã®åºå¥ãã¤ãã¦æ¤ç´¢ãã"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "æååãèªãã§æ¤ç´¢ãã"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "æååãèªãã§å¾æ¹æ¤ç´¢ãã"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr ""
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "æ£è¦è¡¨ç¾æ¤ç´¢"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " 大æåå°æåã®åºå¥ãã¤ãã¦"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr "å¾æ¹"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "æ¤ç´¢"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "æ¤ç´¢ã«å¤±æã"
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "åä¸æ¹åã§æå¾ã®æ¤ç´¢ãç¹°ãè¿ã"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "åã®æ¤ç´¢æååãããã¾ãã"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "éæ¹åã§æå¾ã®æ¤ç´¢ãç¹°ãè¿ã"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "å
¥åããæååã®å¯¾è©±çãªæ¤ç´¢"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "æ£è¦è¡¨ç¾é次å¾æ¹æ¤ç´¢: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "é次å¾æ¹æ¤ç´¢: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "æ£è¦è¡¨ç¾é次æ¤ç´¢: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "é次æ¤ç´¢: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "失æ "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "åã®ç¸äºåç
§ã«ç§»å"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "次ã®ç¸äºåç
§ã«ç§»å"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "åç
§ã¾ãã¯ããã®è¡ã«ç¾ããã¡ãã¥ã¼é
ç®ãé¸æ"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "ç¾å¨ã®æä½ãä¸æ¢"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "çµäº"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "ã¦ã£ã³ãã¦ã®æå®è¡ã«ã«ã¼ã½ã«ã移å"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "ç»é¢ã®åæç»"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Info ã®ä½¿ç¨ãçµäº"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "ãã®ãã¼ã®å°æåã«ãã¤ã³ããããã³ãã³ããå®è¡"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "ä¸æãªã³ãã³ã (%s)ã"
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" ã¯ç¡å¹ã§ã"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "`%s' ã¯ç¡å¹ã§ã"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "ç¾å¨ã®æ°å¤å¼æ°ã«ãã®æ°å¤ãå ãã"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "ç¾å¨ã®æ°å¤å¼æ°ãéå§(å㯠4 åãã)"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "å
é¨çã« \\[universal-argument] ã«ãã£ã¦å©ç¨ããã¾ã"
@@ -1767,31 +1803,26 @@
msgid " Subfile: %s"
msgstr " å¯ãã¡ã¤ã«: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: è¦å: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tå®å
¨ãª ãªãã·ã§ã³ãªã¹ããå¾ãã«ã¯ `%s --help'
ãå®è¡ãã¦ãã ããã\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "使ç¨æ³: %s [ãªãã·ã§ã³]... [INFOãã¡ã¤ã«
[DIRãã¡ã¤ã«]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1805,7 +1836,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1821,7 +1852,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1836,7 +1867,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1852,14 +1883,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1869,7 +1900,7 @@
"ä¸è¬çãªè³ªåãè°è«ã¯ address@hidden ã¾ã§ã\n"
"Texinfoãã¼ã ãã¼ã¸: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1907,65 +1938,69 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: (%s) ãèªã¿è¾¼ããã¨ãã§ããã(%s)
ãä½æã§ãã¾ããã§ãã\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: 空ã®ãã¡ã¤ã«"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY ã«å¯¾å¿ãã END-INFO-DIR-ENTRY
ãããã¾ãã"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY ã«å¯¾å¿ãã START-INFO-DIR-ENTRY
ãããã¾ãã"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: æ¢ã« dir ãã¡ã¤ã« %s ãããã¾ã\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Info ãã¡ã¤ã«ã¯ä¸åº¦ã ãæå®ãã¦ãã ããã\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "ä½åãªæ£è¦è¡¨ç¾ãæå®ããã¦ãã¾ãã`%s'
ãç¡è¦ãã¾ã"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "æ£è¦è¡¨ç¾ `%s' ã«ã¨ã©ã¼ãããã¾ã: %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "ã³ãã³ãã©ã¤ã³å¼æ°ãå¤ããã¾ã `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"å
¥åãã¡ã¤ã«ãæå®ããã¦ãã¾ãã -- 詳ãã㯠--help
ä»ã§å®è¡ãã¦ãã ããã"
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"dir ãã¡ã¤ã«ãæå®ããã¦ãã¾ãã -- 詳ãã㯠--help
ä»ã§å®è¡ãã¦ä¸ããã"
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "`%s' ã« Info dir ç¨ã®é
ç®ãããã¾ãã"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "`%s' é
ç®ãè¦ã¤ããã¾ãã --
ä½ãåé¤ãã¾ããã§ãã"
@@ -2037,6 +2072,7 @@
msgstr "@var ã§ä½¿ãããã«ãªãæå %c"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "å
¨ã¦å¤§æåã® @sc å¼æ°ãå¾ã£ã¦å¹æãããã¾ãã"
@@ -2046,6 +2082,7 @@
msgstr "`{' ãããã¯ãã§ããã`%c' ã§ãã"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "verb ãããã¯å
ã§ãã¡ã¤ã«æ«å°¾ã¨ãªãã¾ãã"
@@ -2054,7 +2091,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "`}' ãããã¯ãã§ããã`%c' ã§ãã"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2065,7 +2104,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s ã¯å»ããå½ä»¤ã§ã"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp ã«ã¯ `%s'
ã§ã¯ãªããæ£ã®æ°å¤ãä¸ããªããã°ãªãã¾ãã"
@@ -2075,17 +2114,17 @@
msgid "Bad argument to %c%s"
msgstr "%c%s ã«å¯¾ããä¸æ£ãªå¼æ°"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "ãã®ã¾ã¾"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "ãªã"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "@%s ã«å¯¾ãã誤ã£ãå¼æ°ã§ã"
@@ -2094,32 +2133,33 @@
msgid "insert"
msgstr "æ¿å
¥"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "@%s ã«å¯¾ãã誤ã£ãå¼æ°ã§ã: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "@def å¼æ°ã« `}' ãå¿ãã¦ãã¾ã"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "address@hidden' ã使ç¨ããããã«ã¯ address@hidden'
ç°å¢ã§ãªããã°ããã¾ãã"
@@ -2140,10 +2180,11 @@
msgstr ""
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr ""
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2163,11 +2204,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "è注 `%s' ã®éããã¬ã¼ã¹ãããã¾ãã"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "è注ã«è¦ªãã¼ãã®å®ç¾©ãããã¾ãã"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "è注ã«è注ãå«ãããã¨ã¯ã§ãã¾ãã"
@@ -2180,21 +2223,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: --css-file %s ãéããã¨ãã§ãã¾ãã"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file ãã³ã¡ã³ãå
ã§çµäºãã¦ãã¾ã"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[unexpected] ãããã¢ãããã html ã¿ã°ãããã¾ãã"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[unexpected] ç¡å¹ãªãã¼ãå: `%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "ä¸æãªã¤ã³ããã¯ã¹ `%s'"
@@ -2223,14 +2267,14 @@
msgid "(line %*d)"
msgstr "(è¡ %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "@printindex ã«ä¸æãªè¦åºã `%s' ãããã¾ã"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "è¦åºã `%s' ã®ã¨ã³ããªã¯ãããããã¼ãã®å¤å´ã§ã"
@@ -2240,6 +2284,7 @@
msgstr "(ãããããã¼ãã®å¤å´)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@itemize ã®å¼æ°ã¨ã㦠@item ã¯è¨±å¯ããã¦ãã¾ãã"
@@ -2248,6 +2293,7 @@
msgstr "insertion_type_pname ä¸ã«å£ããåãããã¾ã"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "åæç¨ã¹ã¿ãã¯ããªã¼ãããã¼ãã¾ãã"
@@ -2256,7 +2302,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "ã©ãã«æåããªã¼ãã¼ããã¼ã%c ã«æ»ãã¾ã"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2267,14 +2313,14 @@
msgid "%cfloat environments cannot be nested"
msgstr ""
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden' ã«ã¯ `%s' ãå¿
è¦ã§ããã`%s'
ãè¦ã¤ããã¾ãã"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2286,30 +2332,34 @@
msgstr "%s ã«ã¯è±æ°æåãå¿
è¦ã§ã"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "verbatim ãããã¯ä¸ã§ãã¡ã¤ã«ã®æ«å°¾ã¨ãªãã¾ãã"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "address@hidden' ç°å¢ã®å¤å´ã§ã¯ @%s ã¯æå³ãããã¾ãã"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu ãæåã® @node 以åã«ç¾ãã¾ããã`Top'
ãã¼ããã¤ããã¾ã"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "å¤å @top ãã¼ã㯠@ifinfo ãã㯠@ifnottex
ã«è¦ãããã¹ãã§ã¯ï¼"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu ãæåã®ãã¼ã以åã«ç¾ãã¾ããã`é ç¹'
ãã¼ããä½ãã¾ã"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2319,9 +2369,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "address@hidden' ç°å¢ã®å¤å´ã§ã¯ @%s ã¯æå³ãããã¾ãã"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2332,14 +2382,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s' ã®å¾ãã«ã¯ä½ããå¿
è¦ã§ã"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "address@hidden' ã«å¯¾ããä¸æ£ãªå¼æ° `%1$s'ã`%3$s'
ã使ãã¾ã"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "address@hidden' ãããã¯ã®å
å´ã§ã¯ address@hidden'
ã¯æå³ãããã¾ãã"
@@ -2384,17 +2434,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s 㯠`%c' ã§ã¯ãªãã`i' ã `j' ãå¼æ°ã¨ãã¦å¿
è¦ã¨ãã¾ã"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s ã¯å¼æ°ã¨ã㦠`i' ã `j' ã®ããããä¸æåãå¿
è¦ã§ã"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "ãã¯ã `%s' ã¯ä»¥åã«å®ç¾©ããã¦ãã¾ã"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ããã¯ã`%s' ã®åã®å®ç¾©ã§ã"
@@ -2409,53 +2459,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "ãã¯ã `%s' å¼ã³åºã(%dè¡ç®)ã®å¼æ°ãå¤ããã¾ã"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend ãã¯ããè¦ã¤ããã¾ãã"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion address@hidden ã代ããã«ä½¿ç¨ãã¦ãã
ãã"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@%2$s ã¨ä¸è´ããªã @end %1$s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "ã¨ã©ã¼ãå¤ããã¾ã! 諦ãã¾ããã\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: è¦å: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "ééã£ãä½ç½®ã« %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "詳ãã㯠`%s --help' ãå®è¡ãã¦ãã ããã\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "使ãæ¹: %s [ãªãã·ã§ã³]... TEXINFOãã¡ã¤ã«...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2463,7 +2515,7 @@
"Texinfo ã½ã¼ã¹ææ¸ãæ§ã
ãªå½¢å¼ã§èªããããã«å¤æãã¾ããããã©ã«ãã§ã¯\n"
"ãªã³ã©ã¤ã³ã§ Emacs ãåç¬ã® GNU Info ã§èªãã®ã«é©ãã Info
ãã¡ã¤ã«ã§ãã\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2490,7 +2542,7 @@
" -v, --verbose è¡ãªãããäºã説æããã\n"
" --version ãã¼ã¸ã§ã³æ
å
±ã表示ãã¦çµäºããã\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2505,7 +2557,7 @@
" --xml Info ã§ã¯ãªãTexinfo XML
ãåºåããã\n"
" --plaintext Info
ã§ã¯ãªããã¬ã¼ã³ããã¹ããåºåããã\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2539,7 +2591,7 @@
" -o, --output=FILE FILE ã¸åºåãã (åå² HTML ã®å
´åãã£ã¬ã¯ã"
"ãª)ã\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2579,7 +2631,7 @@
" --split-size=NUM Info ãã¡ã¤ã«ããµã¤ãº NUM
ã§åå²ãã (default "
"%d)ã\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2598,7 +2650,7 @@
" --transliterate-file-names\n"
" ãã¡ã¤ã«åã ASCII
æåå¤æãã¦çæããã\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2613,7 +2665,7 @@
" ãã VAL ã 0 ã®å
´åãç¡è¦ã§ãã空ç½ã¯åãé¤"
"ãããã\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2629,7 +2681,7 @@
" -P DIR @include æ¢ç´¢ãã¹ã®å
é ã« DIR
ãæ¿å
¥ããã\n"
" -U VAR å¤æ° VAR address@hidden ã¨åãã\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2649,7 +2701,7 @@
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
#, fuzzy
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
@@ -2662,7 +2714,7 @@
" HTML ãçæãããªã --ifhtml ãæå¹ã§ä»ã¯ç¡å¹ã§ãã\n"
" Info ããã¬ã¤ã³ãã¯ã¹ããçæãããªã --ifinfo
ãæå¹ã§ä»ã¯ç¡å¹ã§ãã\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2685,87 +2737,87 @@
" makeinfo --number-sections foo.texi ç¯ã«çªå·ãä»ãã Info
ãåºå\n"
" makeinfo --no-split foo.texi 大ããã«é¢ãããä¸ã¤ã® Info
ãåºå\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s å¼æ°ã¯ `%s'
ã§ã¯ãªãã¦ãæ°å¤ã§ãªããã°ãªãã¾ããã\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, fuzzy, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "ãã¯ãæ¡å¼µåºå `%s' ãéãã¾ãã"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, fuzzy, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "ãã¯ãæ¡å¼µåºå `%s' ãéãã¾ãã"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "ãã¯ãæ¡å¼µåºå `%s' ãéãã¾ãã"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent å¼æ°ã¯ `%s' ã§ã¯ãªããæ°å¤/`none'/`asis'
ã§ãªããã°\n"
" ãªãã¾ããã\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style å¼æ°ã¯ `%s' ã§ã¯ãªãã`separate' å㯠`end'
ã§ãªããã°\n"
" ãªãã¾ããã\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: ãã¡ã¤ã«å¼æ°ãå¿ãã¦ãã¾ãã\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr ""
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "ããã§ã¯ `%s' ãè¦æ±ããã¾ã"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "ãã£ã¬ã¯ã㪠`%s' ãä½æã§ãã¾ãã: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "`%2$s' ã« `%1$s' ãè¦ã¤ããã¾ãã"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr "%s: Info
ã®åºåãè¡ãªãã®ã§ããã¯ãæ¡å¼µãæ¨æºåºåã«åºåãã¾ããã\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "`%3$s' ãã %1$s ãã¡ã¤ã« `%2$s' ãä½æãã¾ãã\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2773,14 +2825,14 @@
"%s: ã¨ã©ã¼ã«ããããã¯ãåºåãã¡ã¤ã« `%s'
ãåé¤ãã¾ãã\n"
" -- æ®ãããå ´åã«ã¯ `--force' ãªãã·ã§ã³ã使ã£ã¦ãã
ããã\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: ã¨ã©ã¼ã«ãããåºåãã¡ã¤ã« `%s' ãåé¤ãã¾ãã\n"
" -- æ®ãããå ´åã«ã¯ `--force' ãªãã·ã§ã³ã使ã£ã¦ãã
ããã\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2789,96 +2841,99 @@
"%s: ã¨ã©ã¼ã«ãããåºåãã¡ã¤ã« `%s' ãåé¤ãã¾ãã\n"
" -- æ®ãããå ´åã«ã¯ `--force' ãªãã·ã§ã³ã使ã£ã¦ãã
ããã\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "ä¸æãªã³ãã³ã `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "@%s
ã¸ã®å¼æ°ã¨ãã¦ã³ãã³ããä¸ããã«ã¯ããã¬ã¼ã¹ã使ãã¾ããã"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, fuzzy, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s ã«ã¯ `{...}' ãå¿
è¦ã§ã"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "対å¿ã®ãªã }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "ååãç¡ãï¼"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "éãããã¬ã¼ã¹ã®ãªã %c%s"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image ãã¡ã¤ã« `%s' (HTML ç¨) ãèªãã¾ãã: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, fuzzy, c-format
msgid "No such file `%s'"
msgstr "ãã¼ã `%s' ã«ã¡ãã¥ã¼ãããã¾ããã"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image ãã¡ã¤ã« `%s' (text ç¨) ãèªãã¾ãã: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image ã«ãã¡ã¤ã«åãä¸ãããã¦ãã¾ãã"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "å®ç¾©ããã¦ããªããã©ã°: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{`%s' ã®å¤ããªã}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s ã«ã¯ååãå¿
è¦ã§ã"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "@end %s
ã®å¯¾å¿ã®åã«ãã¡ã¤ã«ã®çµãã«åºãããã¾ãã"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr ""
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "@multitable ãã³ãã¬ã¼ãã« } ãããã¾ãã"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "@multitable ã®å¾ãã®ãã¯ã¹ã `%s' ãç¡è¦ãã¾ã"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "ãã«ããã¼ãã«é
ç®å
ã®ã«ã©ã æ°ãå¤ããã¾ã(æ大
%d)"
@@ -2888,7 +2943,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "ãã«ããã¼ãã«å
ã§ã¯ã第 %d è¡ãé¸æã§ãã¾ãã"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "ãã«ããã¼ãã«ã®å¤å´ã® @tab ãç¡è¦ãã¾ã"
@@ -2928,10 +2984,12 @@
msgstr "ã¢ã³ã«ã¼ `%s' ã¨ãã¼ã `%s'
ãåããã¡ã¤ã«ãããããã¦ãã¾ã"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "ãã® @anchor ã³ãã³ãã¯ç¡è¦ããã¾ã -- ããã¸ã®åç
§ã¯åä½ãã¾ãã"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "ãã®ã¢ã³ã«ã¼åãå¤æ´ããã `--no-split'
ãªãã·ã§ã³ã使ãã¾ããã"
@@ -2946,6 +3004,7 @@
msgstr "ã¢ã³ã«ã¼ `%s' 㨠`%s'
ãåããã¡ã¤ã«åã«ããããã¦ãã¾ã"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "@anchor ã³ãã³ãã¯ç¡è¦ããã¾ã -- ããã¸ã®åç
§ã¯åä½ãã¾ãã"
@@ -2979,15 +3038,15 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr ""
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"ãã¼ã `%s' ã«ã¯ ä¸ä½é
ç®ãããã®ã«ã`%s'
ã¸ã®ã¡ãã¥ã¼ã¢ã¤ãã ãæ¬ ãã¦ãã¾ã"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "åç
§ããã¦ããªããã¼ã `%s'"
@@ -3032,25 +3091,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop ã %cnode ã®åã«ä½¿ããã¾ããã%s
ã«æ±ºããã¡ãã¾ã"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image ãã¡ã¤ã« `%s' ãèªãã¾ãã: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "of"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "on"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "ç¸äºåç
§ã¸ã®ç¬¬ä¸å¼æ°ã空ã§ãã£ã¦ã¯ãªãã¾ãã"
@@ -3060,6 +3123,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3069,10 +3133,12 @@
msgstr "`.' ã ',' 㯠%c ã§ã¯ãªããç¸äºåç
§ã«ç¶ããããªããã°ãªãã¾ãã"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "å°æ¬å¼§å
ã§ã®ç¸äºåç
§ã§ã¯ @pxref ã使ç¨ãã¦ãã
ãã"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "@inforef ã¸ã®ç¬¬ä¸å¼æ°ã¯ç©ºã§ãã£ã¦ã¯ãªãã¾ãã"
@@ -3143,15 +3209,15 @@
msgid "%s is not a valid region code"
msgstr "%s ã¯æå¹ãª ISO 639 è¨èªã³ã¼ãã§ã¯ããã¾ãã"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: --footnote-style å¼æ°ã¯ `%s' ã§ã¯ãªãã`separate' å㯠`end'
ã§ãªããã°\n"
" ãªãã¾ããã\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3290,665 +3356,655 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: `--%s' ã¯èªèã§ããªããªãã·ã§ã³ã§ã\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "åºåãã¡ã¤ã« `%s' ãä½æã§ãã¾ãã"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "ãã£ã¬ã¯ã㪠`%s' ãä½æã§ãã¾ãã: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, perl-format
msgid "%s not writable"
msgstr ""
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "ä¸æãªãã¡ã¤ã«"
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
#, fuzzy
msgid "Superfluous arguments for node"
msgstr "%2$s ã«å¯¾ããå¼æ° %1$s ãææ§ã§ã"
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "ãã¼ã `%s' å(%d è¡ç®)ã«å®ç¾©ããã¦ãã¾ã"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s ã«ã¯ååãå¿
è¦ã§ã"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "ããã§ã¯ `%s' ãè¦æ±ããã¾ã"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "@%s
ã¸ã®å¼æ°ã¨ãã¦ã³ãã³ããä¸ããã«ã¯ããã¬ã¼ã¹ã使ãã¾ããã"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: --paragraph-indent å¼æ°ã¯ `%s' ã§ã¯ãªããæ°å¤/`none'/`asis'
ã§ãªããã°\n"
" ãªãã¾ããã\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent å¼æ°ã¯ `%s' ã§ã¯ãªããæ°å¤/`none'/`asis'
ã§ãªããã°\n"
" ãªãã¾ããã\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: --footnote-style å¼æ°ã¯ `%s' ã§ã¯ãªãã`separate' å㯠`end'
ã§ãªããã°\n"
" ãªãã¾ããã\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "ä¸æãªã¤ã³ããã¯ã¹ `%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "ä¸æãªã¤ã³ããã¯ã¹ `%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s å¼æ°ã¯ `%s'
ã§ã¯ãªãã¦ãæ°å¤ã§ãªããã°ãªãã¾ããã\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s å¼æ°ã¯ `%s'
ã§ã¯ãªãã¦ãæ°å¤ã§ãªããã°ãªãã¾ããã\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "ãã£ã¬ã¯ã㪠`%s' ãä½æã§ãã¾ãã: %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "`%s' ãè¦ã¤ãããã¾ããã"
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "åç
§ããã¦ããªããã¼ã `%s'"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "åç
§ããã¦ããªããã¼ã `%s'"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "è¦åºã `%s' ã¯æ¢ã«åå¨ãã¾ã"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: ã¨ã©ã¼ã«ãããåºåãã¡ã¤ã« `%s' ãåé¤ãã¾ãã\n"
" -- æ®ãããå ´åã«ã¯ `--force' ãªãã·ã§ã³ã使ã£ã¦ãã
ããã\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr ""
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: è¦å: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "@def å¼æ°ã« `}' ãå¿ãã¦ãã¾ã"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "ã¢ã³ã«ã¼ `%s' ã¨ãã¼ã `%s'
ãåããã¡ã¤ã«ãããããã¦ãã¾ã"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "è注ã«è注ãå«ãããã¨ã¯ã§ãã¾ãã"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, fuzzy, perl-format
msgid "column fraction not a number: %s"
msgstr "iconv é¢æ°ã使ãã¾ãã"
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "ä¸æãªã³ãã³ã `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "@%s ã«å¯¾ãã誤ã£ãå¼æ°ã§ã"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: 空ã®ãã¡ã¤ã«"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "åç
§ããã¦ããªããã¼ã `%s'"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "@inforef ã¸ã®ç¬¬ä¸å¼æ°ã¯ç©ºã§ãã£ã¦ã¯ãªãã¾ãã"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s ã¯åå¨ããªããã¼ã `%s' ãåç
§ãã¦ãã¾ã"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image ãã¡ã¤ã« `%s' ãèªãã¾ãã: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "ãã¯ã `%s' å¼ã³åºã(%dè¡ç®)ã®å¼æ°ãå¤ããã¾ã"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "å¾ãã« `%s' ãç¶ããã¯ãå±éå
ã§ãã©ã¡ã¼ã¿åã§ã¯ãªã \\ ãããã¾ã"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "`%s' ã«å¯¾ããé
ç®ãè¦ã¤ããã¾ãã\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@itemize ã®å¼æ°ã¨ã㦠@item ã¯è¨±å¯ããã¦ãã¾ãã"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "è¦åºã `%s' ã¯æ¢ã«åå¨ãã¾ã"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "ãã¯ã `%s' ã¯ä»¥åã«å®ç¾©ããã¦ãã¾ã"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "è注 `%s' ã®éããã¬ã¼ã¹ãããã¾ãã"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s ã¯å»ããå½ä»¤ã§ã"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s ã¯å»ããå½ä»¤ã§ã"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu ãæåã® @node 以åã«ç¾ãã¾ããã`Top'
ãã¼ããã¤ããã¾ã"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "ãã¯ã `%s' ã¯ä»¥åã«å®ç¾©ããã¦ãã¾ã"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s ã«ã¯ `{...}' ãå¿
è¦ã§ã"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: 空ã®ãã¡ã¤ã«"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "ãã«ããã¼ãã«ã®å¤å´ã® @tab ãç¡è¦ãã¾ã"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s 㯠`%c' ã§ã¯ãªãã`i' ã `j' ãå¼æ°ã¨ãã¦å¿
è¦ã¨ãã¾ã"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "ä¸æãªã³ãã³ã `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "æªå®ç¾©ã®ã³ãã³ã: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "éãããã¬ã¼ã¹ã®ãªã %c%s"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr ""
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: --css-file %s ãéããã¨ãã§ãã¾ãã"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "`%s' ã«å¯¾ããé
ç®ãè¦ã¤ããã¾ãã\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: --css-file %s ãéããã¨ãã§ãã¾ãã"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image ãã¡ã¤ã« `%s' ãèªãã¾ãã: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "`%s' ãã¼ããè¦ã¤ããã¾ããã"
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image ãã¡ã¤ã« `%s' (HTML ç¨) ãèªãã¾ãã: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "`.' ã ',' 㯠%c ã§ã¯ãªããç¸äºåç
§ã«ç¶ããããªããã°ãªãã¾ãã"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' ã ',' 㯠%c ã§ã¯ãªããç¸äºåç
§ã«ç¶ããããªããã°ãªãã¾ãã"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu ãæåã® @node 以åã«ç¾ãã¾ããã`Top'
ãã¼ããã¤ããã¾ã"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu ãæåã® @node 以åã«ç¾ãã¾ããã`Top'
ãã¼ããã¤ããã¾ã"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu ãæåã® @node 以åã«ç¾ãã¾ããã`Top'
ãã¼ããã¤ããã¾ã"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image ãã¡ã¤ã« `%s' ãèªãã¾ãã: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "\"%s\"ã®èªè¾¼ã¿ä¸ã«ã¨ã©ã¼ãçºçãã¾ãã"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "ä¸æãªã³ãã³ã `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "ä¸æãªã³ãã³ã `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "å
¥åãã¡ã¤ã« `%s' ãéãã¾ãã"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: --css-file %s ãéããã¨ãã§ãã¾ãã"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -3999,7 +4055,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "@%s ã«å¯¾ãã誤ã£ãå¼æ°ã§ã: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "%2$s ã«å¯¾ããå¼æ° %1$s ãææ§ã§ã"
@@ -4015,7 +4071,7 @@
msgstr "@itemize ã®å¼æ°ã¨ã㦠@item ã¯è¨±å¯ããã¦ãã¾ãã"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: ãã¡ã¤ã«å¼æ°ãå¿ãã¦ãã¾ãã\n"
@@ -4088,158 +4144,162 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "address@hidden' ãããã¯ã®å
å´ã§ã¯ address@hidden'
ã¯æå³ãããã¾ãã"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: --css-file %s ãéããã¨ãã§ãã¾ãã"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "address@hidden' ã使ç¨ããããã«ã¯ address@hidden'
ç°å¢ã§ãªããã°ããã¾ãã"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu ãæåã® @node 以åã«ç¾ãã¾ããã`Top'
ãã¼ããã¤ããã¾ã"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu ãæåã® @node 以åã«ç¾ãã¾ããã`Top'
ãã¼ããã¤ããã¾ã"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: --css-file %s ãéããã¨ãã§ãã¾ãã"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "ããã§ã¯ `%s' ãè¦æ±ããã¾ã"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "address@hidden' ç°å¢ã®å¤å´ã§ã¯ @%s ã¯æå³ãããã¾ãã"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: ãã¡ã¤ã«å¼æ°ãå¿ãã¦ãã¾ãã\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "@%s ã«å¯¾ãã誤ã£ãå¼æ°ã§ã: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s å¼æ°ã¯ `%s'
ã§ã¯ãªãã¦ãæ°å¤ã§ãªããã°ãªãã¾ããã\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: --footnote-style å¼æ°ã¯ `%s' ã§ã¯ãªãã`separate' å㯠`end'
ã§ãªããã°\n"
" ãªãã¾ããã\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "è¦åºã `%s' ã¯æ¢ã«åå¨ãã¾ã"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "ãã£ã¬ã¯ã㪠`%s' ãä½æã§ãã¾ãã: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: --css-file %s ãéããã¨ãã§ãã¾ãã"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "ãã£ã¬ã¯ã㪠`%s' ãä½æã§ãã¾ãã: %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "ãã®ãã¼ãã«ã¡ãã¥ã¼ã¯ããã¾ããã"
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(ãããããã¼ãã®å¤å´)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "`%s' ãã¼ããè¦ã¤ããã¾ããã"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "`.' ã ',' 㯠%c ã§ã¯ãªããç¸äºåç
§ã«ç¶ããããªããã°ãªãã¾ãã"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "`.' ã ',' 㯠%c ã§ã¯ãªããç¸äºåç
§ã«ç¶ããããªããã°ãªãã¾ãã"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image ãã¡ã¤ã« `%s' ãèªãã¾ãã: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "`%s' ãã¼ããè¦ã¤ããã¾ããã"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "`.' ã ',' 㯠%c ã§ã¯ãªããç¸äºåç
§ã«ç¶ããããªããã°ãªãã¾ãã"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: è¦å: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "è¦åºã `%s' ã¯æ¢ã«åå¨ãã¾ã"
+
#~ msgid "%s: option `%s' is ambiguous\n"
#~ msgstr "%s: ãªãã·ã§ã³ `%s' ã¯ææ§ã§ã\n"
Index: po/nb.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/nb.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- po/nb.po 20 Mar 2011 21:20:27 -0000 1.46
+++ po/nb.po 9 Apr 2011 00:10:40 -0000 1.47
@@ -21,7 +21,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.7.90\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2004-12-05 15:37+0100\n"
"Last-Translator: Trond Endrestøl <address@hidden>\n"
"Language-Team: Norwegian Bokmaal <address@hidden>\n"
@@ -95,11 +95,11 @@
msgid "memory exhausted"
msgstr ""
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Flytte forover et tegn"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Flytte bakover et tegn"
@@ -111,11 +111,11 @@
msgid "Move to the end of this line"
msgstr "Flytte til slutten av denne linjen"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Flytte forover et ord"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Flytte tilbake et ord"
@@ -196,6 +196,7 @@
msgstr "Eneste fullføring"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "En fullføring:\n"
@@ -209,6 +210,7 @@
msgstr "Sett inn fullføring"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Bygger fullføringer..."
@@ -233,10 +235,12 @@
msgstr "Lete opp en streng i indeksen til denne filen"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Finner indeksinnslag..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Ingen indekser funnet."
@@ -252,10 +256,12 @@
"kommando"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Ingen tidligere indekssøkestrenger."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Ingen indeksinnslag."
@@ -306,13 +312,13 @@
"\n"
"* Menu: Noder med indekser som inneholder «%s»:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Prøv --help for mer informasjon.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -322,12 +328,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "ingen innslag funnet for «%s»\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -335,7 +341,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -345,7 +351,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -353,7 +359,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -361,13 +367,13 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly vær vennlig ovenfor talesyntetisatorer.\n"
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -377,7 +383,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -387,13 +393,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -407,7 +413,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -420,72 +426,72 @@
"generelle spørsmål og diskusjoner til address@hidden"
"Websida for Texinfo: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Kan ikke finne noden «%s»."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Kan ikke finne noden «(%s)%s»."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Kan ikke finne et vindu!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Markøren vises ikke innen dette vinduets node!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Kan ikke slette det siste vinduet."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Ingen meny i denne noden."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Ingen fotnoter i denne noden."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Ingen kryssreferanser i denne noden."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Ingen «%s»-peker for denne noden."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Ukjent Info-kommando «%c»; prøv «?» for hjelp."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Terminaltypen «%s» er ikke smart nok for å kjøre Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Du er allerede på den siste siden av denne noden."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Du er allerede på den første siden til denne noden."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Bare et vindu."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Resulterende vindu ville blitt for lite."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Ikke nok plass for et hjelpevindu, vennligst slett et vindu."
@@ -827,10 +833,12 @@
" og velge den noden som den neste forekomsten blir funnet i.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Gjeldende søkesti er:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -839,6 +847,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -856,6 +865,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -863,62 +873,62 @@
"Følgende kommandoer kan ikke bli påkallet i det hele tatt:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Vise hjelpemelding"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Vise infonoden «(info)Help»"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Skrive ut dokumentasjonen for KEY"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Beskriv tast: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s er udefinert."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s er udefinert."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s er definert som %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Vise hva som må tastes for å utføre en gitt kommando"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Hvor er kommandoen: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "«%s» er ikke på noen taster"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s kan bare bli påkallet via %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s kan bli påkallet via %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Det finnes ingen funksjon ved navn «%s»"
@@ -932,91 +942,102 @@
"Velger andre noder:\n"
"-------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "unøyaktig antall argumenter"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "Kan ikke åpne inputfilen «%s»"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "Kunne ikke opprette outputfila «%s»"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "feil ved skriving til «%s»"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "Feil ved lukking av outputfila «%s»"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "tastesekvensen er for lang"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "manglende tastesekvens"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NULL-tegn (\\000) er ikke tillatt"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NULL-tegn (^%c) er ikke tillatt"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "manglende handlingsnavn"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "avdeling for lang"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "Ukjent handling «%s»"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "handlingsnavn for langt"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "ekstra tegn følger handlingen «%s»"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "manglende variabelnavn"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "manglende «=» umiddelbart etter variabelnavn"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "variabelnavn for langt"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "verdi for lang"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "«%s», linje %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1084,10 +1105,12 @@
"den"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Feil data i infokeyfil -- noen tastebindinger ble ignorert"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "Feil data i infokeyfil -- noen variabelinnstillinger ble ignorert"
@@ -1104,6 +1127,7 @@
msgstr "Lese et kommandonavn i ekkoområdet og utføre den"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Kan ikke utføre en «echo-area»-kommando her."
@@ -1167,7 +1191,7 @@
msgid "Select visited node: "
msgstr "Velg besøkt node: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Referansen forsvant! (%s)."
@@ -1177,7 +1201,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1186,78 +1210,81 @@
"Velkommen til Info versjon %s. Trykk «\\[get-help-window]» for hjelp,\n"
"«\\[menu-item]» for menypunkt."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Flytte ned til neste linje"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Flytte opp til den forrige linjen"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Flytte til slutten av linjen"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Flytte til starten av linjen"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "neste"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Ingen flere noder i dette dokumentet."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Ingen «forrige» for denne noden."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Ingen «forrige» eller «opp» for denne noden i dette dokumentet."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Flytte forover eller ned gjennom nodestrukturen"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Flytte tilbake eller opp gjennom nodestrukturen"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Rulle forover i dette vinduet"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Rulle forover i dette vinduet og sette standard vindustørrelse"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Rulle forover i dette vinduet, men forbli innenfor noden"
-#: info/session.c:1553
+#: info/session.c:1542
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:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Rulle bakover i dette vinduet"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Rulle bakover i dette vinduet og sette standard vindustørrelse"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Rulle bakover i dette vinduet, men forbli innenfor noden"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1265,430 +1292,439 @@
"Rulle bakover i dette vinduet, forbli innenfor noden og sette standard "
"vindustørrelse"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Flytte til starten av denne noden"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Flytte til slutten av denne noden"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Rulle ned pr. antall linjer"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Rulle opp pr. antall linjer"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Rulle ned en halv side"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Rulle opp en halv side"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Velge neste vindu"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Velge forrige vindu"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Dele gjeldende vindu"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Slette den gjeldende vindu"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Kan ikke slette et permanent vindu"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Slette alle andre vinduer"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Rulle det andre vinduet"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Rulle det andre vinduet bakover"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Øke (eller minke) dette vinduet"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Dele den tilgjengelige skjermplassen mellom de synlige vinduene"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Veksle tilstanden til linjebryting i gjeldende vindu"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Velge neste node"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Velge forrige node"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Velge oppnoden"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Velge den siste noden i denne filen"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Dette vinduet har ingen andre noder"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Velge første node i denne filen"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Velge det siste punktet i nodens meny"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Velge dette menypunktet"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Det er ikke %d punkter i denne menyen."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menypunkt (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menypunkt: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Følge kryssreferanse (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Følge kryssreferanse: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Lese et menyvalg og velge dens node"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Lese en fotnote eller kryssreferanse og velge dens node"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Flytte til starten av denne nodens meny"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Besøke så mange menypunkter som mulig samtidig"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Lese et nodenavn og velge det"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Gå til node: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Ingen meny i noden «%s»."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Ingen menypunkt «%s» i noden «%s»."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Klarte ikke å finne noden referert av «%s» i «%s»."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Lese en liste over menyer fra dir og følge dem"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Følge menyer: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Finne noden som beskriver bruksmåten for programmet"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Finne Invocation-noden til [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Lese en manualside-referanse og velge den"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Hent manualsiden: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Velge «Top»-noden i denne filen"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Velge noden «(dir)»"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Slette noden (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Kan ikke slette noden «%s»"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Kan ikke slette den forrige noden"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Velge den sist valgte noden"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Slette denne noden"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Lese inn navnet på en fil og velge den"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Finne fil: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Kan ikke finne «%s»."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Kunne ikke opprette utskriftsfil «%s»."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Ferdig."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Skriver noden «%s»..."
# I need a better substitute for the verb «to pipe».
# «Å pipe» sounds no good to me.
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "«Pipe» innholdet av denne noden gjennom INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Kan ikke åpne «pipe» til «%s»."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Skriver ut noden «%s»..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "Slette til begynnelsen av linjen"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Søker i delfil «%s»..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr ""
"Lese inn en streng og søke etter den med skille på store og små bokstaver"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Lese inn en streng og søke etter den"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Lese inn en streng og søke bakover etter den"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%setter streng [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr " med skille på store og små bokstaver "
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Søke bakover"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Søke"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Søk mislyktes"
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Gjenta forrige søk i samme retning"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Ingen tidligere søkestreng"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Gjenta forrige søk i motsatt retning"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Søke interaktivt for en streng mens du skriver"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "I-søk bakover: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I-søk bakover: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "I-søk: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I-søk: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Mislyktes "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Flytte til forrige kryssreferanse"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Flytte til neste kryssreferanse"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Velge referanse eller menypunkt på denne linjen"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Avbryte gjeldende operasjon"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Avbrutt"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Flytte markøren til en angitt linje i vinduet"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Tegne skjermen på nytt"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Avslutte Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Kjør kommandoen knyttet til denne tastens «liten-bokstav-variant»"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Ukjent kommando (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "«%s» er ugyldig"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "«%s» er ugyldig"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Legge til dette siffret til det gjeldende numeriske argumentet"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Starte (eller multiplisere med 4) den gjeldende numeriske argumentet"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Brukt internt av \\[universal-argument]"
@@ -1799,31 +1835,26 @@
msgid " Subfile: %s"
msgstr " Delfil: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: advarsel: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " for %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, 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"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1837,7 +1868,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1853,7 +1884,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1868,7 +1899,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1884,14 +1915,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1903,7 +1934,7 @@
"generelle spørsmål og diskusjoner til address@hidden"
"Websida for Texinfo: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1939,63 +1970,67 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kunne ikke lese (%s) og kunne ikke opprette (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: tom fil"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY uten tilhørende END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY uten tilhørende START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: har allerede en dirfil: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Spesifiser infofilen bare en gang.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "overflødig argument på kommandolinjen «%s»"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Ingen innfil angitt; prøv --help for mer informasjon."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Ingen dir-fil angitt; prøv --help for mer informasjon."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "ingen info-dir-oppføring i «%s»"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "fant ingen oppføringer for «%s»; ingenting slettet"
@@ -2067,6 +2102,7 @@
msgstr "usannsynlig tegn %c i @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@sc-argument med store bokstaver, dermed ingen effekt"
@@ -2076,6 +2112,7 @@
msgstr "«{» forventet, men så «%c»"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "slutt-på-fila inne i verb-blokk"
@@ -2084,7 +2121,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "«{» forventet, men så «%c»"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2097,7 +2136,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s er utgått"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp krever et positivt numerisk argument, ikke `%s'"
@@ -2107,17 +2146,17 @@
msgid "Bad argument to %c%s"
msgstr "Ugyldig argument til %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "none"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Ugyldig argument til @%s"
@@ -2126,32 +2165,33 @@
msgid "insert"
msgstr "insert"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Ugyldig argument til @%s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Manglende «}» i @def-arg"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Må være i et address@hidden for å bruke address@hidden"
@@ -2172,10 +2212,11 @@
msgstr "`%s' utelatt pga skriving til stdout"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Outputbuffer er ikke tomt."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2195,11 +2236,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Ingen avsluttende krøllparentes for fotnoten «%s»"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Fotnote definert uten foreldrenode"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Fotnoter i fotnoter er ikke tillatt"
@@ -2212,21 +2255,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: kunne ikke åpne --css-file: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file endte i en kommentar"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[uforventet] kunne ikke poppe neste htmltagg"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[uforventet] ugyldig nodenavn: «%s»"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Ukjent indeks «%s»"
@@ -2255,14 +2299,14 @@
msgid "(line %*d)"
msgstr "(linje %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Ukjent indeks «%s» i @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Innslag for indeksen «%s» utenfor node"
@@ -2272,6 +2316,7 @@
msgstr "(utenfor noder)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item er ikke tillatt som argument til @itemize"
@@ -2280,6 +2325,7 @@
msgstr "Broken-Type i insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Stakkoverflyt ved oppramsing"
@@ -2288,7 +2334,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "bokstavoverflyt, starter på nytt ved %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2299,14 +2345,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "%cfloat-miljøer kan ikke nøstes"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden' forventet «%s», men så «%s»"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2318,31 +2364,35 @@
msgstr "%s krever en bokstav eller et siffer"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "slutt-på-filen inne i verbatimblokk"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s er meningsløs utenfor et address@hidden"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu sett før første @node, oppretter «Top»-noden"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"kanskje burde din @top-node bli pakket inn i @ifnottex istedet for @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu sett før første node, oppretter «Top»-noden"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%s gir ikke mening utenfor address@hidden og address@hidden"
@@ -2352,9 +2402,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s er meningsløs utenfor et address@hidden"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2365,14 +2415,14 @@
msgid "`%c%s' needs something after it"
msgstr "«%c%s» trenger noe etter den"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Ugyldig argument «%s» til «%s», bruker «%s»"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s er meningsløs innenfor en address@hidden"
@@ -2417,17 +2467,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-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"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makroen «%s» er tidligere definert"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "her er den tidligere definisjonen av «%s»"
@@ -2442,53 +2492,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend macro ikke funnet"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "umatchet @end %s med @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "For mange feil! Ga opp.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: advarsel: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Feilplassert %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prøv «%s --help» for mer informasjon.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Bruksmåte: %s [VALG]... TEXINFOFIL...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2496,7 +2548,7 @@
"Oversette Texinfodokumentasjon til forskjellige andre formater:\n"
"Infofiler for lesing online med Emacs eller den frittstående GNU Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, fuzzy, c-format
msgid ""
"General options:\n"
@@ -2521,7 +2573,7 @@
" -v, --verbose forklare hva som blir gjort.\n"
" --version vise programversjon og avslutte.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, fuzzy, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2536,7 +2588,7 @@
" --xml generere Texinfo XML i stedet for Info.\n"
" --plaintext generere ren tekst i stedet for Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
#, fuzzy
msgid ""
"General output options:\n"
@@ -2572,7 +2624,7 @@
" -o, --output=FIL sende output til FIL (eller katalog dersom "
"splittet HTML),\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, fuzzy, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2612,7 +2664,7 @@
" --split-size=ANT splitte Infofilene ved lengde ANT (standard "
"%d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
#, fuzzy
msgid ""
"Options for HTML:\n"
@@ -2627,7 +2679,7 @@
" --css-include=FIL inkluder FIL i HTML <style>-taggen;\n"
" les stdin dersom FIL er -.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, fuzzy, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2642,7 +2694,7 @@
" Dersom ANT er 0, blir ignorerbart tomrom "
"ikke brukt.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2662,7 +2714,7 @@
" -U VAR udefiner variabelen VAR, som om @clear "
"brukes.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2698,7 +2750,7 @@
" --no-iftex ikke behandle @iftex og @tex.\n"
" --no-ifxml ikke behandle @ifxml og @xml.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2712,7 +2764,7 @@
" dersom ren tekst genereres er --ifplaintext påslått og de andre av;\n"
" dersom XML genereres er --ifxml påslått og de andre av.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2739,86 +2791,86 @@
" 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:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Ignorerer ugjenkjennelig TEXINFO_OUTPUT_FORMAT-verdi «%s».\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: kunne ikke åpne makroekspansjonoutput «%s»"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: ignorerer sekundær makroekspansjonoutpur «%s».\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: kunne ikke åpne makroekspansjonoutput «%s»"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: ignorerer sekundær makroekspansjonoutpur «%s».\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: mangler filargument.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Flerlinjekommandoen %c%s brukes ikke riktig"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Forventet «%s»"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Kan ikke opprette katalogen «%s»: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Ingen «%s» funnet i «%s»"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Hopper over makroekspansjon til stdout siden Info-output også sendes "
"dit.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Lager %s-filen «%s» fra «%s».\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2826,14 +2878,14 @@
"%s: Fjerner makroutskriftsfilen «%s» på grunn av feil; bruk --force for å "
"bevare.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å "
"bevare.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2842,96 +2894,99 @@
"%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å "
"bevare.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Ukjent kommando «%s»"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s forventet krøllparanteser"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Umatchet }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "INTET_NAVN!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s mangler avsluttende krøllparentes"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "«%s» er ingen fil"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image-fil «%s» (for tekstformat) er uleselig: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image mangler filnavn"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "udefinert flagg: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Ingen verdi for «%s»}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s krever et navn"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Traff slutt-på-filen før matchende @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' er for lang for ekspansjon; ikke ekspandert"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Manglende «}» i @multitable-mal"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "ignorerer løs tekst «%s» etter @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "For mange kolonner i multitabellrad (maks %d)"
@@ -2941,7 +2996,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[uforventet] kan ikke velge kolonne #%d i multitabell"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "ignorerer @tab utenfor multitabell"
@@ -2981,11 +3037,13 @@
msgstr "Ankeret «%s» og noden «%s» blir knyttet til det samme filnavnet"
#: makeinfo/node.c:922
+#, c-format
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:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Omdøpe dette ankeret eller bruk «--no-split»-valget"
@@ -3000,6 +3058,7 @@
msgstr "Ankrene «%s» og «%s» peker til det samme filnavnet"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "@anchor-kommando ignorert; referanser til den vil ikke virke"
@@ -3035,14 +3094,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "`%s' har ingen Up-felt (kanskje feil inndeling?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Noden «%s» mangler et menypunkt for «%s» selv om den er dens oppmål"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "ureferert node «%s»"
@@ -3087,27 +3146,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop brukt før %cnode, benytter %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-fil «%s» er uleselig: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem som siste punkt i en @multitable fører til uyldige DocBook-"
"dokumenter"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "av"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "på"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -3117,6 +3180,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3126,11 +3190,12 @@
msgstr ""
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Ingen kryssreferanser i denne noden."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -3201,13 +3266,13 @@
msgid "%s is not a valid region code"
msgstr "%s er ikke en gyldig ISO 639-språkkode"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3343,663 +3408,650 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: ukjent valg «--%s»\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "Kunne ikke opprette outputfila «%s»"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Kan ikke opprette katalogen «%s»: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Finne fil: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Noden «%s» er tidligere definert ved linje %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s krever et navn"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Forventet «%s»"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Bruk krøllparenteser for å gi en kommando som et argument til @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent arg må være numerisk/«none»/«asis», ikke «%s».\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Ukjent indeks «%s»"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Ukjent indeks «%s»"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Kan ikke opprette katalogen «%s»: %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Kan ikke finne «%s»."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "ureferert node «%s»"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "ureferert node «%s»"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Indeksen «%s» eksisterer allerede"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Fjerner utskriftsfilen «%s» på grunn av feil; bruk --force for å "
"bevare.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: advarsel: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: advarsel: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(linje %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(linje %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Manglende «}» i @def-arg"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Ankeret «%s» og noden «%s» blir knyttet til det samme filnavnet"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Fotnoter i fotnoter er ikke tillatt"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Ukjent kommando «%s»"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Ugyldig argument til @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "ureferert node «%s»"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "argumentene til @%s ble ignorert"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s referanse til ikke-eksisterende node «%s» (kanskje ugyldig inndeling?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image-fil «%s» er uleselig: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makroen «%s» kalt på linje %d med for mange argumenter"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "\\ i makroekspansjon fulgt av «%s» istedet for parameternavn"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "ingen innslag funnet for «%s»\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item er ikke tillatt som argument til @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Indeksen «%s» eksisterer allerede"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "makroen «%s» er tidligere definert"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Ingen avsluttende krøllparentes for fotnoten «%s»"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s er utgått"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s er utgått"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu sett før første @node, oppretter «Top»-noden"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "makroen «%s» er tidligere definert"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s forventet krøllparanteser"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "ignorerer @tab utenfor multitabell"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s forventer «i» eller «j» som argument, ikke «%c»"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Ukjent kommando «%s»"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "udefinert kommando: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s mangler avsluttende krøllparentes"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s mangler avsluttende krøllparentes"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: kunne ikke åpne --css-file: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "ingen innslag funnet for «%s»\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: kunne ikke åpne --css-file: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image-fil «%s» er uleselig: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Kan ikke finne noden «%s»."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-fil «%s» (for HTML) er uleselig: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Note...} lager en overflødig kryssreferanse i Info; skriv om for å "
-"unngå dette"
-
-#: texi2html/formats/info.init:1352
-msgid "`.' or `,' must follow address@hidden"
+#: texi2html/formats/info.pm:1352
+msgid "`.' or `,' must follow @xref."
msgstr ""
-#: texi2html/formats/info.init:1357
-#, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu sett før første @node, oppretter «Top»-noden"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu sett før første @node, oppretter «Top»-noden"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu sett før første @node, oppretter «Top»-noden"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image-fil «%s» er uleselig: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "feil ved skriving til «%s»"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Ukjent kommando «%s»"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Ukjent kommando «%s»"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "Kan ikke åpne inputfilen «%s»"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: kunne ikke åpne --css-file: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4050,7 +4102,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Ugyldig argument til @%s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Ugyldig argument til @%s"
@@ -4066,7 +4118,7 @@
msgstr "@item er ikke tillatt som argument til @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: mangler filargument.\n"
@@ -4139,155 +4191,163 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s er meningsløs innenfor en address@hidden"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: kunne ikke åpne --css-file: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Må være i et address@hidden for å bruke address@hidden"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu sett før første @node, oppretter «Top»-noden"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu sett før første @node, oppretter «Top»-noden"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: kunne ikke åpne --css-file: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Forventet «%s»"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s er meningsløs utenfor et address@hidden"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: mangler filargument.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Ugyldig argument til @%s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s arg må være numerisk, ikke «%s».\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "%s: --footnote-style arg må være «separate» eller «end», ikke «%s».\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Indeksen «%s» eksisterer allerede"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Kan ikke opprette katalogen «%s»: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: kunne ikke åpne --css-file: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Kan ikke opprette katalogen «%s»: %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Ingen meny i denne noden."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(utenfor noder)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Kan ikke finne noden «%s»."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image-fil «%s» er uleselig: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Kan ikke finne noden «%s»."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Note...} lager en overflødig kryssreferanse i Info; skriv om for "
+#~ "å unngå dette"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: advarsel: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Indeksen «%s» eksisterer allerede"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: ulovlig valg -- %c\n"
Index: po/nl.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/nl.po,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- po/nl.po 20 Mar 2011 21:20:28 -0000 1.76
+++ po/nl.po 9 Apr 2011 00:10:40 -0000 1.77
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: texinfo-4.12.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2008-08-17 23:34+0200\n"
"Last-Translator: Benno Schulenberg <address@hidden>\n"
"Language-Team: Dutch <address@hidden>\n"
@@ -85,11 +85,11 @@
msgid "memory exhausted"
msgstr "onvoldoende geheugen beschikbaar"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Eén teken verder"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Eén teken terug"
@@ -101,11 +101,11 @@
msgid "Move to the end of this line"
msgstr "Naar het einde van de regel"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Eén woord verder"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Eén woord terug"
@@ -186,6 +186,7 @@
msgstr "Enige voltooiing"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Eén mogelijkheid:\n"
@@ -199,6 +200,7 @@
msgstr "Een voltooiing invoegen"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Opbouwen van voltooiingen..."
@@ -224,10 +226,12 @@
msgstr "Een tekenreeks opzoeken in de index van dit bestand"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Zoeken naar index-items..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Geen indexen gevonden."
@@ -243,10 +247,12 @@
"commando"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Geen eerdere index-zoektekenreeks."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Geen index-items."
@@ -296,13 +302,13 @@
"\n"
"* Menu: Pagina's waarvan de indexen '%s' bevatten:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Gebruik '--help' voor meer informatie.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -317,12 +323,12 @@
"zie http://gnu.org/licenses/gpl.html voor de volledige tekst.\n"
"Er is GEEN GARANTIE, voor zover de wet dit toestaat.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "geen index-items gevonden voor '%s'\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -333,7 +339,7 @@
"\n"
"Documentatie in Info-opmaak lezen.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -350,7 +356,7 @@
" --dribble=BESTAND toetsaanslagen in dit bestand opslaan\n"
" -f, --file=BESTAND het te bekijken Info-bestand"
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -363,7 +369,7 @@
" -n, --node=PAGINANAAM een te bezoeken pagina\n"
" -o, --output=BESTAND de gekozen pagina's naar dit bestand schrijven"
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -377,12 +383,12 @@
"lezen\n"
" -O, --show-options, --usage de pagina met de commandoregelopties tonen"
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly uitvoer toesnijden op spraaksynthesizers"
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -398,7 +404,7 @@
" --version versie-informatie tonen en stoppen\n"
" -w, --where, --location het volledige pad van het Info-bestand tonen"
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -415,7 +421,7 @@
"Eventuele overige argumenten worden steeds begrepen als het te kiezen\n"
"menu-item in de op dat moment bereikte pagina."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -423,7 +429,7 @@
"\n"
"Voor een overzicht van de commandotoetsen, typ 'h' in Info."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -453,7 +459,7 @@
"dumpen\n"
" info -f ./foo.info het bestand './foo.info' tonen"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -467,72 +473,72 @@
"en opmerkingen over de vertaling naar <address@hidden>.\n"
"Texinfo-homepagina: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Kan pagina '%s' niet vinden."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Kan pagina '(%s)%s' niet vinden."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Kan geen venster vinden!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Het punt bevindt zich niet in de pagina van dit venster!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Het laatste venster kan niet gesloten worden."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Er is geen menu op deze pagina."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Er zijn geen voetnoten op deze pagina."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Er zijn geen kruisverwijzingen op deze pagina."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Er is geen '%s'-koppeling op deze pagina."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Onbekend Info-commando '%c'; typ '?' voor hulp."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Terminaltype '%s' is niet krachtig genoeg voor Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "U bent al aan het eind van deze pagina."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "U bent al aan het begin van deze pagina."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Slechts één venster."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Het resulterende venster zou te klein zijn."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Niet genoeg ruimte voor een hulp-venster; sluit een venster."
@@ -840,10 +846,12 @@
msgstr " %-10s Achterwaarts zoeken naar een tekenreeks.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Het huidige zoekpad voor Info-bestanden is:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -853,6 +861,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -872,6 +881,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -880,62 +890,62 @@
"===============================================================\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Deze hulptekst tonen"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Naar Info-pagina '(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Uitleg geven over een toets"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Te beschrijven toets: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s is niet gedefinieerd."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s is niet gedefinieerd."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s is gedefinieerd als %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Tonen wat ingetypt moet worden om een gegeven commando uit te voeren"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Waar is het commando: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "'%s' is aan geen enkele toetscombinatie toegekend"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s kan alleen aangeroepen worden via %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s kan aangeroepen worden via %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Er is geen functie met de naam '%s'"
@@ -948,91 +958,102 @@
"Selecteren van andere pagina's:\n"
"-------------------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "onjuist aantal argumenten"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "kan invoerbestand '%s' niet openen"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "kan uitvoerbestand '%s' niet aanmaken"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "fout bij het schrijven naar '%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "fout bij het sluiten van uitvoerbestand '%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "toetsenreeks is te lang"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "ontbrekende toetsenreeks"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-teken (\\000) is niet toegestaan"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NUL-teken (^%c) is niet toegestaan"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "ontbrekende actienaam"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "sectie is te lang"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "onbekende actie '%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "actienaam is te lang"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "extra tekens na actie '%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "ontbrekende naam van variabele"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "ontbrekende '=' na naam van variabele"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "naam van variabele is te lang"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "waarde is te lang"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", regel %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1103,11 +1124,13 @@
"voer 'infokey' uit om het op orde te brengen"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"Foute gegevens in infokey-bestand -- enkele toetstoewijzingen zijn genegeerd"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "Foute gegevens in infokey-bestand -- sommige definities zijn genegeerd"
@@ -1124,6 +1147,7 @@
msgstr "De naam van een commando in de echoregel lezen en deze uitvoeren"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Kan hier geen 'echoregel'-commando uitvoeren."
@@ -1187,7 +1211,7 @@
msgid "Select visited node: "
msgstr "Te selecteren bezochte pagina: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "De verwijzing is verdwenen! (%s)."
@@ -1197,7 +1221,7 @@
msgid "regexp error: %s"
msgstr "fout in reguliere expressie: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1206,503 +1230,515 @@
"Welkom bij Info versie %s. Typ <\\[get-help-window]> voor hulp, "
"<Spatiebalk> om te bladeren."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Naar de volgende regel"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Naar de vorige regel"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Naar het einde van de regel"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Naar het begin van de regel"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Volgende"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Dit is de laatste pagina van dit document."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Er is geen voorgaande pagina op dit niveau."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Dit is de eerste pagina van dit document."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Voorwaarts door alle pagina's van een document bladeren"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Achterwaarts door alle pagina's van een document bladeren"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Verderscrollen in dit venster"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Verderscrollen in dit venster en de venstergrootte instellen"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Binnen de pagina verderscrollen in dit venster"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Binnen de pagina verderscrollen in dit venster en de venstergrootte instellen"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Terugscrollen in dit venster"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Terugscrollen in dit venster en de venstergrootte instellen"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Binnen de pagina terugscrollen in dit venster"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
msgstr ""
"Binnen de pagina terugscrollen in dit venster en de venstergrootte instellen"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Naar het begin van deze pagina"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Naar het einde van deze pagina"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Een aantal regels omlaagscrollen"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Een aantal regels omhoogscrollen"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Een halve pagina omlaagscrollen"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Een halve pagina omhoogscrollen"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Het volgende venster selecteren"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Het vorige venster selecteren"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Het huidige venster splitsen"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Het huidige venster sluiten"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Een permanent venster kan niet gesloten worden."
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Alle andere vensters sluiten"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "In het andere venster verderscrollen"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "In het andere venster terugscrollen"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Dit venster vergroten of verkleinen"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "De beschikbare schermruimte verdelen tussen de zichtbare vensters"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Regelafbreking in het huidige venster omschakelen"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Het gebruik van reguliere expressies bij zoekopdrachten aan-/uitzetten"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Zoeken gebruikt reguliere expressies."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "Zoeken gebruikt letterlijke tekst."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Naar de volgende pagina op dit niveau"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Naar de voorgaande pagina op dit niveau"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Naar de bovenliggende pagina"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Naar de laatste pagina van dit document"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Dit venster heeft geen extra pagina's."
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Naar de eerste pagina van dit document"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Het laatste menu-item op deze pagina selecteren"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Het huidige menu-item selecteren"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Dit menu heeft minder dan %d items."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Te kiezen menu-item (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Te kiezen menu-item: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Te volgen verwijzing (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Te volgen kruisverwijzing: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "De naam van een menu-item lezen en diens pagina selecteren"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr ""
"De naam van een voetnoot of kruisverwijzing lezen en diens pagina selecteren"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Naar het begin van het menu op deze pagina"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Zo veel mogelijk menu-items tegelijk bezoeken"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "De naam van een pagina lezen en deze selecteren"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Te bezoeken pagina: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Er is geen menu in pagina '%s'."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Er is geen menu-item '%s' op pagina '%s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Kan de pagina waarnaar verwezen werd door '%s' niet vinden in '%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Een reeks menu-items lezen en deze vanaf de inhoudspagina volgen"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Te volgen reeks menu-items: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "De pagina zoeken die de aanroepwijze van het programma beschrijft"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Aanroepbeschrijving bekijken van [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Een man-paginaverwijzing lezen en deze selecteren"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Te bekijken man-pagina: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Naar de eerste pagina van dit bestand"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Naar de hoofd-inhoudspagina"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Te sluiten pagina (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Kan pagina '%s' niet sluiten"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Kan niet verder terug dan de eerste pagina."
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Terug naar de laatst geziene pagina"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Deze pagina sluiten"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "De naam van een bestand lezen en deze selecteren"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Te bezoeken bestand: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Kan '%s' niet vinden."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Kan uitvoerbestand '%s' niet aanmaken."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Klaar."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Schrijven van pagina %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "De inhoud van deze pagina doorsluizen naar het INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Kan de pijp naar '%s' niet openen."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Afdrukken van pagina %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "Het zoeken is verdergegaan vanaf het einde."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "Het zoeken is verdergegaan vanaf het begin."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Zoeken naar subbestand %s..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Een tekenreeks lezen en daar hoofdlettergevoelig naar zoeken"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Een tekenreeks lezen en daar naar zoeken"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Een tekenreeks lezen en daar achterwaarts naar zoeken"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [\"%s\"]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Zoeken naar expressie"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " (hooflettergevoelig)"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " (achterwaarts)"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Zoeken"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Niet gevonden."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "De laatste zoekopdracht in dezelfde richting herhalen"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Geen eerdere zoektekenreeks."
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "De laatste zoekopdracht in tegenovergestelde richting herhalen"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Naar een tekenreeks zoeken terwijl u deze intypt"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "Achterwaarts typend-zoeken naar expressie: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "Achterwaarts typend-zoeken: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "Typend-zoeken naar expressie: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "Typend-zoeken: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "*Ongevonden* "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Naar de vorige kruisverwijzing springen"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Naar de volgende kruisverwijzing springen"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "De verwijzing of het menu-item in deze regel volgen"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Huidige operatie annuleren"
# Dit is een reactie op bovenstaande 'Cancel current operation'.
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Geannuleerd"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "De cursor op een bepaalde regel in het venster zetten"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Het venster opnieuw schrijven"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Info afsluiten"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr ""
"Commando uitvoeren dat behoort bij de kleinelettervariant van deze toets"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Onbekend commando (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" is ongeldig"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "'%s' is ongeldig"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Dit cijfer toevoegen aan het huidige numerieke argument"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr ""
"Een nieuw numeriek argument beginnen (of het huidige met 4 vermenigvuldigen)"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Intern gebruikt door \\[universal-argument]"
@@ -1809,33 +1845,28 @@
msgid " Subfile: %s"
msgstr " Subbestand: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: waarschuwing: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " voor %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tTyp '%s --help' voor een volledige lijst van opties.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Gebruik: %s [OPTIE]... [INFO-BESTAND [INHOUDSBESTAND]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
"De items die voorkomen in INFO-BESTAND toevoegen aan of\n"
"verwijderen uit het Info-inhoudsbestand INHOUDSBESTAND."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1860,7 +1891,7 @@
" equivalent aan het argument INHOUDSBESTAND\n"
" --dry-run hetzelfde als '--test'"
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1886,7 +1917,7 @@
"uit\n"
" het gegeven Info-bestand gehaald"
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1912,7 +1943,7 @@
" --no-indent nieuwe items in het inhoudsbestand niet opmaken\n"
" --quiet waarschuwingen onderdrukken"
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1946,7 +1977,7 @@
"gehaald\n"
" --section EXP SEC hetzelfde asl '--regex=EXP --section=SEC --add-once'"
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1956,7 +1987,7 @@
" --test het INHOUDSBESTAND niet bijwerken, slechts doen alsof\n"
" --version versie-informatie tonen en stoppen"
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1967,7 +1998,7 @@
"en opmerkingen over de vertaling naar <address@hidden>.\n"
"Texinfo-homepagina: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2000,63 +2031,67 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kan deze niet lezen (%s) en niet aanmaken (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: is een leeg bestand"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY zonder bijpassende END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY zonder bijpassende START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: hebben al een inhoudsbestand: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Geef het Info-bestand slechts één keer op.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Extra reguliere expressie opgegeven; '%s' wordt genegeerd"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Fout in reguliere expressie '%s': %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "commandoregel-argument '%s' is overbodig"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Geen invoerbestand gegeven; gebruik '--help' voor meer informatie."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Geen inhoudsbestand gegeven; gebruik '--help' voor meer informatie."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "geen Info-inhoudsitem in '%s'"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "geen items voor '%s' gevonden; er is niets verwijderd"
@@ -2128,6 +2163,7 @@
msgstr "onwaarschijnlijk teken '%c' in @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "argument van @sc is in hoofdletters, heeft dus geen effect"
@@ -2137,6 +2173,7 @@
msgstr "'{' werd verwacht, maar '%c' gevonden"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "einde van bestand in een \"verb\"-blok"
@@ -2145,7 +2182,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "'}' werd verwacht, maar '%c' gevonden"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2158,7 +2197,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s is verouderd"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp vereist een postief numeriek argument, niet '%s'"
@@ -2168,17 +2207,17 @@
msgid "Bad argument to %c%s"
msgstr "Fout argument van %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "none"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Fout argument van @%s"
@@ -2187,32 +2226,33 @@
msgid "insert"
msgstr "invoegen"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Fout argument van @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "@%s 'on' of 'off' werd verwacht, niet '%s'"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Bij @%s is alleen 10 of 11 mogelijk, niet '%s'"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Ontbrekende '}' in het argument van @def"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Moet in een '@%s'-omgeving zitten om '@%s' te kunnen gebruiken"
@@ -2233,10 +2273,11 @@
msgstr "'%s' wordt weggelaten vanwege het schrijven naar standaarduitvoer"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Uitvoerbuffer is niet leeg."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "Het gevraagde drijvendekommatype '%s' werd niet eerder gebruikt"
@@ -2256,11 +2297,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Ontbrekende sluitaccolade voor voetnoot '%s'"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Voetnoot gedefinieerd zonder referentiepagina"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Voetnoten binnen een voetnoot zijn niet toegestaan"
@@ -2273,21 +2316,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: kan '--css'-bestand '%s' niet openen"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: '--css'-bestand eindigt in commentaar"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[onverwacht] geen html-tag aanwezig"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[onverwacht] ongeldige paginanaam: '%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Onbekende index '%s'"
@@ -2316,14 +2360,14 @@
msgid "(line %*d)"
msgstr "(regel %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Onbekende index '%s' in @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Item voor index '%s' valt buiten elke pagina"
@@ -2333,6 +2377,7 @@
msgstr "(buiten alle pagina's)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item niet toegestaan in argument van @itemize"
@@ -2342,6 +2387,7 @@
"**Interne fout**: niet-bestaande uitvoersoort in insertion_type_pname()"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Overloop van enumeratiestapel"
@@ -2351,7 +2397,7 @@
msgstr "de letters zijn op; herbegonnen bij %c"
# FIXME: formatter?
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2362,14 +2408,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "%cfloat-omgevingen kunnen niet genest worden"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "'@end' verwachtte '%s', maar vond '%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2381,20 +2427,23 @@
msgstr "%s vereist een letter of cijfer"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "einde van bestand binnen een verbatim blok"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s is niet zinvol buiten een '@float'-omgeving"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu gevonden vóór de eerste @node; aanmaken van Top-pagina"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
@@ -2402,11 +2451,12 @@
"@ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu gevonden voor de eerste pagina; aanmaken van Top-pagina"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%s is niet zinvol buiten '@titlepage'- en '@quotation'-omgevingen"
@@ -2416,9 +2466,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s is niet zinvol buiten '@titlepage'-omgeving"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2429,14 +2479,14 @@
msgid "`%c%s' needs something after it"
msgstr "'%c%s' vereist een argument"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Verkeerd argument '%s' van '@%s'; '%s' wordt gebruikt"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s is zinloos in een '@%s'-blok"
@@ -2481,17 +2531,17 @@
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:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s verwacht één enkele 'i' of 'j' als argument"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro '%s' is al eerder gedefinieerd"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "hier was de eerdere definitie van '%s'"
@@ -2507,53 +2557,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Macro '%s' in regel %d wordt aangeroepen met te veel argumenten"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend-macro niet gevonden"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion is verouderd; gebruik @rmacro"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "@quote-arg is verouderd; argumenten hebben standaard aanhalingstekens"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@end %s komt niet overeen met @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Te veel fouten! Gestopt.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: waarschuwing: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Verkeerd geplaatste %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Typ '%s --help' voor meer informatie.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Gebruik: %s [OPTIE]... TEXINFO-BESTAND...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2562,7 +2614,7 @@
"Standaard worden 'Info'-bestanden aangemaakt. Deze kunnen\n"
"gelezen worden met 'emacs' of met het zelfstandige 'info'.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2590,7 +2642,7 @@
" -v, --verbose tonen wat er gedaan wordt\n"
" --version versie-informatie tonen en stoppen\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2605,7 +2657,7 @@
" --plaintext platte tekst produceren\n"
" --xml Texinfo-XML produceren\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2638,7 +2690,7 @@
" -o, --output=BESTAND uitvoerbestand (of map indien gesplitste "
"HTML)\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2677,7 +2729,7 @@
" --split-size=GETAL bestanden opsplitsen vanaf deze grootte\n"
" (standaard %d bytes)\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2697,7 +2749,7 @@
" bestandsnamen met alleen ASCII-tekens "
"produceren\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2712,7 +2764,7 @@
" (standaard %d); indien 0, dan witruimte die\n"
" weggelaten mag worden laten vervallen\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2728,7 +2780,7 @@
" -P MAP MAP vooraantoevoegen aan @include-zoekpad\n"
" -U VAR variabele VAR wissen (als met '@clear')\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2763,7 +2815,7 @@
"\n"
" Voor de '--no-ifOPMAAK'-opties geldt: '@ifnotOPMAAK' _wel_ verwerken.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2779,7 +2831,7 @@
"niet;\n"
" als XML gemaakt wordt, staat '--ifxml' aan en de anderen niet.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2810,89 +2862,89 @@
" makeinfo --no-split foo.texi één Info-bestand ongeacht de "
"grootte\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Onbekende waarde '%s' van TEXINFO_OUTPUT_FORMAT wordt genegeerd.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: Argument van %s moet numeriek zijn, niet '%s'.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: Kan uitvoerbestand '%s' voor macro-expansies niet openen"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: Tweede uitvoerbestand '%s' voor macro-expansies wordt genegeerd.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: Kan uitvoerbestand '%s' voor interne verwijzingen niet openen"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr ""
"%s: Tweede uitvoerbestand '%s' voor interne verwijzingen wordt genegeerd.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: Argument van --paragraph-indent moet numeriek, 'none' of 'asis' zijn, "
"niet '%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: Argument van --footnote-style moet 'separate' of 'end' zijn, niet '%s'.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: Ontbrekend bestandsargument.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Multi-regelcommando %c%s wordt onjuist gebruikt"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Verwachtte '%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Kan map '%s' niet aanmaken: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Geen '%s' gevonden in '%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Macro-expansie naar standaarduitvoer wordt overgeslagen,\n"
"want de uitvoer van Info gaat daar al heen.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Aanmaken van een %s-bestand '%s' uit '%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2900,14 +2952,14 @@
"%s: Macro-uitvoerbestand '%s' wordt verwijderd wegens fouten;\n"
"gebruik '--force' om het te behouden.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Uitvoerbestand '%s' wordt verwijderd wegens fouten;\n"
"gebruik '--force' om het te behouden.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2916,96 +2968,99 @@
"%s: Uitvoerbestand '%s' voor interne verwijzingen wordt\n"
"verwijderd wegens fouten; gebruik '--force' om het te behouden.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Onbekend commando '%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Gebruik '{...}' om een commando als argument mee te geven aan @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s verwachtte '{...}'"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Ongepaarde }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "GEEN_NAAM!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s ontbrekende sluitaccolade"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image-bestand '%s' (voor HTML) is niet leesbaar: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Geen bestand '%s' gevonden"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image-bestand '%s' (voor tekst) is niet leesbaar: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "ontbrekend bestandsnaamargument van @image"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "ongedefinieerde vlag: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Geen waarde voor '%s'}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s vereist een naam"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Bestandseinde werd bereikt vóór een bijbehorende @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "'%.40s...' is te lang voor expansie; is niet geëxpandeerd"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Ontbrekende } in @multitable-sjabloon"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "loze tekst '%s' na @multitable wordt genegeerd"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Te veel kolommen in 'multitable'-item (maximaal %d)"
@@ -3015,7 +3070,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[onverwacht] kan kolom #%d niet selecteren in 'multitabel'"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "@tab buiten een 'multitabel' wordt genegeerd"
@@ -3055,11 +3111,13 @@
msgstr "Het anker '%s' en pagina '%s' verwijzen naar dezelfde bestandsnaam"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
"Dit @anchor-commando wordt genegeerd; verwijzingen ernaar zullen niet werken"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Geef dit anker een andere naam of gebruik de optie '--no-split'"
@@ -3074,6 +3132,7 @@
msgstr "Ankers '%s' en '%s' verwijzen naar dezelfde bestandsnaam"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "@anchor-commando wordt genegeerd; verwijzing ernaar werkt niet"
@@ -3112,16 +3171,16 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "'%s' heeft geen 'Up'-veld (misschien een onjuiste sectieindeling?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Pagina '%s' bevat geen menu-item voor '%s'\n"
"ondanks dat de eerste het 'Up'-doel van de laatste is"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "naar pagina '%s' wordt niet verwezen"
@@ -3166,27 +3225,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop wordt vóór %cnode gebruikt; de standaard %s wordt nu gebruikt"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-bestand '%s' is onleesbaar: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem als laatste item in @multitable produceert foutieve Docbook-"
"documenten"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "van"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "aan"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Het eerste argument in een kruisverwijzing mag niet leeg zijn"
@@ -3196,6 +3259,7 @@
msgstr "Lege bestandsnaam voor HTML-kruisverwijzing in '%s'"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Einde van bestand werd bereikt tijdens zoeken naar '.' of ','"
@@ -3205,10 +3269,12 @@
msgstr "'.' of ',' moet volgen op @%s, niet '%c'"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Gebruik @pxref voor kruisverwijzingen tussen haakjes"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Het eerste argument van @inforef mag niet leeg zijn"
@@ -3280,14 +3346,14 @@
msgid "%s is not a valid region code"
msgstr "%s is geen geldige ISO 639-taalcode"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: Argument van --footnote-style moet 'separate' of 'end' zijn, niet '%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3427,670 +3493,657 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: onbekende optie '--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "kan uitvoerbestand '%s' niet aanmaken"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Kan map '%s' niet aanmaken: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: is een leeg bestand"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Te bezoeken bestand: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "macro '%s' is al eerder gedefinieerd op regel %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s vereist een naam"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Verwachtte '%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Gebruik '{...}' om een commando als argument mee te geven aan @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: Argument van --paragraph-indent moet numeriek, 'none' of 'asis' zijn, "
"niet '%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: Argument van --paragraph-indent moet numeriek, 'none' of 'asis' zijn, "
"niet '%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: Argument van --footnote-style moet 'separate' of 'end' zijn, niet '%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Onbekende index '%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Onbekende index '%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: Argument van %s moet numeriek zijn, niet '%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: Argument van %s moet numeriek zijn, niet '%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Kan map '%s' niet aanmaken: %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Kan '%s' niet vinden."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "naar pagina '%s' wordt niet verwezen"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "naar pagina '%s' wordt niet verwezen"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Index '%s' bestaat al"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Uitvoerbestand '%s' wordt verwijderd wegens fouten;\n"
"gebruik '--force' om het te behouden.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: waarschuwing: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: waarschuwing: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(regel %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(regel %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Ontbrekende '}' in het argument van @def"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Het anker '%s' en pagina '%s' verwijzen naar dezelfde bestandsnaam"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Voetnoten binnen een voetnoot zijn niet toegestaan"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Onbekend commando '%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Fout argument van @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: is een leeg bestand"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "naar pagina '%s' wordt niet verwezen"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Het eerste argument van @inforef mag niet leeg zijn"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s verwijst naar niet-bestaande pagina '%s' (misschien een onjuiste "
"sectieindeling?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image-bestand '%s' is onleesbaar: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Macro '%s' in regel %d wordt aangeroepen met te veel argumenten"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
"'\\' in macro-expansie werd gevolgd door '%s' in plaats van een parameternaam"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "geen index-items gevonden voor '%s'\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item niet toegestaan in argument van @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Index '%s' bestaat al"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "macro '%s' is al eerder gedefinieerd"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Ontbrekende sluitaccolade voor voetnoot '%s'"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s is verouderd"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s is verouderd"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu gevonden vóór de eerste @node; aanmaken van Top-pagina"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "macro '%s' is al eerder gedefinieerd"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s verwachtte '{...}'"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: is een leeg bestand"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "@tab buiten een 'multitabel' wordt genegeerd"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s verwacht 'i' of 'j' als argument, niet '%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Onbekend commando '%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Onbekend commando: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s ontbrekende sluitaccolade"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s ontbrekende sluitaccolade"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: kan '--css'-bestand '%s' niet openen"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "geen index-items gevonden voor '%s'\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: kan '--css'-bestand '%s' niet openen"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image-bestand '%s' is onleesbaar: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "@quote-arg is verouderd; argumenten hebben standaard aanhalingstekens"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Kan pagina '%s' niet vinden."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-bestand '%s' (voor HTML) is niet leesbaar: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Noot...} produceert een loze kruisverwijzing in Info; kies een ander "
-"woord om dat te vermijden"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "'.' of ',' moet volgen op @%s, niet '%c'"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "'.' of ',' moet volgen op @%s, niet '%c'"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu gevonden vóór de eerste @node; aanmaken van Top-pagina"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu gevonden vóór de eerste @node; aanmaken van Top-pagina"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu gevonden vóór de eerste @node; aanmaken van Top-pagina"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image-bestand '%s' is onleesbaar: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "fout bij het schrijven naar '%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Onbekend commando '%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Onbekend commando '%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "kan invoerbestand '%s' niet openen"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: kan '--css'-bestand '%s' niet openen"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "@quote-arg is verouderd; argumenten hebben standaard aanhalingstekens"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4142,7 +4195,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Fout argument van @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Fout argument van @%s"
@@ -4158,7 +4211,7 @@
msgstr "@item niet toegestaan in argument van @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: Ontbrekend bestandsargument.\n"
@@ -4231,157 +4284,169 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s is zinloos in een '@%s'-blok"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: kan '--css'-bestand '%s' niet openen"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Moet in een '@%s'-omgeving zitten om '@%s' te kunnen gebruiken"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu gevonden vóór de eerste @node; aanmaken van Top-pagina"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu gevonden vóór de eerste @node; aanmaken van Top-pagina"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: kan '--css'-bestand '%s' niet openen"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Verwachtte '%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s is niet zinvol buiten een '@float'-omgeving"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: Ontbrekend bestandsargument.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Fout argument van @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: Argument van %s moet numeriek zijn, niet '%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: Argument van --footnote-style moet 'separate' of 'end' zijn, niet '%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Index '%s' bestaat al"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Kan map '%s' niet aanmaken: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: kan '--css'-bestand '%s' niet openen"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Kan map '%s' niet aanmaken: %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Er is geen menu op deze pagina."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(buiten alle pagina's)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Kan pagina '%s' niet vinden."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "'.' of ',' moet volgen op @%s, niet '%c'"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "'.' of ',' moet volgen op @%s, niet '%c'"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image-bestand '%s' is onleesbaar: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Kan pagina '%s' niet vinden."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Noot...} produceert een loze kruisverwijzing in Info; kies een "
+#~ "ander woord om dat te vermijden"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "'.' of ',' moet volgen op @%s, niet '%c'"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: waarschuwing: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Index '%s' bestaat al"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: ongeldige optie -- %c\n"
Index: po/pl.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/pl.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- po/pl.po 20 Mar 2011 21:20:28 -0000 1.54
+++ po/pl.po 9 Apr 2011 00:10:40 -0000 1.55
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.12.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2008-08-16 22:12+0200\n"
"Last-Translator: Jakub Bogusz <address@hidden>\n"
"Language-Team: Polish <address@hidden>\n"
@@ -81,11 +81,11 @@
msgid "memory exhausted"
msgstr "pamiêæ wyczerpana"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Przesuniêcie do przodu o znak"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Przesuniêcie do ty³u o znak"
@@ -97,11 +97,11 @@
msgid "Move to the end of this line"
msgstr "Przej¶cie na koniec tej linii"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Przesuniêcie do przodu o s³owo"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Przesuniêcie do ty³u o s³owo"
@@ -182,6 +182,7 @@
msgstr "Jedyne uzupe³nienie"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Jedno uzupe³nienie:\n"
@@ -195,6 +196,7 @@
msgstr "Wstawienie uzupe³nienia"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Tworzenie uzupe³nieñ..."
@@ -219,10 +221,12 @@
msgstr "Szukanie ³añcucha w indeksie tego pliku"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Szukanie wpisów w indeksie..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Nie znaleziono indeksów."
@@ -237,10 +241,12 @@
"Przej¶cie do nastêpnego pasuj±cego elementu z ostatniego `\\[index-search]'"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Brak poprzedniego ³añcucha szukanego w indeksie."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Brak wpisów w indeksie."
@@ -290,13 +296,13 @@
"\n"
"* Menu: Wêz³y, których indeksy zawieraj± `%s':\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Wiêcej informacji mo¿na uzyskaæ przez --help.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -312,12 +318,12 @@
"rozpowszechniaæ.\n"
"Nie ma ¯ADNEJ GWARANCJI w zakresie dopuszczalnym przez prawo.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "nie znaleziono wpisów w indeksie dla `%s'\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -328,7 +334,7 @@
"\n"
"Przegl±danie dokumentacji w formacie Info.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -344,7 +350,7 @@
" --dribble=PLIK zapamiêtanie sekwencji klawiszy w PLIKU.\n"
" -f, --file=PLIK podanie pliku Info do odwiedzenia."
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -357,7 +363,7 @@
" -n, --node=WÊZE£ podanie wêz³a w pierwszym odwiedzanym pliku.\n"
" -o, --output=PLIK zapis wybranych wêz³ów do PLIKU."
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -371,11 +377,11 @@
"PLIKU.\n"
" -O, --show-options, --usage przej¶cie do wêz³a z opcjami linii poleceñ."
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly tryb przyjazny dla syntezatorów mowy."
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -392,7 +398,7 @@
"zakoñczenie.\n"
" -w, --where, --location wy¶wietlenie fizycznego po³o¿enia pliku Info."
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -411,7 +417,7 @@
"wzglêdem\n"
"pocz±tkowo odwiedzonego wêz³a."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -419,7 +425,7 @@
"\n"
"Opis dzia³ania klawiszy jest dostêpny pod h w Info."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -447,7 +453,7 @@
" info -f ./foo.info pokazanie pliku ./foo.info bez szukania w "
"katalogu"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -460,72 +466,72 @@
"address@hidden, a ogólne pytania i dyskusjê na address@hidden"
"Strona domowa texinfo: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Nie mo¿na znale¼æ wêz³a `%s'."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Nie mo¿na znale¼æ wêz³a `(%s)%s'."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Nie mo¿na znale¼æ okna!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Kropka nie wystêpuje w wê¼le z tego okna!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Nie mo¿na usun±æ ostatniego okna."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Brak menu w tym wê¼le."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Brak przypisów w tym wê¼le."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Brak odsy³aczy w tym wê¼le."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Brak wska¼nika `%s' dla tego wêz³a."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Nieznane polecenie Info `%c'; `?' przywo³uje pomoc."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Typ terminala `%s' nie jest wystarczaj±cy do uruchomienia Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "To ju¿ jest ostatnia strona tego wêz³a."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "To ju¿ jest pierwsza strona tego wêz³a."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Tylko jedno okno."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Wynikowe okno by³oby zbyt ma³e."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Za ma³o miejsca na okno pomocy, proszê usun±æ okno."
@@ -835,10 +841,12 @@
" i wybranie wêz³a, w którym znaleziono nastêpne wyst±pienie.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Aktualna ¶cie¿ka poszukiwania to:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -847,6 +855,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -864,6 +873,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -871,62 +881,62 @@
"Nastêpuj±cych poleceñ nie mo¿na w ogóle wywo³aæ:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Wy¶wietlenie pomocy"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Odwiedzenie wêz³a Info `(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Wy¶wietlenie dokumentacji dla KLAWISZA"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Opis klawisza: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s jest niezdefiniowany."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s jest niezdefiniowany."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s jest zdefiniowany na %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Pokazanie co nacisn±æ, aby wykonaæ zadane polecenie"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Polecenie do znalezienia: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' nie ma pod ¿adnym klawiszem"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s mo¿na wywo³aæ tylko przez %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s mo¿na wywo³aæ przez %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Nie ma funkcji o nazwie `%s'"
@@ -939,91 +949,102 @@
"Wybór innych wêz³ów:\n"
"--------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "b³êdna liczba argumentów"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "nie mo¿na otworzyæ pliku wej¶ciowego `%s'"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "nie mo¿na utworzyæ pliku wyj¶ciowego `%s'"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "b³±d podczas zapisu do `%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "b³±d podczas zamykania pliku wyj¶ciowego `%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "sekwencja klawiszy zbyt d³uga"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "brak sekwencji klawiszy"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "znak NUL (\\000) nie jest dozwolony"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "znak NUL (^%c) nie jest dozwolony"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "brakuj±ca nazwa akcji"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "sekcja zbyt d³uga"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "nieznana akcja `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "nazwa akcji zbyt d³uga"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "nadmiarowe znaki po akcji `%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "brakuj±ca nazwa zmiennej"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "brakuj±cy `=' bezpo¶rednio po nazwie zmiennej"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "nazwa zmiennej zbyt d³uga"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "warto¶æ zbyt d³uga"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", linia %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1090,10 +1111,12 @@
"B³êdny plik infokey `%s' (z³y kod sekcji) - mo¿na go uaktualniæ przez infokey"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "B³êdne dane w pliku infokey - czê¶æ przypisañ klawiszy zignorowana"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "B³êdne dane w pliku infokey - czê¶æ ustawieñ zmiennych zignorowana"
@@ -1110,6 +1133,7 @@
msgstr "Odczytanie nazwy polecenia w obszarze echo i wykonanie go"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Nie mo¿na tutaj wykonaæ polecenia `echo-area'."
@@ -1174,7 +1198,7 @@
msgid "Select visited node: "
msgstr "Wybranie widocznego wêz³a: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Odsy³acz znikn±³! (%s)."
@@ -1184,7 +1208,7 @@
msgid "regexp error: %s"
msgstr "b³±d wyra¿enia regularnego: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1193,501 +1217,513 @@
"Witamy w Info w wersji %s. \\[get-help-window] pokazuje pomoc, \\[menu-item] "
"wybiera element menu."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Przej¶cie w dó³ do nastêpnej linii"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Przej¶cie w górê do poprzedniej linii"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Przej¶cie na koniec linii"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Przej¶cie na pocz±tek linii"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Nastêpny"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Nie ma wiêcej wêz³ów w tym dokumencie."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Nie ma wêz³a `Poprzedni' dla tego wêz³a."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr ""
"Nie ma wêz³ów `Poprzedni' ani `W górê' dla tego wêz³a w tym dokumencie."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Przej¶cie do przodu lub w dó³ struktury wêz³a"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Przej¶cie do ty³u lub w górê struktury wêz³a"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Przewijanie do przodu w tym oknie"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr ""
"Przewijanie do przodu w tym oknie i ustawienie domy¶lnego rozmiaru okna"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Przewijanie do przodu w tym oknie pozostaj±c wewn±trz wêz³a"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Przewijanie do przodu w tym oknie wewn. wêz³a i ust. domy¶lnego rozmiaru okna"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Przewijanie do ty³u w tym oknie"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Przewijanie do ty³u w tym oknie i ustawienie domy¶lnego rozmiaru okna"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Przewijanie do ty³u w tym oknie pozostaj±c wewn±trz wêz³a"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
msgstr ""
"Przewijanie do ty³u w tym oknie wewn. wêz³a i ust. domy¶lnego rozmiaru okna"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Przej¶cie na pocz±tek tego wêz³a"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Przej¶cie na koniec tego wêz³a"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Przewijanie w dó³ po linii"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Przewijanie w górê po linii"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Przewijanie w dó³ po po³owie rozmiaru ekranu"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Przewijanie w górê po po³owie rozmiaru ekranu"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Wybranie nastêpnego okna"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Wybranie poprzedniego okna"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Podzielenie aktualnego okna"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Usuniêcie aktualnego okna"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Nie mo¿na usun±æ sta³ego okna"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Usuniêcie wszystkich innych okien"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Przewijanie innego okna"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Przewijanie innego okna do ty³u"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Powiêkszenie (lub zmniejszenie) tego okna"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Podzielenie dostêpnego miejsca na ekranie miêdzy widoczne okna"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Zmiana stanu zawijania linii w aktualnym oknie"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Prze³±czenie u¿ywania wyra¿eñ regularnych przy wyszukiwaniu"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "U¿ywanie wyra¿eñ regularnych przy wyszukiwaniu."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "U¿ywanie dos³ownego tekstu przy wyszukiwaniu."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Wybranie wêz³a Nastêpny"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Wybranie wêz³a Poprzedni"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Wybranie wêz³a W górê"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Wybranie ostatniego wêz³a w tym pliku"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "To okno nie ma dodatkowych wêz³ów"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Wybranie pierwszego wêz³a w tym pliku"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Wybranie ostatniego elementu w menu tego wêz³a"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Wybranie tego elementu menu"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Nie ma %d elementów w tym menu."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Element menu (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Element menu: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Przej¶cie za odno¶nikiem (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Przej¶cie za odno¶nikiem: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Odczytanie elementu menu i wybranie jego wêz³a"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Odczytanie przypisu lub odsy³acza i wybranie jego wêz³a"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Przej¶cie na pocz±tek menu tego wêz³a"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Odwiedzenie jednocze¶nie jak najwiêkszej liczby elementów menu"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Odczytanie nazwy wêz³a i wybranie go"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Przej¶cie do wêz³a: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Brak menu w wê¼le `%s'."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Brak elementu menu `%s' w wê¼le `%s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Nie mo¿na znale¼æ wêz³a wskazywanego przez `%s' w `%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Odczytanie listy menu pocz±wszy od katalogu i pod±¿anie za ni±"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Pod±¿anie za menu: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Szukanie wêz³a opisuj±cego wywo³anie programu"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Szukanie wêz³a Invocation dla [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Odczytanie odno¶nika do strony podrêcznika i wybranie go"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Pobranie strony podrêcznika: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Wybranie wêz³a `Szczytowy' w tym pliku"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Wybranie wêz³a `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Zabicie wêz³a (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Nie mo¿na zabiæ wêz³a `%s'"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Nie mo¿na zabiæ ostatniego wêz³a"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Wybranie ostatnio wybranego wêz³a"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Zabicie tego wêz³a"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Odczytanie nazwy pliku i wybranie go"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Szukanie pliku: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Nie mo¿na znale¼æ `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Nie mo¿na utworzyæ pliku wyj¶ciowego `%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Gotowe."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Zapisywanie wêz³a %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Przepuszczenie zawarto¶ci tego pliku przez INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Nie mo¿na otworzyæ potoku do `%s'."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Drukowanie wêz³a %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "Kontynuacja szukania od koñca dokumentu."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "Kontynuacja szukania od pocz±tku dokumentu."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Szukanie podpliku %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Odczytanie ³añcucha i poszukiwanie go uwzglêdniaj±c wielko¶æ liter"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Odczytanie ³añcucha i poszukiwanie go"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Odczytanie ³añcucha i poszukiwanie go w ty³"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Szukanie wyr.reg."
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " uwzgl. wielko¶æ liter"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " wstecz"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Szukanie"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Wyszukiwanie nie powiod³o siê."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Powtórzenie ostatniego poszukiwania w tym samym kierunku"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Brak poprzedniego szukanego ³añcucha"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Powtórzenie ostatniego poszukiwania w odwrotnym kierunku"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Interaktywne poszukiwanie ³añcucha w trakcie wpisywania go"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "Interaktywne szukanie wyr.reg. wstecz: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "Interaktywne szukanie wstecz: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "Interaktywne szukanie wyr.reg.: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "Interaktywne szukanie: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Bez powodzenia "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Przej¶cie do poprzedniego odsy³acza"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Przej¶cie do nastêpnego odsy³acza"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Wybranie odsy³acza lub elementu menu wystêpuj±cego w tej linii"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Anulowanie bie¿±cej operacji"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Wyj¶cie"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Przesuniêcie kursora do podanej linii w oknie"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Odrysowanie ekranu"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Wyj¶cie z Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Uruchomienie polecenia przypisanego do wariantu klawisza z ma³± liter±"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Nieznane polecenie (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" jest niepoprawne"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "`%s' jest niepoprawne"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Dodanie tej cyfry do aktualnego argumentu liczbowego"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Rozpoczêcie (lub pomno¿enie przez 4) aktualnego argumentu liczbowego"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Wewnêtrznie u¿ywane przez \\[universal-argument]"
@@ -1794,32 +1830,27 @@
msgid " Subfile: %s"
msgstr " Podplik: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: uwaga: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " dla %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\t`%s --help' poda pe³n± listê opcji.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Sk³adnia: %s [OPCJA]... [PLIK-INFO [PLIK-DIR]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
"Dodanie lub usuniêcie wpisów dla PLIKU-INFO w pliku katalogu PLIK-KATALOGU."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1841,7 +1872,7 @@
" odpowiednik u¿ycia argumentu PLIK-KATALOGU.\n"
" --dry-run to samo co --test."
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1871,7 +1902,7 @@
" wpisu okre¶lonego przez plik Info ani nazwy pliku "
"Info."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1898,7 +1929,7 @@
" --no-indent nie formatowanie nowych wpisów w pliku DIR.\n"
" --quiet pominiêcie ostrze¿eñ."
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1931,7 +1962,7 @@
" informacji w samym pliku Info.\n"
" --section WYR SEK odpowiednik --regex=WYR --section=SEK --add-once."
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1941,7 +1972,7 @@
" --test pominiêcie uaktualniania PLIKU-KATALOGU.\n"
" --version wy¶wietlenie informacji o wersji i zakoñczenie."
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1951,7 +1982,7 @@
"address@hidden, a ogólne pytania i dyskusjê na address@hidden"
"Strona domowa texinfo: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1987,63 +2018,67 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: nie mo¿na odczytaæ (%s) ani utworzyæ (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: pusty plik"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY bez odpowiadaj±cego END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY bez odpowiadaj±cego START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: plik katalogu ju¿ istnieje: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Nale¿y podaæ plik Info tylko raz.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Podano dodatkowe wyra¿enie regularne, zignorowano `%s'"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "B³±d w wyra¿eniu regularnym `%s': %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "nadmiarowy argument linii poleceñ `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Nie podano pliku wej¶ciowego; --help mo¿e podaæ wiêcej informacji."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Nie podano pliku katalogu; --help mo¿e podaæ wiêcej informacji."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "brak wpisu do katalogu info w `%s'"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "nie znaleziono wpisów dla `%s'; nic nie usuniêto"
@@ -2115,6 +2150,7 @@
msgstr "niechciany znak %c w @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "argument @sc zawiera same wielkie litery, wiêc brak efektu"
@@ -2124,6 +2160,7 @@
msgstr "oczekiwano `{', ale napotkano `%c'"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "koniec pliku wewn±trz bloku verb"
@@ -2132,7 +2169,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "oczekiwano `}', ale napotkano `%c'"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2145,7 +2184,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s jest przestarza³e"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp wymaga argumentu bêd±cego liczb± dodatni±, a nie `%s'"
@@ -2155,17 +2194,17 @@
msgid "Bad argument to %c%s"
msgstr "Z³y argument dla %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "zachowaj"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "brak"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Z³y argument dla @%s"
@@ -2174,32 +2213,33 @@
msgid "insert"
msgstr "wstaw"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Z³y argument dla @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "Oczekiwano @%s on lub off, a nie `%s'"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Obs³ugiwane s± tylko @%s 10 lub 11, a nie `%s'"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Brakuje `}' w argumencie @def"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Trzeba byæ w ¶rodowisku address@hidden', aby u¿yæ address@hidden'"
@@ -2220,10 +2260,11 @@
msgstr "Pominiêto `%s' przy zapisie na standardowe wyj¶cie"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Bufor wyj¶ciowy niepusty."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "¯±dany rodzaj ¶rodowiska float `%s' nie by³ wcze¶niej u¿yty"
@@ -2243,11 +2284,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Nie zamkniêty nawias dla przypisu `%s'"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Zdefiniowano przypis bez wêz³a nadrzêdnego"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Przypisy wewn±trz przypisów nie s± dozwolone"
@@ -2260,21 +2303,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: plik css zakoñczy³ siê wewn±trz komentarza"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[nieoczekiwane] brak znacznika html do zdjêcia"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[nieoczekiwane] b³êdna nazwa wêz³a: `%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Nieznany indeks `%s'"
@@ -2303,14 +2347,14 @@
msgid "(line %*d)"
msgstr "(linia %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Nieznany indeks `%s' w @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Wpis dla indeksu `%s' poza jakimkolwiek wêz³em"
@@ -2320,6 +2364,7 @@
msgstr "(poza jakimkolwiek wêz³em)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item nie jest dozwolone w argumencie @itemize"
@@ -2328,6 +2373,7 @@
msgstr "Broken-Type w insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Przepe³nienie stosu numerowania"
@@ -2336,7 +2382,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "przepe³nienie, restart od %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2347,14 +2393,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "¦rodowiska %cfloat nie mog± byæ zagnie¿d¿one"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden' oczekiwa³o `%s', ale napotkano `%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2366,30 +2412,34 @@
msgstr "%s wymaga litery lub cyfry"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "koniec pliku wewn±trz bloku dos³ownego"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s nic nie znaczy poza ¶rodowiskiem address@hidden'"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "mo¿e wêze³ @top powinien byæ otoczony @ifnottex, a nie @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "napotkano @detailmenu przed pierwszym wêz³em, tworzenie wêz³a `Top'"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%s nic nie znaczy poza ¶rodowiskami address@hidden' i address@hidden'"
@@ -2399,9 +2449,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s nic nie znaczy poza ¶rodowiskiem address@hidden'"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2412,14 +2462,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s' wymaga czego¶ po sobie"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Z³y argument `%s' dla address@hidden', u¿ycie `%s'"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s nic nie znaczy wewn±trz bloku address@hidden'"
@@ -2464,17 +2514,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s oczekuje `i' lub `j' jako argumentu, a nie `%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s oczekuje pojedynczego znaku `i' lub `j' jako argumentu"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro `%s' ju¿ zosta³o zdefiniowane"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "oto poprzednia definicja `%s'"
@@ -2489,53 +2539,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makro `%s' wywo³ane w linii %d ze zbyt du¿± liczb± argumentów"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "nie znaleziono makra %cend"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion jest przestarza³e; proszê u¿ywaæ zamiast tego @rmacro"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "@quote-arg jest przestarza³e; argumenty s± domy¶lnie cytowane"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "niedopasowane @end %s do @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Zbyt du¿o b³êdów! Poddajê siê.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: uwaga: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "¬le umieszczone %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Polecenie `%s --help' poda wiêcej informacji.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Sk³adnia: %s [OPCJA]... PLIK-TEXINFO...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2545,7 +2597,7 @@
"samodzielnym\n"
"GNU Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2573,7 +2625,7 @@
" --version wy¶wietlenie informacji o wersji i "
"zakoñczenie.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2588,7 +2640,7 @@
" --xml wyprodukowanie Texinfo XML zamiast Info.\n"
" --plaintext wyprodukowanie czystego tekstu zamiast Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2622,7 +2674,7 @@
" -o, --output=PLIK zapisanie do PLIKU (lub katalogu w przypadku\n"
" dzielonego HTML),\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2665,7 +2717,7 @@
" --split-size=ROZMIAR podzia³ Info na pliki o ROZMIARZE (domy¶lnie "
"%d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2685,7 +2737,7 @@
" --transliterate-file-names\n"
" tworzenie nazw plików w transliteracji ASCII.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2699,7 +2751,7 @@
" %d). Je¶li ILE jest 0, pomijalne spacje s±\n"
" usuwane.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2718,7 +2770,7 @@
" -U ZMIENNA usuniêcie definicji ZMIENNEJ, tak jak "
"@clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2759,7 +2811,7 @@
"\n"
" Ponadto opcje --no-ifFORMAT powoduj± przetwarzanie tekstu @ifnotFORMAT.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2774,7 +2826,7 @@
"wy³±czone;\n"
" je¶li generowany jest XML, --ifxml jest w³±czone, a reszta wy³±czona.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2807,86 +2859,86 @@
" makeinfo --no-split foo.texi zapisanie jednego wielkiego pliku "
"Info\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Zignorowano nierozpoznan± warto¶æ TEXINFO_OUTPUT_FORMAT `%s'.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: argument %s musi byæ liczb±, a nie `%s'.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: nie mo¿na otworzyæ wyj¶cia `%s' do zapisu rozwiniêæ makr"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: zignorowano drugie wyj¶cie `%s' do zapisu rozwiniêæ makr.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: nie mo¿na otworzyæ wyj¶cia wewnêtrznych odno¶ników `%s'"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: zignorowano drugie wyj¶cie wewnêtrznych odno¶ników `%s'.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: argument --paragraph-indent musi byæ liczb±/`none'/`asis', a nie `%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: argumentem --footnote-style musi byæ `separate' lub `end', a nie `%s'.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: brakuj±cy argument plikowy.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Niew³a¶ciwie u¿yte wieloliniowe polecenie %c%s"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Oczekiwano `%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Nie mo¿na utworzyæ katalogu `%s': %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Nie znaleziono `%s' w `%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: nie zapisywanie rozwiniêæ makr na stdout, bo tam zapisywane jest Info.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Tworzenie pliku %s `%s' z `%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2894,14 +2946,14 @@
"%s: Usuwanie pliku wyj¶cia makr `%s' z powodu b³êdów; --force pozwoli go "
"zachowaæ.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Usuwanie pliku wyj¶ciowego `%s' z powodu b³êdów; --force pozwoli go "
"zachowaæ.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2910,97 +2962,100 @@
"%s: Usuwanie pliku wyj¶ciowego wewnêtrznych odno¶ników `%s' z powodu b³êdów; "
"--force pozwoli go zachowaæ.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Nieznane polecenie `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr ""
"Nale¿y u¿yæ nawiasów klamrowych, aby podaæ polecenie jako argument dla @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s oczekiwa³o nawiasów klamrowych"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Niedopasowany }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "BEZ_NAZWY!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "w %c%s brakuje klamry zamykaj±cej"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "Plik @image `%s' (dla HTML) nieczytelny: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Nie ma pliku `%s'"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "Plik @image `%s' (dla tekstu) nieczytelny: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "Po @image brakuje argumentu plikowego"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "niezdefiniowana flaga: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Brak warto¶ci dla `%s'}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s wymaga nazwy"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Osi±gniêto koniec pliku przed znalezieniem @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' jest zbyt d³ugie do rozwiniêcia; nie rozwiniêto"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Brakuj±cy } we wzorcu @multitable"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "zignorowano zab³±kany tekst `%s' po @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Zbyt du¿o kolumn w elemencie multitable (maksymalnie %d)"
@@ -3010,7 +3065,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[nieoczekiwane] nie mo¿na wybraæ kolumny #%d w multitable"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "zignorowano @tab poza multitable"
@@ -3050,10 +3106,12 @@
msgstr "Znacznik `%s' i wêze³ `%s' odwzorowuj± siê na t± sam± nazwê pliku"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "Zignorowano to polecenie @anchor; wskazania na nie nie bêd± dzia³a³y"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Nale¿y zmieniæ ten znacznik lub u¿yæ opcji `--no-split'"
@@ -3068,6 +3126,7 @@
msgstr "Znaczniki `%s' i `%s' odwzorowuj± siê na t± sam± nazwê pliku"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "zignorowano polecenie @anchor; wskazania na nie nie bêd± dzia³a³y"
@@ -3103,15 +3162,15 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "`%s' nie ma pola W górê (mo¿e b³êdny podzia³ na sekcje?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Wêze³ `%s' nie ma elementu menu dla `%s' pomimo bycia jego celem W górê"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "nie wskazywany wêze³ `%s'"
@@ -3156,27 +3215,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop u¿yty przed %cnode, u¿ycie domy¶lnego %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Plik @image `%s' nieczytelny: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem jako ostatni element @multitable tworzy niepoprawne dokumenty "
"Docbook"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "typu"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "na"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Pierwszy argument odsy³acza nie mo¿e byæ pusty"
@@ -3186,6 +3249,7 @@
msgstr "Pusta nazwa pliku dla odsy³acza HTML w `%s'"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Osi±gniêto koniec pliku podczas szukania `.' lub `,'"
@@ -3195,10 +3259,12 @@
msgstr "Po @%s musi wyst±piæ `.' lub `,', a nie `%c'"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "dla odsy³aczy w nawiasach nale¿y u¿yæ @pxref"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Pierwszy argument @inforef nie mo¿e byæ pusty"
@@ -3270,14 +3336,14 @@
msgid "%s is not a valid region code"
msgstr "%s nie jest poprawnym kodem jêzyka zgodnym z ISO 639"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: argumentem --footnote-style musi byæ `separate' lub `end', a nie `%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3420,667 +3486,654 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: nieznana opcja `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "nie mo¿na utworzyæ pliku wyj¶ciowego `%s'"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Nie mo¿na utworzyæ katalogu `%s': %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: pusty plik"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Szukanie pliku: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Wêze³ `%s' poprzednio zdefiniowany w linii %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s wymaga nazwy"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Oczekiwano `%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr ""
"Nale¿y u¿yæ nawiasów klamrowych, aby podaæ polecenie jako argument dla @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: argument --paragraph-indent musi byæ liczb±/`none'/`asis', a nie `%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: argument --paragraph-indent musi byæ liczb±/`none'/`asis', a nie `%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: argumentem --footnote-style musi byæ `separate' lub `end', a nie `%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Nieznany indeks `%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Nieznany indeks `%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: argument %s musi byæ liczb±, a nie `%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: argument %s musi byæ liczb±, a nie `%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Nie mo¿na utworzyæ katalogu `%s': %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Nie mo¿na znale¼æ `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "nie wskazywany wêze³ `%s'"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "nie wskazywany wêze³ `%s'"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Indeks `%s' ju¿ istnieje"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Usuwanie pliku wyj¶ciowego `%s' z powodu b³êdów; --force pozwoli go "
"zachowaæ.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: uwaga: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: uwaga: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(linia %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(linia %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Brakuje `}' w argumencie @def"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Znacznik `%s' i wêze³ `%s' odwzorowuj± siê na t± sam± nazwê pliku"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Przypisy wewn±trz przypisów nie s± dozwolone"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Nieznane polecenie `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Z³y argument dla @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: pusty plik"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "nie wskazywany wêze³ `%s'"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Pierwszy argument @inforef nie mo¿e byæ pusty"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s wskazuje na nieistniej±cy wêze³ `%s' (mo¿e b³êdny podzia³ na sekcje?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "Plik @image `%s' nieczytelny: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makro `%s' wywo³ane w linii %d ze zbyt du¿± liczb± argumentów"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "po \\ w rozwiniêciu makra wystêpuje `%s' zamiast nazwy parametru"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "nie znaleziono wpisów w indeksie dla `%s'\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item nie jest dozwolone w argumencie @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Indeks `%s' ju¿ istnieje"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "makro `%s' ju¿ zosta³o zdefiniowane"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Nie zamkniêty nawias dla przypisu `%s'"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s jest przestarza³e"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s jest przestarza³e"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "makro `%s' ju¿ zosta³o zdefiniowane"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s oczekiwa³o nawiasów klamrowych"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: pusty plik"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "zignorowano @tab poza multitable"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s oczekuje `i' lub `j' jako argumentu, a nie `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Nieznane polecenie `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Niezdefiniowane polecenie: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "w %c%s brakuje klamry zamykaj±cej"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "w %c%s brakuje klamry zamykaj±cej"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "nie znaleziono wpisów w indeksie dla `%s'\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "Plik @image `%s' nieczytelny: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "@quote-arg jest przestarza³e; argumenty s± domy¶lnie cytowane"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Nie mo¿na znale¼æ wêz³a `%s'."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Plik @image `%s' (dla HTML) nieczytelny: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@string{Note...} tworzy nieprawdziwe odniesienia w Info; nale¿y "
-"przeredagowaæ aby zapobiec temu"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "Po @%s musi wyst±piæ `.' lub `,', a nie `%c'"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "Po @%s musi wyst±piæ `.' lub `,', a nie `%c'"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "Plik @image `%s' nieczytelny: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "b³±d podczas zapisu do `%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Nieznane polecenie `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Nieznane polecenie `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "nie mo¿na otworzyæ pliku wej¶ciowego `%s'"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "@quote-arg jest przestarza³e; argumenty s± domy¶lnie cytowane"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4131,7 +4184,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Z³y argument dla @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Z³y argument dla @%s"
@@ -4147,7 +4200,7 @@
msgstr "@item nie jest dozwolone w argumencie @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: brakuj±cy argument plikowy.\n"
@@ -4220,157 +4273,169 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s nic nie znaczy wewn±trz bloku address@hidden'"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Trzeba byæ w ¶rodowisku address@hidden', aby u¿yæ address@hidden'"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "napotkano @menu przed pierwszym @node, tworzenie wêz³a `Top'"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Oczekiwano `%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s nic nie znaczy poza ¶rodowiskiem address@hidden'"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: brakuj±cy argument plikowy.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Z³y argument dla @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: argument %s musi byæ liczb±, a nie `%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: argumentem --footnote-style musi byæ `separate' lub `end', a nie `%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Indeks `%s' ju¿ istnieje"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Nie mo¿na utworzyæ katalogu `%s': %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: nie mo¿na otworzyæ pliku css: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Nie mo¿na utworzyæ katalogu `%s': %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Brak menu w tym wê¼le."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(poza jakimkolwiek wêz³em)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Nie mo¿na znale¼æ wêz³a `%s'."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "Po @%s musi wyst±piæ `.' lub `,', a nie `%c'"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "Po @%s musi wyst±piæ `.' lub `,', a nie `%c'"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "Plik @image `%s' nieczytelny: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Nie mo¿na znale¼æ wêz³a `%s'."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@string{Note...} tworzy nieprawdziwe odniesienia w Info; nale¿y "
+#~ "przeredagowaæ aby zapobiec temu"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "Po @%s musi wyst±piæ `.' lub `,', a nie `%c'"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: uwaga: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Indeks `%s' ju¿ istnieje"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: niew³a¶ciwa opcja -- %c\n"
Index: po/ro.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/ro.po,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- po/ro.po 20 Mar 2011 21:20:29 -0000 1.54
+++ po/ro.po 9 Apr 2011 00:10:41 -0000 1.55
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.7.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2005-05-03 12:00+05\n"
"Last-Translator: Laurentiu Buzdugan <address@hidden>\n"
"Language-Team: Romanian <address@hidden>\n"
@@ -83,11 +83,11 @@
msgid "memory exhausted"
msgstr ""
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Mergi înainte un caracter"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Mergi înapoi un caracter"
@@ -99,11 +99,11 @@
msgid "Move to the end of this line"
msgstr "Mergi la sfârºitul acestei linii"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Mergi înainte un cuvânt"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Mergi înapoi un cuvânt"
@@ -184,6 +184,7 @@
msgstr "O singurã completare"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "O completare:\n"
@@ -197,6 +198,7 @@
msgstr "Insereazã completarea"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Construim completãrile..."
@@ -221,10 +223,12 @@
msgstr "Cautã un ºir în indexul acestui fiºier"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Cãutãm intrãri în index..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Nici am gãsit nici un index."
@@ -240,10 +244,12 @@
"\\[index-search]'"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Nu existã nici un ºir cãutat anterior."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Nici o intrare în index."
@@ -294,13 +300,13 @@
"\n"
"* Meniu: Noduri a cãror indexurile conþin `%s':\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Încercaþi --help pentru informaþii suplimentare.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -310,12 +316,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -323,7 +329,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -333,7 +339,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -341,7 +347,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -349,14 +355,14 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly fii prietenos cu sintetizatoarele de "
"vorbire.\n"
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -366,7 +372,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -376,13 +382,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -396,7 +402,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -409,72 +415,72 @@
"întrebãri generale ºi discuþii la address@hidden"
"Texinfo homepage: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Nu pot gãsi nodul `%s'."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Nu pot gãsi nodul `(%s)%s'."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Nu pot gãsi o fereastrã!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Punctul nu apare în interiorul nodului acestei ferestre!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Nu pot ºterge ultima fereastrã."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Nici un meniu în acest nod"
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Nici o notã de subsol în acest nod."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Nici un pointer `%s' pentru acest nod."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Comandã Info necunoscutã `%c';încercaþi `?' pentru ajutor."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Terminalul de tip `%s' nu e destul de deºtept sã ruleze Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Sunteþi deja la ultima paginã a acestui nod."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Sunteþi deja la prima paginã a acestui nod."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "O singurã fereastrã."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Fereastra rezultantã ar fi prea micã."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Nu e destul spaþiu pentru o fereastrã de ajutor, ºtergeþi o fereastrã."
@@ -813,10 +819,12 @@
" ºi selecteazã nodul în care acesta este gãsit.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Calea curentã de cãutare este:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -825,6 +833,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -842,6 +851,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -849,62 +859,62 @@
"Urmãtoarele comenzi nu pot fi deloc invocate:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Afiºeazã mesaj de ajutor"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Viziteazã nodul Info `(info)Ajutor'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Tipãreºte documentaþie pentru tastã (KEY)"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Descrie tastã (key): %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s nu este definit(ã)."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s nu este definit(ã)."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s este definit(ã) ca %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Aratã ce trebuie tasta pentru a executa o anumitã comandã"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Unde este comanda: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' nu este pe nici o tastã"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s poate fi invocat doar via %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s poate fi invocat via %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Nu existã nii o funcþie numitã `%s'"
@@ -917,91 +927,102 @@
"Selectaþi alte noduri:\n"
"----------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "numãr incorect de argumente"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "nu pot deschide fiºierul de intrare `%s'"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "nu pot crea fiºierul de ieºire `%s'"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "eroare la scrierea în `%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "eroare la închiderea fiºierului de ieºire `%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "secvenþã de taste prea lungã"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "secvenþã de taste inexistentã"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "caracterul NUL (\\000) nu este permis"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "caracterul NUL (^%c) nu este permis"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "nume de acþiune inexistent"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "secþiune prea lungã"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "acþiune necunoscutã `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "nume de acþiune prea lung"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "extra caractere dupã acþiunea `%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "nume de variabilã inexistent"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "caracterul `=' lipseºte imediat dupã numele de variabilã"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "nume de variabilã prea lung"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "valoare prea lungã"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", linia %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1072,10 +1093,12 @@
"actualiza"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Date incorecte în fiºierul infokey -- unele legãturi de taste ignorate"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"Date incorecte în fiºierul infokey -- unele setãri de variabile ignorate"
@@ -1093,6 +1116,7 @@
msgstr "Citeºte un nume de comandã în zona ecou ºi executã-o"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Nu pot executa o comandã `zonã ecou' aici."
@@ -1159,7 +1183,7 @@
msgid "Select visited node: "
msgstr "Selecteazã nodul vizitat: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Referinþa a dispãrut! (%s)."
@@ -1169,7 +1193,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1178,82 +1202,85 @@
"Bine aþi venit la Info versiunea %s. Tastaþi \\[get-help-window] pentru "
"ajutor, \\[menu-item] pentru un articol din meniu."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Mergi la linia urmãtoare"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Mergi la linia precedentã"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Mergi la sfârºitul liniei"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Mergi la începutul liniei"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Urmãtor"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Nu mai sunt alte noduri în acest document."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Nici un `Prec' pentru acest nod."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Nici un `Prec' sau `Sus' pentru acest nod în acest document."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Mergi înainte sau jos prin structura de noduri"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Mergi înapoi sau sus prin structura de noduri"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Scroll înainte în aceastã fereastrã"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr ""
"Scroll înainte în aceastã fereastrã ºi seteazã dimensiunea implicitã a "
"ferestrei"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Scroll înainte în aceastã fereastrã, rãmâi în nod"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Scroll înainte în aceastã fereastrã, rãmâi în nod ºi seteazã dimensiunea "
"implicitã a ferestrei"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Scroll înapoi în acestã fereastrã"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr ""
"Scroll înapoi în acestã fereastrã ºi seteazã dimensiunea implicitã a "
"ferestrei"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Scroll înapoi în aceastã fereastrã, rãmâi în nod"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1261,427 +1288,436 @@
"Scroll înapoi în aceastã fereastrã, rãmâi în nod ºi seteazã dimensiunea "
"implicitã a ferestrei"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Mergi la începutul acestui nod"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Mergi la sfârºitul acestui nod"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Scroll jos pe linii"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Scroll sus pe linii"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Scroll jos jumãtate de ecran"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Scroll sus jumãtate de ecran"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Selecteazã fereastra urmãtoare"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Selecteazã fereastra precedentã"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Împarte fereastra curentã"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "ªterge fereastra curentã"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Nu pot ºterge o fereastrã permanentã"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "ªterge toate celelalte ferestre"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Scroll-eazã cealaltã fereastrã"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Scroll-eazã cealaltã fereastrã înapoi"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Creºte sau micºoreazã aceastã fereastrã"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Împarte spaþiul de ecran disponibil între ferestrele vizibile"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Comutã starea reformatãrii de linie (wrapping) în fereastra curentã"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Selecteazã nodul Urmãtor"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Selectezã nodul Prec"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Selecteazã nodul Sus"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Selecteazã ultimul nod din acest fiºier"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Acestã fereastrã nu mai are nici un nod"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Selecteazã primul nod din acest fiºier"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Selecteazã ultimul articol din meniul acestui nod"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Selecteazã acest articol de meniu"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Nu existã %d articole în acest meniu"
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Articol meniu (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Articol meniu: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Urmeazã ref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Urmeazã ref: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Citeºte un articol de meniu ºi selecteazã nodul sãu"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Citeºte o notã de subsol sau referinþã ºi selecteazã nodul sãu"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Mergi la începutul meniului acestui nod"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Viziteazã cât mai multe articole de meniu posibile deodatã"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Citeºte numele unui nod ºi selecteazã-l"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Du-te la nod: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Nici un meniu în nod `%s'."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Nici un articol de meniu `%s' în nod `%s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Nu pot gãsi nodul referit de `%s' în `%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Citeºte o listã de meniuri pornind din dir ºi urmãreºte-le"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Urmeazã meniurile: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Gãseºte nodul ce descrie invocarea programului"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Gãseºte nodul Invocare pentru [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Citeºte o referinþã de paginã de manul ºi selecteazã-o"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Obþine paginã manual (manpage): "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Selecteazã nodul `Vârf' în acest fiºier"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Selecteazã nodul `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Distruge nodul (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Nu pot distruge nodul `%s'"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Nu pot distruge ultimul nod"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Selecteazã cel mai recent nod selectat"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Distruge acest nod"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Citeºte numele unui fiºier ºi selecteazã-l"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Gãseºte fiºier: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Nu pot gãsi `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Nu am putut crea fiºier ieºire `%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Terminat."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Scriu nod %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Conectez (pipe) conþinutul acestui nod prin INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Nu pot deschide conexiune (pipe) cãtre `%s'."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Tipãresc nod %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "ªterge (kill) pânã la începutul liniei"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Caut subfiºier %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Citeºte un ºir ºi cautã-l þinând cont de litere mari/mici"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Citeºte un ºir ºi cautã-l"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Citeºte un ºir ºi cautã-l înapoi"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s pentru ºir [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr " þinând cont de litere mari/mici"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Cautã înapoi"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Cautã"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Cãutare eºuatã."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Repetã ultima cãutare în aceeaºi direcþie"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Nici un ºir cãutat anterior"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Repetã ultima cãutare în direcþie opusã"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Cautã interactiv pentru un ºir pe mãsurã ce este introdus"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "I-cautã înapoi: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I-cautã înapoi: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "I-cautã: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I-cautã: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Eºuez "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Mergi la referinþa precedentã"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Mergi la referinþa urmãtoare"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Selecteazã referinþa sau articolul de meniu ce apare pe acestã linie"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Renunþã la operaþia curentã"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Ieºi"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Mutã cursorul la o anumitã linie din fereastrã"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Redeseneazã ecranul"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Ieºi din Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Ruleazã comanda legatã de litera micã de pe tastã"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Comandã necunoscutã (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" este invalid"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "`%s' este invalid"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Adaugã aceastã cifrã la argumentul numeric curent"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Începe (sau înmulþeºte cu 4) argumentul numeric curent"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Folosit intern de \\[argument-universal]"
@@ -1796,31 +1832,26 @@
msgid " Subfile: %s"
msgstr " Subfiºier: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: avertisment: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " pentru %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tÎncercaþi `%s --help' pentru o lipsã completã de opþiuni.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1834,7 +1865,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1850,7 +1881,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1865,7 +1896,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1881,14 +1912,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1900,7 +1931,7 @@
"întrebãri generale ºi discuþii la address@hidden"
"Texinfo homepage: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1937,67 +1968,71 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: nu am putut citi (%s) ºi nu am putut crea (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: fiºier gol"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY fãrã un END-INFO-DIR-ENTRY corespunzãtor"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY fãrã un START-INFO-DIR-ENTRY corespunzãtor"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: are deja fiºier dir: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Specificã fiºierul Info o singurã datã.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "argument suplimentar în linia de comandã `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Nici un fiºier de intrare specificat; încercaþi --help pentru informaþii "
"suplimentare."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Nici un fiºier dir specificat; încercaþi --help pentru informaþii "
"suplimentare."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "nici o intrare dir info în `%s'"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "nici o intrare gãsitã pentru `%s'; n-am ºters nimic"
@@ -2069,6 +2104,7 @@
msgstr "caracter neverosimil %c în @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "argumentul @sc în litere mari, prin urmare fãrã efect"
@@ -2078,6 +2114,7 @@
msgstr "`{' aºteptat, dar am vãzut `%c'"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "sfârºit de fiºier în interiorul blocului de verb"
@@ -2086,7 +2123,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "`}' aºteptat, dar am vãzut `%c'"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2099,7 +2138,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s este depãsit"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp necesitã un argument numeric pozitiv, nu `%s'"
@@ -2109,17 +2148,17 @@
msgid "Bad argument to %c%s"
msgstr "Argument nepotrivit pentru %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "aºacume"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "nimic"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Argument nepotrivit pentru @%s"
@@ -2128,32 +2167,33 @@
msgid "insert"
msgstr "insereazã"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Argument nepotrivit pentru @%s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Lipseºte `}' în @def arg"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Trebuie sã fiþi în mediul address@hidden' pentru a folosi
address@hidden'"
@@ -2174,10 +2214,11 @@
msgstr "`%s' omis întrucât scriu la ieºirea standard (stdout)"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Buffer-ul de ieºire nu este gol."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2197,11 +2238,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Nici o parantezã de închidere pentru nota de subsol `%s'"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Nota de subsol definitã fãrã nod pãrinte"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Nu sun permise note de subsol în note de subsol"
@@ -2214,21 +2257,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file s-a terminat cu un comentariu"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[neaºteptat] nici un tag html de ridicat"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[neaºteptat] nume de nod invalid: `%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Index necunoscut `%s'"
@@ -2257,14 +2301,14 @@
msgid "(line %*d)"
msgstr "(linia %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Index necunoscut `%s' în @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Intrarea pentru index-ul `%s' în afara oricãrui nod"
@@ -2274,6 +2318,7 @@
msgstr "(în afara oricãrui nod)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item nu este permis în argument la @itemize"
@@ -2282,6 +2327,7 @@
msgstr "Tip-Greºit în insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Stivã de enumerare inundatã (overflow)"
@@ -2290,7 +2336,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "inundate (overflow) la tipãrire, reîncep la %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2301,14 +2347,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "mediile %cfloat nu pot fi încuibãrite"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden' a aºteptat `%s', dar a vãzut `%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2320,20 +2366,23 @@
msgstr "%s necesitã litere sau cifre"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "sfârºit de fiºier în interiorul blocului neformatat (verbatim)"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s nu are sens în exteriorul mediului address@hidden'"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
@@ -2341,11 +2390,12 @@
"@ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu vãzut înainte de primul nod, creez nodul `Vârf'"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%s nu are sens în exteriorul mediilor address@hidden' ºi
address@hidden'"
@@ -2355,9 +2405,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s nu are sens în exteriorul mediului address@hidden'"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2368,14 +2418,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s' necesitã ceva dupã el"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Argument greºit `%s' pentru address@hidden', folosesc `%s'"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s nu are sens în interiorul blocului address@hidden'"
@@ -2420,17 +2470,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s aºteaptã `i' sau `j' ca argument, nu `%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s aºteaptã un singur caracter `i' sau `j' ca argument"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "macro-ul `%s' definit anterior"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "aici este definiþia anterioarã a lui `%s'"
@@ -2445,53 +2495,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cend macro nu a fost gãsit"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "nepotrivire @end %s cu @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Prea multe erori! Am renunþat.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: avertisment: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "%c nelalocul lui"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Încercaþi `%s --help' pentru informaþii suplimentare.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Folosire: %s [OPÞIUNE]... FIªIER-TEXINFO...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2499,7 +2551,7 @@
"Translateazã documentaþia sursã Texinfo în diferite alte formate, implicit\n"
"fiºiere Info potrivite pentru citit online cu Emacs sau GNU Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, fuzzy, c-format
msgid ""
"General options:\n"
@@ -2525,7 +2577,7 @@
" --version afiºeazã informaþii despre versiune ºi "
"terminã.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, fuzzy, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2540,7 +2592,7 @@
" --xml ieºire Texinfo XML în loc de Info.\n"
" --plaintext ieºire text simplu în loc de Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
#, fuzzy
msgid ""
"General output options:\n"
@@ -2573,7 +2625,7 @@
" --number-sections scrie numere de capitole ºi secþiuni.\n"
" -o, --output=FIªIER scrie în FIªIER (director dacã multiple HTML),\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, fuzzy, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2613,7 +2665,7 @@
" --split-size=NUM împarte fiºierele Info de dimens. NUM "
"(implicit %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
#, fuzzy
msgid ""
"Options for HTML:\n"
@@ -2628,7 +2680,7 @@
" --css-include=FIªIER include FIªIER în HTML <stil> ieºire;\n"
" citeºte stdin dacã FIªIER este -.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, fuzzy, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2643,7 +2695,7 @@
" dacã VAL e 0, spaþiile goale ce pot fi "
"ignorate nu sunt afiºate.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2659,7 +2711,7 @@
" -P DIR prepend DIR la calea de cãutare @include.\n"
" -U VAR nedefineºte variabila VAR, ca ºi @clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2698,7 +2750,7 @@
" De asemenea, pentru opþiunile --no-ifFORMAT, proceseazã text "
"@ifnotFORMAT.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2713,7 +2765,7 @@
" dacã generaþi text simplu, --ifplaintext este selectat iar restul sunt "
"deselectate;\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2744,86 +2796,86 @@
" makeinfo --no-split foo.texi scrie un singur fiºier Info "
"indiferent cât de mare\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Ignor valoare nerecunoscutã TEXINFO_OUTPUT_FORMAT `%s'.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: nu am putut deschide ieºirea expansiunii macro-ului `%s'.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: lipseºte fiºierul argument.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Comandã pe multiple linii %c%s folositã incorect"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Am aºteptat `%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Nu pot crea directorul `%s': %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Nici un `%s' nu a fost gãsit în `%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Omite expasiunea macro la ieºire întrucât ieºirea Info merge acolo.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Creez fiºierul %s `%s' din `%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2831,14 +2883,14 @@
"%s: ªterg fiºierul de ieºire macro `%s' din cauza erorilor; folosiþi --force "
"pentru a-l pãstra.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: fiºierul de ieºire `%s' din cauza erorilor; folosiþi --force pentru a-l "
"pãstra.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2847,96 +2899,99 @@
"%s: fiºierul de ieºire `%s' din cauza erorilor; folosiþi --force pentru a-l "
"pãstra.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Comandã necunoscutã `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s am aºteptat paranteze"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "} fãrã pereche"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "NICI_UN_NUME!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s lipseºte paranteza de închidere"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "Fiºierul @image `%s' (pentru HTML) nu poate fi citit: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Nici un fiºier `%s'"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "Fiºierul @image `%s' (pentru text) nu poate fi citit: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image lipseºte fiºierul argument."
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "marcaj nedefinit: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Nici o valoare pentru `%s'}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s necesitã un nume"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Am ajuns la eof înainte de a potrivi @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' este prea lung pentru expansiune; nu a fost expandat"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "} lipsã în ºablonul @multitable"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "ignor text aiurea `%s' dupã @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Prea multe coloane în articol multitabel (max %d)"
@@ -2946,7 +3001,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[neaºteptat] nu pot selecta coloana #%d în multitabel"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "ignor @tab în afara multitabelului"
@@ -2986,11 +3042,13 @@
msgstr "Ancoraj `%s' ºi nodul `%s' aratã cãtre acelaºi nume de fiºier"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
"Aceastã comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Redenumeºte acest ancoraj sau foloseºte opþiunea `--no-split'"
@@ -3005,6 +3063,7 @@
msgstr "Ancoraj `%s' ºi `%s' aratã cãtre acelaºi nume de fiºier"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "Comandã @anchor ignoratã; referinþele cãtre acesta nu vor merge"
@@ -3040,14 +3099,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "`%s' nu are nici un câmp Sus (probabil secþionare incorectã?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Nodului `%s' îi lipseºte articolul pentru `%s' deºi îi este þinta Sus"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "nod nereferit `%s'"
@@ -3092,27 +3151,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop folosit înaintea lui %cnode, implicit cãtre %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem ca ultimul articol din @multitable produce documenteDocbook "
"invalide"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "din"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "pe"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -3122,6 +3185,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3131,11 +3195,12 @@
msgstr ""
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Nici o referinþã la acelaºi pasaj în acest nod."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -3207,14 +3272,14 @@
msgid "%s is not a valid region code"
msgstr "%s nu este un cod de limbã valid conform ISO 639"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3344,664 +3409,651 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: opþiune nerecunoscutã `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "nu pot crea fiºierul de ieºire `%s'"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Nu pot crea directorul `%s': %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: fiºier gol"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Gãseºte fiºier: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Nodul `%s' definit anterior la linia %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s necesitã un nume"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Am aºteptat `%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Folosiþi paranteze pentru a da o comandã ca argument lui @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: --paragraph-indent arg trebuie sã fie numeric/`none'/`asis', nu `%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Index necunoscut `%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Index necunoscut `%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Nu pot crea directorul `%s': %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Nu pot gãsi `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "nod nereferit `%s'"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "nod nereferit `%s'"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Indez-ul `%s' existã deja"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: fiºierul de ieºire `%s' din cauza erorilor; folosiþi --force pentru a-l "
"pãstra.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: avertisment: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: avertisment: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(linia %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(linia %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Lipseºte `}' în @def arg"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Ancoraj `%s' ºi nodul `%s' aratã cãtre acelaºi nume de fiºier"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Nu sun permise note de subsol în note de subsol"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Comandã necunoscutã `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Argument nepotrivit pentru @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: fiºier gol"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "nod nereferit `%s'"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "argumentele pentru @%s ignorate"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"referinþa %s cãtre nodul inexistent `%s' (probabil secþionare incorectã?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Macro `%s' chemat pe linia %d cu prea multe argumente"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "\\ in expansiunea macro urmatã de `%s' în loc de nume parametru"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item nu este permis în argument la @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Indez-ul `%s' existã deja"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "macro-ul `%s' definit anterior"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Nici o parantezã de închidere pentru nota de subsol `%s'"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s este depãsit"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s este depãsit"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "macro-ul `%s' definit anterior"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s am aºteptat paranteze"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: fiºier gol"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "ignor @tab în afara multitabelului"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s aºteaptã `i' sau `j' ca argument, nu `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Comandã necunoscutã `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Comandã nedefinitã: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s lipseºte paranteza de închidere"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s lipseºte paranteza de închidere"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "nici o intrare de index a fost gãsitã pentru `%s'\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Nu pot gãsi nodul `%s'."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Fiºierul @image `%s' (pentru HTML) nu poate fi citit: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Notã...] produce o referinþã încruciºatã falsã în Info; reformulaþi "
-"pentru a o evita"
-
-#: texi2html/formats/info.init:1352
-msgid "`.' or `,' must follow address@hidden"
+#: texi2html/formats/info.pm:1352
+msgid "`.' or `,' must follow @xref."
msgstr ""
-#: texi2html/formats/info.init:1357
-#, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "eroare la scrierea în `%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Comandã necunoscutã `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Comandã necunoscutã `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "nu pot deschide fiºierul de intrare `%s'"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4052,7 +4104,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Argument nepotrivit pentru @%s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Argument nepotrivit pentru @%s"
@@ -4068,7 +4120,7 @@
msgstr "@item nu este permis în argument la @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: lipseºte fiºierul argument.\n"
@@ -4141,156 +4193,164 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s nu are sens în interiorul blocului address@hidden'"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: nu am putut deschide --css-file: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Trebuie sã fiþi în mediul address@hidden' pentru a folosi
address@hidden'"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu vãzut înainte de primul @node, creez nodul `Vârf'"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Am aºteptat `%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s nu are sens în exteriorul mediului address@hidden'"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: lipseºte fiºierul argument.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Argument nepotrivit pentru @%s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s arg trebuie sã fie numeric, nu `%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: --footnote-style arg trebuie sã fie `separate' sau `end', nu `%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Indez-ul `%s' existã deja"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Nu pot crea directorul `%s': %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: nu am putut deschide --css-file: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Nu pot crea directorul `%s': %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Nici un meniu în acest nod"
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(în afara oricãrui nod)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Nu pot gãsi nodul `%s'."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "Fiºierul @image `%s' nu poate fi citit: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Nu pot gãsi nodul `%s'."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Notã...] produce o referinþã încruciºatã falsã în Info; "
+#~ "reformulaþi pentru a o evita"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: avertisment: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Indez-ul `%s' existã deja"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: opþiune ilegalã -- %c\n"
Index: po/ru.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/ru.po,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -b -r1.76 -r1.77
--- po/ru.po 20 Mar 2011 21:20:29 -0000 1.76
+++ po/ru.po 9 Apr 2011 00:10:41 -0000 1.77
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.7.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2005-02-07 09:27+0300\n"
"Last-Translator: Oleg S. Tihonov <address@hidden>\n"
"Language-Team: Russian <address@hidden>\n"
@@ -80,11 +80,11 @@
msgid "memory exhausted"
msgstr ""
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ×ÐÅÒÅÄ"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÉÍ×ÏÌ ÎÁÚÁÄ"
@@ -96,11 +96,11 @@
msgid "Move to the end of this line"
msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÓÔÒÏËÉ"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÏ×Ï ×ÐÅÒÅÄ"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÌÏ×Ï ÎÁÚÁÄ"
@@ -181,6 +181,7 @@
msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "åÄÉÎÓÔ×ÅÎÎÏÅ ÚÁ×ÅÒÛÅÎÉÅ:\n"
@@ -194,6 +195,7 @@
msgstr "÷ÓÔÁ×ÉÔØ ÚÁ×ÅÒÛÅÎÉÅ"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "óÏÓÔÁ×ÌÅÎÉÅ ÚÁ×ÅÒÛÅÎÉÊ..."
@@ -218,10 +220,12 @@
msgstr "îÁÊÔÉ ÓÔÒÏËÕ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÄÌÑ ÄÁÎÎÏÇÏ ÆÁÊÌÁ"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "ðÏÉÓË × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "îÅ ÎÁÊÄÅÎ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ."
@@ -237,10 +241,12 @@
"ÐÏÓÌÅÄÎÅÊ ËÏÍÁÎÄÅ `\\[index-search]'"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "óÔÒÏËÁ ÐÏÉÓËÁ × ÁÌÆÁ×ÉÔÎÏÍ ÕËÁÚÁÔÅÌÅ ÎÅ ÂÙÌÁ ÒÁÎØÛÅ ÚÁÄÁÎÁ."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "îÅ ÎÁÊÄÅÎ ÁÌÆÁ×ÉÔÎÙÊ ÕËÁÚÁÔÅÌØ."
@@ -292,13 +298,13 @@
"\n"
"* Menu: îÏÄÙ, ÞØÉ ÁÌÆÁ×ÉÔÎÙÅ ÕËÁÚÁÔÅÌÉ ÓÏÄÅÒÖÁÔ `%s':\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "ðÏÐÒÏÂÕÊÔÅ --help ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -308,12 +314,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "ÄÌÑ `%s' ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ × ÉÍÅÎÎÏÍ ÕËÁÚÁÔÅÌÅ\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -321,7 +327,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -331,7 +337,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -339,7 +345,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -347,14 +353,14 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ, ÕÄÏÂÎÏÍ ÄÌÑ ÓÉÎÔÅÚÁÔÏÒÏ× "
"ÒÅÞÉ.\n"
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -364,7 +370,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -374,13 +380,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -394,7 +400,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -407,73 +413,73 @@
"ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ address@hidden"
"äÏÍÁÛÎÁÑ ÓÔÒÁÎÉÃÁ Texinfo: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `%s'."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `(%s)%s'."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÏËÎÏ!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "ôÏÞËÁ ÎÁÈÏÄÉÔÓÑ ×ÎÅ ÎÏÄÙ ÜÔÏÇÏ ÏËÎÁ!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÅÅ ÏËÎÏ."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "÷ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÍÅÎÀ."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `%s'."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "ëÏÍÁÎÄÁ Info `%c' ÎÅÉÚ×ÅÓÔÎÁ; ÐÏÐÒÏÂÕÊÔÅ `?' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÓÐÒÁ×ËÉ."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr ""
"ôÅÒÍÉÎÁÌ ÔÉÐÁ `%s' ÎÅ ÏÂÌÁÄÁÅÔ ÄÏÓÔÁÔÏÞÎÙÍÉ ×ÏÚÍÏÖÎÏÓÔÑÍÉ ÄÌÑ ÚÁÐÕÓËÁ Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÏÓÌÅÄÎÅÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "÷Ù ÕÖÅ ÎÁÈÏÄÉÔÅÓØ ÎÁ ÐÅÒ×ÏÊ ÓÔÒÁÎÉÃÅ ÜÔÏÊ ÎÏÄÙ."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "ôÏÌØËÏ ÏÄÎÏ ÏËÎÏ."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "ðÏÌÕÞÉ×ÛÅÅÓÑ ÏËÎÏ ÂÙÌÏ ÂÙ ÓÌÉÛËÏÍ ÍÁÌÅÎØËÉÍ."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ""
"îÅ È×ÁÔÁÅÔ ÍÅÓÔÁ ÄÌÑ ÓÐÒÁ×ÏÞÎÏÇÏ ÏËÎÁ, ÐÏÖÁÌÕÊÓÔÁ, ÕÄÁÌÉÔÅ ËÁËÏÅ-ÎÉÂÕÄØ ÏËÎÏ."
@@ -808,10 +814,12 @@
" ÎÏÄÅ, × ËÏÔÏÒÏÊ ÎÁÊÄÅÎÏ ÓÌÅÄÕÀÝÅÅ ×ÈÏÖÄÅÎÉÅ.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "ôÅËÕÝÉÊ ÐÕÔØ ÐÏÉÓËÁ:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -820,6 +828,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -837,6 +846,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -844,62 +854,62 @@
"óÌÅÄÕÀÝÉÅ ËÏÍÁÎÄÙ ×ÏÏÂÝÅ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÚ×ÁÎÙ:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "ðÏËÁÚÁÔØ ÓÐÒÁ×ËÕ"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "ïÂÒÁÔÉÔØÓÑ Ë Info-ÎÏÄÅ `(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "ðÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ëìá÷éûå"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "ïÐÉÓÁÔØ ËÌÁ×ÉÛÕ: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s ÎÅÏÐÒÅÄÅÌÅÎÏ."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s ÎÅÏÐÒÅÄÅÌÅÎÏ."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s ÐÒÉ×ÑÚÁÎÏ Ë %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "ðÏËÁÚÙ×ÁÅÔ, ÞÔÏ ÎÕÖÎÏ ÎÁÐÅÞÁÔÁÔØ, ÞÔÏÂÙ ×ÙÐÏÌÎÉÔØ ÄÁÎÎÕÀ ËÏÍÁÎÄÕ"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "ëÏÍÁÎÄÁ: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' ÎÅ ÐÒÉ×ÑÚÁÎÁ ÎÉ Ë ËÁËÉÍ ËÌÁ×ÉÛÁÍ"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÁ ÔÏÌØËÏ Ó ÐÏÍÏÝØÀ %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s ÍÏÖÅÔ ÂÙÔØ ×ÙÚ×ÁÎÁ Ó ÐÏÍÏÝØÀ %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "æÕÎËÃÉÉ Ó ÉÍÅÎÅÍ `%s' ÎÅÔ"
@@ -912,91 +922,102 @@
"÷ÙÂÏÒ ÄÒÕÇÏÊ ÎÏÄÙ:\n"
"------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "ÎÅÐÒÁ×ÉÌØÎÏÅ ÞÉÓÌÏ ÁÒÇÕÍÅÎÔÏ×"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ × `%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÚÁËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÀÞÅÊ ÓÌÉÛËÏÍ ÄÌÉÎÎÁÑ"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "ÐÒÏÐÕÝÅÎÁ ÐÏÓÌÅÄÏ×ÁÔÅÌØÎÏÓÔØ ËÌÀÞÅÊ"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "ÚÎÁË NUL (\\000) ÎÅÄÏÐÕÓÔÉÍ"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "ÚÎÁË NUL (^%c) ÎÅÄÏÐÕÓÔÉÍ"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "ÐÒÏÐÕÝÅÎÏ ÉÍÑ ÄÅÊÓÔ×ÉÑ"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "ÒÁÚÄÅÌ ÓÌÉÛËÏÍ ×ÅÌÉË"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "îÅÉÚ×ÅÓÔÎÏÅ ÄÅÊÓÔ×ÉÅ `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "ÉÍÑ ÄÅÊÓÔ×ÉÑ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "ÌÉÛÎÉÅ ÚÎÁËÉ ÐÏÓÌÅ ÄÅÊÓÔ×ÉÑ `%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "ÐÒÏÐÕÝÅÎÏ ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "ÐÒÏÐÕÝÅÎ ÚÎÁË `=' ÓÒÁÚÕ ÐÏÓÌÅ ÉÍÅÎÉ ÐÅÒÅÍÅÎÎÏÊ"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "ÉÍÑ ÐÅÒÅÍÅÎÎÏÊ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "ÚÎÁÞÅÎÉÅ ÓÌÉÛËÏÍ ÄÌÉÎÎÏÅ"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", ÓÔÒÏËÁ %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1065,11 +1086,13 @@
"ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ ÅÇÏ"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"ðÏ×ÒÅÖÄÅÎÎÙÅ ÄÁÎÎÙÅ × ÆÁÊÌÅ infokey -- ÎÅËÏÔÏÒÙÅ ÐÒÉ×ÑÚËÉ ÐÒÏÉÇÎÏÒÉÒÏ×ÁÎÙ"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"ðÏ×ÒÅÖÄÅÎÎÙÅ ÄÁÎÎÙÅ × ÆÁÊÌÅ infokey -- ÎÅËÏÔÏÒÙÅ ÕÓÔÁÎÏ×ËÉ ÐÅÒÅÍÅÎÎÙÈ "
@@ -1088,6 +1111,7 @@
msgstr "óÞÉÔÁÔØ ÉÍÑ ËÏÍÁÎÄÙ × ÜÈÏ-ÏÂÌÁÓÔÉ É ÉÓÐÏÌÎÉÔØ ÅÅ"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "úÄÅÓØ ÎÅÌØÚÑ ×ÙÐÏÌÎÉÔØ ËÏÍÁÎÄÕ ÜÈÏ-ÏÂÌÁÓÔÉ."
@@ -1151,7 +1175,7 @@
msgid "Select visited node: "
msgstr "÷ÙÂÒÁÔØ ÐÏÓÅÝÅÎÎÕÀ ÒÁÎÅÅ ÎÏÄÕ: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "óÓÙÌËÁ ÉÓÞÅÚÌÁ! (%s)."
@@ -1161,7 +1185,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1170,78 +1194,81 @@
"äÏÂÒÏ ÐÏÖÁÌÏ×ÁÔØ × Info ×ÅÒÓÉÉ %s. \\[get-help-window] -- ÓÐÒÁ×ËÁ, \\[menu-"
"item] ×ÙÂÉÒÁÅÔ ÐÕÎËÔ ÍÅÎÀ."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ ÎÉÖÅ"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "óÍÅÓÔÉÔØÓÑ ÎÁ ÓÔÒÏËÕ ×ÙÛÅ"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "óÍÅÓÔÉÔØÓÑ × ËÏÎÅÃ ÓÔÒÏËÉ"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "óÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÓÔÒÏËÉ"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "óÌÅÄÕÀÝÁÑ"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÂÏÌØÛÅ ÎÅÔ ÎÏÄ."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "äÌÑ ÜÔÏÊ ÎÏÄÙ ÎÅÔ ÓÓÙÌËÉ `ðÒÅÄÙÄÕÝÁÑ'."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "÷ ÜÔÏÍ ÄÏËÕÍÅÎÔÅ ÎÅÔ ÓÓÙÌËÉ `ðÒÅÄÙÄÕÝÁÑ' ÉÌÉ `÷×ÅÒÈ' ÄÌÑ ÜÔÏÊ ÎÏÄÙ."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "ðÒÏÄ×ÉÇÁÔØÓÑ ×ÐÅÒÅÄ ÉÌÉ ×ÎÉÚ ÐÏ ÓÔÒÕËÔÕÒÅ ÎÏÄ"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "ðÒÏÄ×ÉÇÁÔØÓÑ ÎÁÚÁÄ ÉÌÉ ××ÅÒÈ ÐÏ ÓÔÒÕËÔÕÒÅ ÎÏÄ"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "ðÒÏËÒÕÔÉÔØ ×ÐÅÒÅÄ ÔÅËÕÝÅÅ ÏËÎÏ"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ×ÐÅÒÅÄ É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "ðÒÏËÒÕÔÉÔØ ×ÐÅÒÅÄ ÔÅËÕÝÅÅ ÏËÎÏ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ×ÐÅÒÅÄ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ, É ÕÓÔÁÎÏ×ÉÔØ "
"ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "ðÒÏËÒÕÔÉÔØ ÎÁÚÁÄ ÔÅËÕÝÅÅ ÏËÎÏ"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ÎÁÚÁÄ É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "ðÒÏËÒÕÔÉÔØ ÎÁÚÁÄ ÔÅËÕÝÅÅ ÏËÎÏ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1249,427 +1276,436 @@
"ðÒÏËÒÕÔÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ ÎÁÚÁÄ, ÏÓÔÁ×ÁÑÓØ × ÔÅËÕÝÅÊ ÎÏÄÅ, É ÕÓÔÁÎÏ×ÉÔØ ÒÁÚÍÅÒ "
"ÏËÎÁ ÐÏ ÕÍÏÌÞÁÎÉÀ"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ÎÁÞÁÌÏ ÎÏÄÙ"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "ðÅÒÅÍÅÓÔÉÔØÓÑ × ËÏÎÅà ÎÏÄÙ"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÎÅÓËÏÌØËÏ ÓÔÒÏË ×ÎÉÚ"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÎÅÓËÏÌØËÏ ÓÔÒÏË ××ÅÒÈ"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÐÏÌÜËÒÁÎÁ ×ÎÉÚ"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "ðÒÏËÒÕÔÉÔØ ÎÁ ÐÏÌÜËÒÁÎÁ ××ÅÒÈ"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "÷ÙÂÒÁÔØ ÓÌÅÄÕÀÝÅÅ ÏËÎÏ"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "÷ÙÂÒÁÔØ ÐÒÅÄÙÄÕÝÅÅ ÏËÎÏ"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "òÁÚÂÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "õÄÁÌÉÔØ ÔÅËÕÝÅÅ ÏËÎÏ"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÔÏÑÎÎÏÅ ÏËÎÏ"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "õÄÁÌÉÔØ ×ÓÅ ÏÓÔÁÌØÎÙÅ ÏËÎÁ"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "ðÒÏËÒÕÔÉÔØ ÄÒÕÇÏÅ ÏËÎÏ"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "ðÒÏËÒÕÔÉÔØ ÄÒÕÇÏÅ ÏËÎÏ ÎÁÚÁÄ"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "õ×ÅÌÉÞÉÔØ (ÉÌÉ ÕÍÅÎØÛÉÔØ) ÔÅËÕÝÅÅ ÏËÎÏ"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "òÁÚÄÅÌÉÔØ ÄÏÓÔÕÐÎÏÅ ÍÅÓÔÏ ÎÁ ÜËÒÁÎÅ ÍÅÖÄÕ ×ÉÄÉÍÙÍÉ ÏËÎÁÍÉ"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "ðÅÒÅËÌÀÞÉÔØ ÒÅÖÉÍ ÒÁÚÂÉ×ÁÎÉÑ ÓÔÒÏË × ÔÅËÕÝÅÍ ÏËÎÅ"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "ðÅÒÅÊÔÉ ÎÁ `óÌÅÄÕÀÝÕÀ' ÎÏÄÕ"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "ðÅÒÅÊÔÉ ÎÁ `ðÒÅÄÙÄÕÝÕÀ' ÎÏÄÕ"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "ðÅÒÅÊÔÉ ÎÁ `÷ÅÒÈÎÀÀ' ÎÏÄÕ"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ × ÆÁÊÌÅ"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "üÔÏ ÏËÎÏ ÎÅ ÉÍÅÅÔ ÄÏÐÏÌÎÉÔÅÌØÎÙÈ ÎÏÄ"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "ðÅÒÅÊÔÉ ÎÁ ÐÅÒ×ÕÀ ÎÏÄÕ × ÆÁÊÌÅ"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "÷ÙÂÒÁÔØ ÐÏÓÌÅÄÎÉÊ ÐÕÎËÔ ÍÅÎÀ × ÔÅËÕÝÅÊ ÎÏÄÅ"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "÷ÙÂÒÁÔØ ÚÁÄÁÎÎÙÊ ÐÕÎËÔ ÍÅÎÀ"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "÷ ÜÔÏÍ ÍÅÎÀ ÎÅÔ %d ÐÕÎËÔÏ×."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "ðÕÎËÔ ÍÅÎÀ (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "ðÕÎËÔ ÍÅÎÀ: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "ðÅÒÅÊÔÉ ÐÏ ÓÓÙÌËÅ: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "óÞÉÔÁÔØ ÉÍÑ ÐÕÎËÔÁ ÍÅÎÀ É ÐÅÒÅÊÔÉ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÎÏÄÅ"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "óÞÉÔÁÔØ ÉÍÑ ÓÓÙÌËÉ ÉÌÉ ÓÎÏÓËÉ É ÐÅÒÅÊÔÉ Ë ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ÎÏÄÅ"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "óÍÅÓÔÉÔØÓÑ Ë ÎÁÞÁÌÕ ÍÅÎÀ ÔÅËÕÝÅÊ ÎÏÄÙ"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "ðÒÏÓÍÏÔÒÅÔØ ÏÄÎÏ×ÒÅÍÅÎÎÏ ËÁË ÍÏÖÎÏ ÂÏÌØÛÅ ÎÏÄ"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "óÞÉÔÁÔØ ÉÍÑ ÎÏÄÙ É ÐÅÒÅÊÔÉ Ë ÎÅÊ"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "ðÅÒÅÊÔÉ Ë ÎÏÄÅ: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "÷ ÎÏÄÅ `%s' ÎÅÔ ÍÅÎÀ."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "ðÕÎËÔ ÍÅÎÀ `%s' ÏÔÓÕÔÓÔ×ÕÅÔ × ÎÏÄÅ `%s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ ÐÏ ÓÓÙÌËÅ `%s' × `%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "óÞÉÔÁÔØ ÓÐÉÓÏË ÍÅÎÀ, ÎÁÞÉÎÁÀÝÉÊÓÑ Ó dir É ÐÒÏÓÌÅÄÏ×ÁÔØ ÐÏ ÎÉÍ"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "ðÒÏÓÌÅÄÏ×ÁÔØ ÐÏ ÍÅÎÀ: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "îÁÈÏÄÉÔ ÎÏÄÕ, ÒÁÓÓËÁÚÙ×ÁÀÝÕÀ, ËÁË ×ÙÚÙ×ÁÔØ ÐÒÏÇÒÁÍÍÕ"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "îÁÊÔÉ ÎÏÄÕ Invocation ÄÌÑ [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "óÞÉÔÁÔØ ÉÍÑ manpage É ÐÅÒÅÊÔÉ Ë ÎÅÊ"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "ðÒÏÓÍÏÔÒÅÔØ manpage: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "ðÅÒÅÊÔÉ ÎÁ `ðÅÒ×ÕÀ' ÎÏÄÕ"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "ðÅÒÅÊÔÉ ÎÁ ÎÏÄÕ `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "õÄÁÌÉÔØ ÎÏÄÕ (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÎÏÄÕ `%s'"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÕÄÁÌÉÔØ ÐÏÓÌÅÄÎÀÀ ÎÏÄÕ"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "ðÅÒÅÊÔÉ Ë ÐÏÓÌÅÄÎÅÊ ×ÙÂÒÁÎÎÏÊ ÎÏÄÅ"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "õÄÁÌÉÔØ ÔÅËÕÝÕÀ ÎÏÄÕ"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "óÞÉÔÁÔØ ÉÍÑ ÆÁÊÌÁ É ÐÅÒÅÊÔÉ Ë ÎÅÍÕ"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "ïÂÒÁÔÉÔØÓÑ Ë ÆÁÊÌÕ: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "úÁ×ÅÒÛÅÎÏ."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "úÁÐÉÓØ ÎÏÄÙ %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "îÁÐÒÁ×ÉÔØ ÓÏÄÅÒÖÉÍÏÅ ÜÔÏÊ ÎÏÄÙ ÎÁ ×ÈÏÄ ËÏÍÁÎÄÙ INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ËÁÎÁÌ Ë `%s'."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "ðÅÞÁÔØ ÎÏÄÙ %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "õÎÉÞÔÏÖÉÔØ ÔÅËÓÔ ÄÏ ÎÁÞÁÌÁ ÓÔÒÏËÉ"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "ðÏÉÓË ÆÁÊÌÁ %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÒÅÇÉÓÔÒÏÚÁ×ÉÓÉÍÙÊ ÐÏÉÓË"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÐÏÉÓË"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "óÞÉÔÁÔØ ÓÔÒÏËÕ É ÚÁÐÕÓÔÉÔØ ÐÏÉÓË × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s ÓÔÒÏËÉ [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr " c ÕÞÅÔÏÍ ÒÅÇÉÓÔÒÁ "
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "ïÂÒÁÔÎÙÊ ÐÏÉÓË"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "ðÏÉÓË"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "îÅ ÎÁÊÄÅÎÏ"
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "ðÏ×ÔÏÒÉÔØ ÐÏÓÌÅÄÎÉÊ ÐÏÉÓË × ÔÏÍ ÖÅ ÎÁÐÒÁ×ÌÅÎÉÉ"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "îÅÔ ÓÔÒÏËÉ ÐÒÅÄÙÄÕÝÅÇÏ ÐÏÉÓËÁ"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "ðÏ×ÔÏÒÉÔØ ÐÏÓÌÅÄÎÉÊ ÐÏÉÓË × ÏÂÒÁÔÎÏÍ ÎÁÐÒÁ×ÌÅÎÉÉ"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "úÁÐÕÓÔÉÔØ ÉÎÔÅÒÁËÔÉ×ÎÙÊ ÎÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÏÂÒÁÔÎÙÊ ÐÏÉÓË: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÏÂÒÁÔÎÙÊ ÐÏÉÓË: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "îÁÒÁÝÉ×ÁÅÍÙÊ ÐÏÉÓË: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "îÅ ÎÁÊÄÅÎÏ "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "óÍÅÓÔÉÔØÓÑ Ë ÐÒÅÄÙÄÕÝÅÊ ÓÓÙÌËÅ"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "óÍÅÓÔÉÔØÓÑ Ë ÓÌÅÄÕÀÝÅÊ ÓÓÙÌËÅ"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "÷ÙÂÒÁÔØ ÓÓÙÌËÕ ÉÌÉ ÐÕÎËÔ ÍÅÎÀ, ÎÁÈÏÄÑÝÉÊÓÑ ÎÁ ÄÁÎÎÏÊ ÓÔÒÏËÅ"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "ïÔÍÅÎÉÔØ ×ÙÐÏÌÎÅÎÉÅ ÔÅËÕÝÅÊ ËÏÍÁÎÄÙ"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "÷ÙÈÏÄ"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "ðÅÒÅÍÅÓÔÉÔØ ËÕÒÓÏÒ Ë ÚÁÄÁÎÎÏÊ ÓÔÒÏËÅ ÏËÎÁ"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "ðÅÒÅÒÉÓÏ×ÁÔØ ÜËÒÁÎ"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "÷ÙÊÔÉ ÉÚ Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "úÁÐÕÓÔÉÔØ ËÏÍÁÎÄÕ, ÐÒÉ×ÑÚÁÎÎÕÀ Ë ÜÔÏÊ ËÌÁ×ÉÛÅ × ÎÉÖÎÅÍ ÒÅÇÉÓÔÒÅ"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" ÎÅ×ÅÒÎÁÑ ËÏÍÁÎÄÁ"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "`%s' ÎÅ×ÅÒÎÏ"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "äÏÂÁ×ÌÑÅÔ ÃÉÆÒÕ Ë ÔÅËÕÝÅÍÕ ÞÉÓÌÏ×ÏÍÕ ÁÒÇÕÍÅÎÔÕ"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "îÁÞÁÔØ (ÉÌÉ ÕÍÎÏÖÉÔØ ÎÁ 4) ÔÅËÕÝÉÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "éÓÐÏÌØÚÕÅÔÓÑ ÆÕÎËÃÉÅÊ \\[universal-argument]"
@@ -1779,31 +1815,26 @@
msgid " Subfile: %s"
msgstr " æÁÊÌ: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " ÄÌÑ %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\túÁÐÕÓÔÉÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÐÏÌÎÏÇÏ ÓÐÉÓËÁ ËÌÀÞÅÊ.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1817,7 +1848,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1833,7 +1864,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1848,7 +1879,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1864,14 +1895,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1883,7 +1914,7 @@
"ÏÂÝÅÅ ÏÂÓÕÖÄÅÎÉÅ É ×ÏÐÒÏÓÙ ÎÁÐÒÁ×ÌÑÊÔÅ ÐÏ ÁÄÒÅÓÕ address@hidden"
"äÏÍÁÛÎÁÑ ÓÔÒÁÎÉÃÁ Texinfo: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1918,67 +1949,71 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ (%s) É ÓÏÚÄÁÔØ (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY ÂÅÚ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÇÏ START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ ÆÁÊÌ dir: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: íÏÖÎÏ ÚÁÄÁÔØ ÔÏÌØËÏ ÏÄÉÎ Info-ÆÁÊÌ.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "ÉÚÌÉÛÎÉÊ ÁÒÇÕÍÅÎÔ `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, fuzzy, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"îÅ ÚÁÄÁÎ ×ÈÏÄÎÏÊ ÆÁÊÌ.\n"
"ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, fuzzy, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"îÅ ÚÁÄÁÎ ÆÁÊÌ ËÁÔÁÌÏÇÁ.\n"
"ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "× `%s' ÎÅÔ ×ÈÏÖÄÅÎÉÑ ÄÌÑ ËÁÔÁÌÏÇÁ Info"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ ÄÌÑ `%s'; ÎÉÞÅÇÏ ÎÅ ÕÄÁÌÅÎÏ"
@@ -2050,6 +2085,7 @@
msgstr "ÍÁÌÏ×ÅÒÏÑÔÎÙÊ ÚÎÁË %c × @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "×ÅÓØ ÁÒÇÕÍÅÎÔ @sc ÎÁÂÒÁÎ ÚÁÇÌÁ×ÎÙÍÉ ÂÕË×ÁÍÉ, ÒÅÚÕÌØÔÁÔÁ ÎÅ ÂÕÄÅÔ"
@@ -2059,6 +2095,7 @@
msgstr "ÏÖÉÄÁÌÏÓØ `{', ×ÓÔÒÅÞÅÎÏ `%c'"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ"
@@ -2067,7 +2104,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "ÏÖÉÄÁÌÏÓØ `}', ×ÓÔÒÅÞÅÎÏ `%c'"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2080,7 +2119,7 @@
msgid "%c%s is obsolete"
msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "ËÏÍÁÎÄÅ @sp ÎÕÖÎÏ ÕËÁÚÁÔØ ÐÏÌÏÖÉÔÅÌØÎÙÊ ÞÉÓÌÏ×ÏÊ ÁÒÇÕÍÅÎÔ, Á ÎÅ `%s'"
@@ -2090,17 +2129,17 @@
msgid "Bad argument to %c%s"
msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "none"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
@@ -2110,32 +2149,33 @@
msgid "insert"
msgstr "insert"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "÷ ÁÒÇÕÍÅÎÔÅ @def ÐÒÏÐÕÝÅÎÁ `}'"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "îÕÖÎÏ ÂÙÔØ × ÂÌÏËÅ address@hidden', ÞÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ address@hidden'"
@@ -2156,10 +2196,11 @@
msgstr "`%s' ÏÐÕÝÅÎÏ, ÐÏÓËÏÌØËÕ ÐÅÞÁÔØ ÉÄÅÔ ÎÁ ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "÷ÙÈÏÄÎÏÊ ÂÕÆÅÒ ÎÅ ÐÕÓÔ."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2179,11 +2220,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "äÌÑ ÓÎÏÓËÉ `%s' ÎÅÔ ÚÁËÒÙ×ÁÀÝÅÊ ÆÉÇÕÒÎÏÊ ÓËÏÂËÉ"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "óÎÏÓËÁ ÏÐÒÅÄÅÌÅÎÁ ÂÅÚ ÒÏÄÉÔÅÌØÓËÏÊ ÎÏÄÙ"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "óÎÏÓËÉ ÉÚ ÓÎÏÓÏË ÚÁÐÒÅÝÅÎÙ"
@@ -2196,22 +2239,23 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: css-ÆÁÊÌ ÏÂÒÙ×ÁÅÔÓÑ × ËÏÍÍÅÎÔÁÒÉÉ"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr ""
"[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] × ÓÔÅËÅ html-ÔÅÇÏ× ÎÅÔ ÜÌÅÍÅÎÔÁ ÄÌÑ ×ÙÔÁÌËÉ×ÁÎÉÑ"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÅÒÎÏÅ ÉÍÑ ÎÏÄÙ: `%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÎÅÉÚ×ÅÓÔÅÎ"
@@ -2241,14 +2285,14 @@
msgid "(line %*d)"
msgstr "(ÓÔÒÏËÁ %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "îÅÉÚ×ÅÓÔÅÎ ÉÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' × @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "÷ÈÏÖÄÅÎÉÅ ÄÌÑ ÉÍÅÎÎÏÇÏ ÕËÁÚÁÔÅÌÑ `%s' ×ÎÅ ÎÏÄÙ"
@@ -2258,6 +2302,7 @@
msgstr "(×ÎÅ ËÁËÏÊ-ÌÉÂÏ ÎÏÄÙ)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "ÎÅÌØÚÑ ÚÁÄÁ×ÁÔØ @item × ÁÒÇÕÍÅÎÔÅ ÄÌÑ @itemize"
@@ -2266,6 +2311,7 @@
msgstr "Broken-Type × insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "ðÅÒÅÐÏÌÎÅÎÉÅ ÓÔÅËÁ ÐÅÒÅÞÉÓÌÅÎÉÑ"
@@ -2274,7 +2320,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "ÚÁËÏÎÞÉÌÓÑ ÁÌÆÁ×ÉÔ, ×ÏÚ×ÒÁÔ ÎÁ %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2285,14 +2331,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "ÂÌÏËÉ %cfloat ÎÅÌØÚÑ ×ËÌÁÄÙ×ÁÔØ ÄÒÕÇ × ÄÒÕÇÁ"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "ÏÖÉÄÁÌÏÓØ address@hidden' Ó `%s', ×ÓÔÒÅÞÅÎÏ `%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2304,31 +2350,35 @@
msgstr "%s ÔÒÅÂÕÅÔ ÂÕË×Ù ÉÌÉ ÃÉÆÒÙ"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "ËÏÎÅà ÆÁÊÌÁ ×ÓÔÒÅÞÅÎ ×ÎÕÔÒÉ ÎÅÏËÏÎÞÅÎÎÏÇÏ ÂÌÏËÁ"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ address@hidden'"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"×ÅÒÏÑÔÎÏ, ×ÁÛÁ ÎÏÄÁ @top ÄÏÌÖÎÁ ÂÙÔØ × ÂÌÏËÅ @ifnottex, Á ÎÅ × @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ address@hidden' ÉÌÉ address@hidden'"
@@ -2338,9 +2388,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ address@hidden'"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2351,14 +2401,14 @@
msgid "`%c%s' needs something after it"
msgstr "ðÏÓÌÅ `%c%s' ÄÏÌÖÎÏ ÞÔÏ-ÔÏ ÉÄÔÉ"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ `%s' ÄÌÑ address@hidden', ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ `%s'"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ address@hidden'"
@@ -2403,17 +2453,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ `i' ÉÌÉ `j', Á ÎÅ `%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ ÏÄÉÎ ÓÉÍ×ÏÌ `i' ÉÌÉ `j'"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "ÍÁËÒÏ `%s' ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ ÒÁÎØÛÅ"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ÍÅÓÔÏ ÐÒÅÄÙÄÕÝÅÇÏ ÏÐÒÅÄÅÌÅÎÉÑ `%s'"
@@ -2428,53 +2478,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "íÁËÒÏ `%s' ×ÙÚ×ÁÎÏ ÎÁ ÓÔÒÏËÅ %d Ó ÉÚÌÉÛÎÉÍÉ ÁÒÇÕÍÅÎÔÁÍÉ"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "ÎÅ ×ÓÔÒÅÞÅÎÏ %cend macro"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "ÎÅÐÁÒÎÙÅ @end %s É @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ÏÛÉÂÏË! ïÓÔÁÎÏ×ËÁ.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "úÄÅÓØ ÎÅ ÄÏÌÖÎÏ ÂÙÔØ %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "ðÏÐÒÏÂÕÊÔÅ `%s --help' ÄÌÑ ÐÏÌÕÞÅÎÉÑ ÂÏÌÅÅ ÐÏÄÒÏÂÎÏÇÏ ÏÐÉÓÁÎÉÑ.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "éÓÐÏÌØÚÏ×ÁÎÉÅ: %s [ëìàþ]... TEXINFO-æáêì...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2483,7 +2535,7 @@
"ÕÍÏÌÞÁÎÉÀ × Info-ÆÁÊÌÙ, ËÏÔÏÒÙÅ ÍÏÖÎÏ ÞÉÔÁÔØ Ó ÐÏÍÏÝØÀ Emacs ÉÌÉ\n"
"ÏÔÄÅÌØÎÏÊ ÐÒÏÇÒÁÍÍÙ GNU Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, fuzzy, c-format
msgid ""
"General options:\n"
@@ -2511,7 +2563,7 @@
" -v, --verbose ÐÏÑÓÎÑÔØ ÄÅÊÓÔ×ÉÑ.\n"
" --version ÐÏËÁÚÁÔØ ÉÎÆÏÒÍÁÃÉÀ Ï ×ÅÒÓÉÉ É ×ÙÊÔÉ.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, fuzzy, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2526,7 +2578,7 @@
" --xml ×Ù×ÏÄÉÔØ × ÆÏÒÍÁÔÅ Texinfo XML, Á ÎÅ × Info.\n"
" --plaintext ×Ù×ÏÄÉÔØ ÐÒÏÓÔÏÊ ÔÅËÓÔ, Á ÎÅ Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
#, fuzzy
msgid ""
"General output options:\n"
@@ -2561,7 +2613,7 @@
" -o, --output=æáêì ×Ù×ÏÄÉÔØ × ÕËÁÚÁÎÎÙÊ æáêì (ËÁÔÁÌÏÇ ÄÌÑ HTML Ó \n"
" ÒÁÚÂÉÅÎÉÅÍ).\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, fuzzy, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2602,7 +2654,7 @@
" --split-size=òáúíåò ÒÁÚÂÉ×ÁÔØ ÎÁ ÆÁÊÌÙ ÚÁÄÁÎÎÏÇÏ òáúíåòá (ÐÏ\n"
" ÕÍÏÌÞÁÎÉÀ %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
#, fuzzy
msgid ""
"Options for HTML:\n"
@@ -2618,7 +2670,7 @@
" ÞÉÔÁÔØ ÓÔÁÎÄÁÒÔÎÙÊ ××ÏÄ, ÅÓÌÉ æáêì ÚÁÄÁÎ ËÁË "
"-.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, fuzzy, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2634,7 +2686,7 @@
" åÓÌÉ þéóìï ÒÁ×ÎÏ ÎÕÌÀ, ÎÅÚÎÁÞÁÝÉÅ ÐÒÏÂÅÌÙ "
"ÏÐÕÓËÁÀÔÓÑ.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2655,7 +2707,7 @@
" -U ðåòåíåîîáñ ÓÄÅÌÁÔØ ðåòåíåîîõà ÎÅÏÐÒÅÄÅÌÅÎÎÏÊ, ÁÎÁÌÏÇÉÞÎÏ\n"
" ÉÓÐÏÌØÚÏ×ÁÎÉÀ @clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2692,7 +2744,7 @@
"\n"
" ëÒÏÍÅ ÔÏÇÏ, ÄÌÑ ËÌÀÞÅÊ --no-ifæïòíáô, ÏÂÒÁÂÁÔÙ×ÁÔØ ÂÌÏËÉ @ifnotæïòíáô.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2706,7 +2758,7 @@
" ÐÒÉ ×Ù×ÏÄÅ ÐÒÏÓÔÏÇÏ ÔÅËÓÔÁ ×ËÌÀÞÅÎ --ifplaintext, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ;\n"
" ÐÒÉ ×Ù×ÏÄÅ XML ×ËÌÀÞÅÎ --ifxml, ÏÓÔÁÌØÎÙÅ ×ÙËÌÀÞÅÎÙ.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2736,88 +2788,88 @@
"ÒÁÚÄÅÌÁÍÉ\n"
" makeinfo --no-split foo.texi ÚÁÐÉÓÁÔØ ÏÄÉÎ ÂÏÌØÛÏÊ Info-ÆÁÊÌ\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: ÎÅÉÚ×ÅÓÔÎÏÅ ÚÎÁÞÅÎÉÅ TEXINFO_OUTPUT_FORMAT `%s' ÉÇÎÏÒÉÒÏ×ÁÎÏ.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: ×ÔÏÒÏÊ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s' ÉÇÎÏÒÉÒÏ×ÁÎ.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s'"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: ×ÔÏÒÏÊ ×ÙÈÏÄÎÏÊ ÆÁÊÌ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÑ `%s' ÉÇÎÏÒÉÒÏ×ÁÎ.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-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:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-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:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ, ÚÁÄÁÀÝÉÊ ÆÁÊÌ.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "îÅÐÒÁ×ÉÌØÎÏ ÉÓÐÏÌØÚÏ×ÁÎÁ ÍÎÏÇÏÓÔÒÏÞÎÁÑ ËÏÍÁÎÄÁ %c%s"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "ïÖÉÄÁÅÔÓÑ `%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "`%s' ÎÅ ÎÁÊÄÅÎ × `%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: òÁÓËÒÙÔÉÅ ÍÁËÒÏÓÏ× × ÓÔÁÎÄÁÒÔÎÙÊ ×Ù×ÏÄ ÎÅ ÐÒÏÉÚ×ÏÄÉÔÓÑ,\n"
"ÔÁË ËÁË ÔÕÄÁ ÎÁÐÒÁ×ÌÅÎ ×Ù×ÏÄ × ÆÏÒÍÁÔÅ Info.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "óÏÚÄÁÎÉÅ %s-ÆÁÊÌÁ `%s' ÉÚ `%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2825,14 +2877,14 @@
"%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ ÍÁËÒÏÒÁÓÛÉÒÅÎÉÊ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
"ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
"ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2841,97 +2893,100 @@
"%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
"ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr ""
"éÓÐÏÌØÚÕÊÔÅ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ, ÞÔÏÂÙ ÐÅÒÅÄÁÔØ @%s ËÏÍÁÎÄÕ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s ÐÏÄÒÁÚÕÍÅ×ÁÅÔ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "îÅÐÁÒÎÁÑ }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "âåú_éíåîé!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÓËÏÂËÁ"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ HTML): %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "æÁÊÌ `%s' ÎÅ ÓÕÝÅÓÔ×ÕÅÔ"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ ÔÅËÓÔÁ): %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "ÐÏÓÌÅ @image ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ ÚÁÄÁÀÝÉÊ ÆÁÊÌ "
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "ÎÅÏÐÒÅÄÅÌÅÎÎÙÊ ÆÌÁÇ: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{úÎÁÞÅÎÉÅ `%s' ÎÅ ÚÁÄÁÎÏ}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "ËÏÍÁÎÄÅ %c%s ÎÕÖÎÏ ÕËÁÚÁÔØ ÉÍÑ"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "ëÏÎÅà ÆÁÊÌÁ ÒÁÎØÛÅ ÓÏÏÔ×ÅÔÓÔ×ÕÀÝÅÊ ËÏÍÁÎÄÙ @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' ÓÌÉÛËÏÍ ×ÅÌÉËÏ; ÎÅ×ÏÚÍÏÖÎÏ ÒÁÓËÒÙÔØ"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "÷ ÛÁÂÌÏÎÅ @multitable ÐÒÏÐÕÝÅÎÁ `}'"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "ÔÅËÓÔ `%s' ÐÏÓÌÅ @multitable ÉÇÎÏÒÉÒÏ×ÁÎ"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "óÌÉÛËÏÍ ÍÎÏÇÏ ËÏÌÏÎÏË × ÜÌÅÍÅÎÔÅ ÔÁÂÌÉÃÙ (ÍÁËÓÉÍÕÍ %d)"
@@ -2941,7 +2996,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[ÎÅÐÒÅÄ×ÉÄÅÎÎÁÑ ÓÉÔÕÁÃÉÑ] ÎÅ×ÏÚÍÏÖÎÏ ×ÙÂÒÁÔØ ËÏÌÏÎËÕ #%d × ÔÁÂÌÉÃÅ"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "@tab ×ÎÅ ÔÁÂÌÉÃÙ ÉÇÎÏÒÉÒÏ×ÁÎ"
@@ -2981,10 +3037,12 @@
msgstr "íÁÒËÅÒ `%s' É ÎÏÄÁ `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "äÁÎÎÁÑ ËÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "ðÅÒÅÉÍÅÎÕÊÔÅ ÜÔÏÔ ÍÁÒËÅÒ ÉÌÉ ÉÓÐÏÌØÚÕÊÔÅ ËÌÀÞ `--no-split'"
@@ -2999,6 +3057,7 @@
msgstr "íÁÒËÅÒÙ `%s' É `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "ëÏÍÁÎÄÁ @anchor ÉÇÎÏÒÉÒÕÅÔÓÑ; ÓÓÙÌËÉ ÎÁ ÎÅÅ ÎÅ ÂÕÄÕÔ ÒÁÂÏÔÁÔØ"
@@ -3038,14 +3097,14 @@
msgstr ""
"÷ ÎÏÄÅ `%s' ÎÅÔ ÐÏÌÑ Up (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ ÇÌÁ×?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "îÏÄÁ `%s' ÎÅ ÉÍÅÅÔ ÐÕÎËÔÁ ÍÅÎÀ ÄÌÑ `%s', ÈÏÔÑ ÎÁ ÎÅÅ ÓÓÙÌÁÅÔÓÑ ÐÏÌÅ Up"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË"
@@ -3090,27 +3149,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop ×ÓÔÒÅÞÅÎÁ ÐÅÒÅÄ %cnode, ÐÏ ÕÍÏÌÞÁÎÉÀ ÉÓÐÏÌØÚÕÅÔÓÑ %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"ÉÓÐÏÌØÚÏ×ÁÎÉÅ @headitem × ËÁÞÅÓÔ×Å ÐÏÓÌÅÄÎÅÇÏ ÜÌÅÍÅÎÔÁ @multitable ×ÙÄÁÅÔ "
"ÎÅËÏÒÒÅËÔÎÙÅ ÄÏËÕÍÅÎÔÙ Docbook"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "ÉÚ"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "ÎÁÄ"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -3120,6 +3183,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3129,11 +3193,12 @@
msgstr ""
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "îÁ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÓÓÙÌÏË."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -3205,14 +3270,14 @@
msgid "%s is not a valid region code"
msgstr "%s ÎÅ Ñ×ÌÑÅÔÓÑ ×ÅÒÎÙÍ ËÏÄÏÍ ÑÚÙËÁ ÉÚ ISO 639"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: ÁÒÇÕÍÅÎÔ --footnote-style ÄÏÌÖÅÎ ÂÙÔØ `separate' ÉÌÉ `end'; Á ÎÅ `%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3353,669 +3418,656 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: ÎÅÉÚ×ÅÓÔÎÙÊ ËÌÀÞ `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "ïÂÒÁÔÉÔØÓÑ Ë ÆÁÊÌÕ: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "îÏÄÁ `%s' ÂÙÌÁ ÒÁÎÅÅ ÏÐÒÅÄÅÌÅÎÁ × ÓÔÒÏËÅ %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "ËÏÍÁÎÄÅ %c%s ÎÕÖÎÏ ÕËÁÚÁÔØ ÉÍÑ"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "ïÖÉÄÁÅÔÓÑ `%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr ""
"éÓÐÏÌØÚÕÊÔÅ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ, ÞÔÏÂÙ ÐÅÒÅÄÁÔØ @%s ËÏÍÁÎÄÕ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: ÁÒÇÕÍÅÎÔ --paragraph-indent ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÉÌÉ\n"
"`none', ÉÌÉ `asis'; ÎÅ `%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: ÁÒÇÕÍÅÎÔ --paragraph-indent ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÉÌÉ\n"
"`none', ÉÌÉ `asis'; ÎÅ `%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: ÁÒÇÕÍÅÎÔ --footnote-style ÄÏÌÖÅÎ ÂÙÔØ `separate' ÉÌÉ `end'; Á ÎÅ `%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÎÅÉÚ×ÅÓÔÅÎ"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÎÅÉÚ×ÅÓÔÅÎ"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: õÄÁÌÅÎÉÅ ×ÙÈÏÄÎÏÇÏ ÆÁÊÌÁ `%s' -- ÂÙÌÉ ÏÛÉÂËÉ;\n"
"ÉÓÐÏÌØÚÕÊÔÅ --force, ÞÔÏÂÙ ÐÒÉÎÕÄÉÔÅÌØÎÏ ÓÏÈÒÁÎÉÔØ ÒÅÚÕÌØÔÁÔÙ.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(ÓÔÒÏËÁ %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(ÓÔÒÏËÁ %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "÷ ÁÒÇÕÍÅÎÔÅ @def ÐÒÏÐÕÝÅÎÁ `}'"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "íÁÒËÅÒ `%s' É ÎÏÄÁ `%s' ÓÓÙÌÁÀÔÓÑ ÎÁ ÏÄÎÏ É ÔÏ ÖÅ ÉÍÑ ÆÁÊÌÁ"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "óÎÏÓËÉ ÉÚ ÓÎÏÓÏË ÚÁÐÒÅÝÅÎÙ"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "ÎÁ ÎÏÄÕ `%s' ÎÅÔ ÓÓÙÌÏË"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "ÁÒÇÕÍÅÎÔÙ ÄÌÑ @%s ÉÇÎÏÒÉÒÏ×ÁÎÙ"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
# ÚÄÅÓØ %s ÍÏÖÅÔ ÂÙÔØ `cross' ÉÌÉ `menu'
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s ÎÁ ÎÅÓÕÝÅÓÔ×ÕÀÝÕÀ ÎÏÄÕ `%s' (×ÏÚÍÏÖÎÏ, ÎÅÐÒÁ×ÉÌØÎÏ ÏÐÉÓÁÎÁ ÓÔÒÕËÔÕÒÁ "
"ÇÌÁ×?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "íÁËÒÏ `%s' ×ÙÚ×ÁÎÏ ÎÁ ÓÔÒÏËÅ %d Ó ÉÚÌÉÛÎÉÍÉ ÁÒÇÕÍÅÎÔÁÍÉ"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "ÐÏÓÌÅ \\ × ÒÁÓËÒÙÔÉÉ ÍÁËÒÏ ÓÔÏÉÔ `%s', Á ÎÅ ÉÍÑ ÐÁÒÁÍÅÔÒÁ"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "ÄÌÑ `%s' ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ × ÉÍÅÎÎÏÍ ÕËÁÚÁÔÅÌÅ\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "ÎÅÌØÚÑ ÚÁÄÁ×ÁÔØ @item × ÁÒÇÕÍÅÎÔÅ ÄÌÑ @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "ÍÁËÒÏ `%s' ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ ÒÁÎØÛÅ"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "äÌÑ ÓÎÏÓËÉ `%s' ÎÅÔ ÚÁËÒÙ×ÁÀÝÅÊ ÆÉÇÕÒÎÏÊ ÓËÏÂËÉ"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "ëÏÍÁÎÄÁ %c%s ÕÓÔÁÒÅÌÁ É ÎÅ ÉÓÐÏÌØÚÕÅÔÓÑ"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "ÍÁËÒÏ `%s' ÂÙÌÏ ÏÐÒÅÄÅÌÅÎÏ ÒÁÎØÛÅ"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s ÐÏÄÒÁÚÕÍÅ×ÁÅÔ ÆÉÇÕÒÎÙÅ ÓËÏÂËÉ"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: ÐÕÓÔÏÊ ÆÁÊÌ"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "@tab ×ÎÅ ÔÁÂÌÉÃÙ ÉÇÎÏÒÉÒÏ×ÁÎ"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s ÏÖÉÄÁÅÔ × ËÁÞÅÓÔ×Å ÁÒÇÕÍÅÎÔÁ `i' ÉÌÉ `j', Á ÎÅ `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "îÅÏÐÒÅÄÅÌÅÎÎÁÑ ËÏÍÁÎÄÁ: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÓËÏÂËÁ"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s ÐÒÏÐÕÝÅÎÁ ÚÁËÒÙ×ÁÀÝÁÑ ÓËÏÂËÁ"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "ÄÌÑ `%s' ÎÅ ÎÁÊÄÅÎÏ ×ÈÏÖÄÅÎÉÊ × ÉÍÅÎÎÏÍ ÕËÁÚÁÔÅÌÅ\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `%s'."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ ÆÁÊÌ `%s' × ËÏÍÁÎÄÅ @image (ÄÌÑ HTML): %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Note...} ÓÏÚÄÁÅÔ × Info ÌÏÖÎÕÀ ÐÅÒÅËÒÅÓÔÎÕÀ ÓÓÙÌËÕ; ÐÅÒÅÆÒÁÚÉÒÕÊÔÅ "
-"ÔÅËÓÔ, ÞÔÏÂÙ ÉÚÂÅÖÁÔØ ÜÔÏÇÏ"
-
-#: texi2html/formats/info.init:1352
-msgid "`.' or `,' must follow address@hidden"
+#: texi2html/formats/info.pm:1352
+msgid "`.' or `,' must follow @xref."
msgstr ""
-#: texi2html/formats/info.init:1357
-#, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "ÏÛÉÂËÁ ÚÁÐÉÓÉ × `%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "îÅÉÚ×ÅÓÔÎÁÑ ËÏÍÁÎÄÁ `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ ×ÙÈÏÄÎÏÊ ÆÁÊÌ `%s'"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4066,7 +4118,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
@@ -4082,7 +4134,7 @@
msgstr "ÎÅÌØÚÑ ÚÁÄÁ×ÁÔØ @item × ÁÒÇÕÍÅÎÔÅ ÄÌÑ @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ, ÚÁÄÁÀÝÉÊ ÆÁÊÌ.\n"
@@ -4155,156 +4207,164 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÕÔÒÉ ÂÌÏËÁ address@hidden'"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "îÕÖÎÏ ÂÙÔØ × ÂÌÏËÅ address@hidden', ÞÔÏÂÙ ÉÓÐÏÌØÚÏ×ÁÔØ address@hidden'"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu ×ÓÔÒÅÞÅÎÏ ÐÅÒÅÄ ÐÅÒ×ÏÊ @node, ÂÕÄÅÔ ÓÏÚÄÁÎÁ ÎÏÄÁ `Top'"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "ïÖÉÄÁÅÔÓÑ `%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s ÎÅ ÉÍÅÅÔ ÓÍÙÓÌÁ ×ÎÅ ÂÌÏËÁ address@hidden'"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: ÐÒÏÐÕÝÅÎ ÁÒÇÕÍÅÎÔ, ÚÁÄÁÀÝÉÊ ÆÁÊÌ.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "ðÌÏÈÏÊ ÁÒÇÕÍÅÎÔ ÄÌÑ @%s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s ÁÒÇÕÍÅÎÔ ÄÏÌÖÅÎ ÂÙÔØ ÞÉÓÌÏ×ÙÍ, ÎÅ `%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: ÁÒÇÕÍÅÎÔ --footnote-style ÄÏÌÖÅÎ ÂÙÔØ `separate' ÉÌÉ `end'; Á ÎÅ `%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: ÎÅ×ÏÚÍÏÖÎÏ ÏÔËÒÙÔØ css-ÆÁÊÌ: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "îÅ×ÏÚÍÏÖÎÏ ÓÏÚÄÁÔØ ËÁÔÁÌÏÇ `%s': %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "÷ ÜÔÏÊ ÎÏÄÅ ÎÅÔ ÍÅÎÀ."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(×ÎÅ ËÁËÏÊ-ÌÉÂÏ ÎÏÄÙ)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `%s'."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "ÎÅ×ÏÚÍÏÖÎÏ ÐÒÏÞÉÔÁÔØ @image ÆÁÊÌ `%s': %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "îÅ×ÏÚÍÏÖÎÏ ÎÁÊÔÉ ÎÏÄÕ `%s'."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Note...} ÓÏÚÄÁÅÔ × Info ÌÏÖÎÕÀ ÐÅÒÅËÒÅÓÔÎÕÀ ÓÓÙÌËÕ; "
+#~ "ÐÅÒÅÆÒÁÚÉÒÕÊÔÅ ÔÅËÓÔ, ÞÔÏÂÙ ÉÚÂÅÖÁÔØ ÜÔÏÇÏ"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: ÐÒÅÄÕÐÒÅÖÄÅÎÉÅ: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "éÍÅÎÎÏÊ ÕËÁÚÁÔÅÌØ `%s' ÕÖÅ ÓÕÝÅÓÔ×ÕÅÔ"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: ÎÅÄÏÐÕÓÔÉÍÙÊ ËÌÀÞ -- %c\n"
Index: po/rw.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/rw.po,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- po/rw.po 20 Mar 2011 21:20:29 -0000 1.38
+++ po/rw.po 9 Apr 2011 00:10:41 -0000 1.39
@@ -16,7 +16,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.7.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2005-04-04 10:55-0700\n"
"Last-Translator: Steven Michael Murphy <address@hidden>\n"
"Language-Team: Kinyarwanda <address@hidden>\n"
@@ -90,12 +90,12 @@
msgid "memory exhausted"
msgstr ""
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
#, fuzzy
msgid "Move forward a character"
msgstr "Imbere a Inyuguti"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
#, fuzzy
msgid "Move backward a character"
msgstr "subira inyuma a Inyuguti"
@@ -110,12 +110,12 @@
msgid "Move to the end of this line"
msgstr "Kuri i Impera Bya iyi Umurongo"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
#, fuzzy
msgid "Move forward a word"
msgstr "Imbere a ijambo"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
#, fuzzy
msgid "Move backward a word"
msgstr "subira inyuma a ijambo"
@@ -213,6 +213,7 @@
msgstr ""
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr ""
@@ -226,6 +227,7 @@
msgstr ""
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr ""
@@ -254,12 +256,12 @@
msgstr "Hejuru a Ikurikiranyanyuguti in i Umubarendanga kugirango iyi IDOSIYE"
#: info/indices.c:201
-#, fuzzy
+#, fuzzy, c-format
msgid "Finding index entries..."
msgstr "Umubarendanga Ibyinjijwe"
#: info/indices.c:209
-#, fuzzy
+#, fuzzy, c-format
msgid "No indices found."
msgstr "ibimenyetso Byabonetse"
@@ -278,12 +280,12 @@
"Komandi:"
#: info/indices.c:367
-#, fuzzy
+#, fuzzy, c-format
msgid "No previous index search string."
msgstr "Ibanjirije Umubarendanga Gushaka Ikurikiranyanyuguti"
#: info/indices.c:374
-#, fuzzy
+#, fuzzy, c-format
msgid "No index entries."
msgstr "Umubarendanga Ibyinjijwe"
@@ -335,13 +337,13 @@
"* Menu: Nodes whose indices contain `%s':\n"
msgstr "*bya ibimenyetso"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, fuzzy, c-format
msgid "Try --help for more information.\n"
msgstr "Ifashayobora kugirango Birenzeho Ibisobanuro"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -351,12 +353,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, fuzzy, c-format
msgid "no index entries found for `%s'\n"
msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -364,7 +366,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -374,7 +376,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -382,7 +384,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -390,12 +392,12 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr "-B Kuri"
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -405,7 +407,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -415,13 +417,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -435,7 +437,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
#, fuzzy
msgid ""
@@ -445,82 +447,82 @@
"Texinfo home page: http://www.gnu.org/software/texinfo/";
msgstr "org."
-#: info/info.c:696
+#: info/info.c:716
#, fuzzy, c-format
msgid "Cannot find node `%s'."
msgstr "Gushaka"
-#: info/info.c:697
+#: info/info.c:717
#, fuzzy, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Gushaka"
-#: info/info.c:698
+#: info/info.c:718
#, fuzzy
msgid "Cannot find a window!"
msgstr "Gushaka a Idirishya"
-#: info/info.c:699
+#: info/info.c:719
#, fuzzy
msgid "Point doesn't appear within this window's node!"
msgstr "Kugaragara muri iyi"
-#: info/info.c:700
+#: info/info.c:720
#, fuzzy
msgid "Cannot delete the last window."
msgstr "Gusiba i Iheruka Idirishya"
-#: info/info.c:701
+#: info/info.c:721
#, fuzzy
msgid "No menu in this node."
msgstr "Ibikubiyemo in iyi"
-#: info/info.c:702
+#: info/info.c:722
#, fuzzy
msgid "No footnotes in this node."
msgstr "Ubusobanuro mpezarupapuro in iyi"
-#: info/info.c:703
+#: info/info.c:723
#, fuzzy
msgid "No cross references in this node."
msgstr "Kwambukiranya Indango in iyi"
-#: info/info.c:704
+#: info/info.c:724
#, fuzzy, c-format
msgid "No `%s' pointer for this node."
msgstr "Mweretsi kugirango iyi"
-#: info/info.c:705
+#: info/info.c:725
#, fuzzy, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Komandi: kugirango Ifashayobora"
-#: info/info.c:706
+#: info/info.c:726
#, fuzzy, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Ubwoko ni OYA Cyiza Kuri Gukoresha"
-#: info/info.c:707
+#: info/info.c:727
#, fuzzy
msgid "You are already at the last page of this node."
msgstr "ku i Iheruka Ipaji Bya iyi"
-#: info/info.c:708
+#: info/info.c:728
#, fuzzy
msgid "You are already at the first page of this node."
msgstr "ku i Itangira Ipaji Bya iyi"
-#: info/info.c:709
+#: info/info.c:729
#, fuzzy
msgid "Only one window."
msgstr "Idirishya"
-#: info/info.c:710
+#: info/info.c:730
#, fuzzy
msgid "Resulting window would be too small."
msgstr "Idirishya Gitoya"
-#: info/info.c:711
+#: info/info.c:731
#, fuzzy
msgid "Not enough room for a help window, please delete a window."
msgstr "kugirango a Ifashayobora Idirishya Gusiba a Idirishya"
@@ -852,19 +854,19 @@
"Byabonetse"
#: info/infodoc.c:312
-#, fuzzy
+#, fuzzy, c-format
msgid "The current search path is:\n"
msgstr "KIGEZWEHO Gushaka Inzira ni"
#: info/infodoc.c:316
-#, fuzzy
+#, fuzzy, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
msgstr "Bihari in"
#: info/infodoc.c:320
-#, fuzzy
+#, fuzzy, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -878,73 +880,73 @@
msgstr "Amabwiriza Biturutse"
#: info/infodoc.c:347
-#, fuzzy
+#, fuzzy, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
msgstr "Amabwiriza ku Byose"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
#, fuzzy
msgid "Display help message"
msgstr "Ifashayobora Ubutumwa"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
#, fuzzy
msgid "Visit Info node `(info)Help'"
msgstr "Ibisobanuro"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
#, fuzzy
msgid "Print documentation for KEY"
msgstr "kugirango"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, fuzzy, c-format
msgid "Describe key: %s"
msgstr "Urufunguzo"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, fuzzy, c-format
msgid "ESC %s is undefined."
msgstr "ni kidasobanuye"
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, fuzzy, c-format
msgid "%s is undefined."
msgstr "%sni kidasobanuye"
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, fuzzy, c-format
msgid "%s is defined to %s."
msgstr "%sni Kuri"
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
#, fuzzy
msgid "Show what to type to execute a given command"
msgstr "Kuri Ubwoko Kuri Gukora a Komandi:"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
#, fuzzy
msgid "Where is command: "
msgstr "ni Komandi:"
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, fuzzy, c-format
msgid "`%s' is not on any keys"
msgstr "`%s'ni OYA ku Utubuto"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, fuzzy, c-format
msgid "%s can only be invoked via %s."
msgstr "%sBiturutse"
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, fuzzy, c-format
msgid "%s can be invoked via %s."
msgstr "%sBiturutse"
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, fuzzy, c-format
msgid "There is no function named `%s'"
msgstr "ni Oya Umumaro"
@@ -956,102 +958,102 @@
"----------------------\n"
msgstr "Ikindi"
-#: info/infokey.c:170
-#, fuzzy
+#: info/infokey.c:169
+#, fuzzy, c-format
msgid "incorrect number of arguments"
msgstr "Umubare Bya ingingo"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, fuzzy, c-format
msgid "cannot open input file `%s'"
msgstr "Gufungura Iyinjiza IDOSIYE"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, fuzzy, c-format
msgid "cannot create output file `%s'"
msgstr "Kurema Ibisohoka IDOSIYE"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, fuzzy, c-format
msgid "error writing to `%s'"
msgstr "Ikosa Kuri"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, fuzzy, c-format
msgid "error closing output file `%s'"
msgstr "Ikosa Ibisohoka IDOSIYE"
-#: info/infokey.c:450
-#, fuzzy
+#: info/infokey.c:449
+#, fuzzy, c-format
msgid "key sequence too long"
msgstr "Urufunguzo"
-#: info/infokey.c:529
-#, fuzzy
+#: info/infokey.c:527
+#, fuzzy, c-format
msgid "missing key sequence"
msgstr "Ibuze Urufunguzo"
-#: info/infokey.c:610
-#, fuzzy
+#: info/infokey.c:607
+#, fuzzy, c-format
msgid "NUL character (\\000) not permitted"
msgstr "Inyuguti OYA"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, fuzzy, c-format
msgid "NUL character (^%c) not permitted"
msgstr "Inyuguti OYA"
-#: info/infokey.c:665
-#, fuzzy
+#: info/infokey.c:660
+#, fuzzy, c-format
msgid "missing action name"
msgstr "Ibuze Igikorwa Izina:"
-#: info/infokey.c:681 info/infokey.c:756
-#, fuzzy
+#: info/infokey.c:675 info/infokey.c:745
+#, fuzzy, c-format
msgid "section too long"
msgstr "Icyiciro"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, fuzzy, c-format
msgid "unknown action `%s'"
msgstr "Kitazwi Igikorwa"
-#: info/infokey.c:698
-#, fuzzy
+#: info/infokey.c:691
+#, fuzzy, c-format
msgid "action name too long"
msgstr "Igikorwa Izina:"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, fuzzy, c-format
msgid "extra characters following action `%s'"
msgstr "Birenga Inyuguti Igikorwa"
-#: info/infokey.c:723
-#, fuzzy
+#: info/infokey.c:715
+#, fuzzy, c-format
msgid "missing variable name"
msgstr "Ibuze IMPINDURAGACIRO Izina:"
-#: info/infokey.c:733
-#, fuzzy
+#: info/infokey.c:724
+#, fuzzy, c-format
msgid "missing `=' immediately after variable name"
msgstr "Ibuze Ako kanya Nyuma IMPINDURAGACIRO Izina:"
-#: info/infokey.c:741
-#, fuzzy
+#: info/infokey.c:731
+#, fuzzy, c-format
msgid "variable name too long"
msgstr "IMPINDURAGACIRO Izina:"
-#: info/infokey.c:765
-#, fuzzy
+#: info/infokey.c:753
+#, fuzzy, c-format
msgid "value too long"
msgstr "Agaciro"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, fuzzy, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\",Umurongo"
-#: info/infokey.c:906
+#: info/infokey.c:899
#, fuzzy, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1104,12 +1106,12 @@
msgstr "IDOSIYE Icyiciro ITEGEKONGENGA Gukoresha Kuri Kuvugurura"
#: info/infomap.c:1171
-#, fuzzy
+#, fuzzy, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Ibyatanzwe in IDOSIYE Urufunguzo Ibyafataranyijwe"
#: info/infomap.c:1221
-#, fuzzy
+#, fuzzy, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "Ibyatanzwe in IDOSIYE VAR Amagenamiterere"
@@ -1129,7 +1131,7 @@
msgstr "a Komandi: Izina: in i Ubuso Na Gukora"
#: info/m-x.c:139
-#, fuzzy
+#, fuzzy, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Gukora Komandi:"
@@ -1192,7 +1194,7 @@
msgid "Select visited node: "
msgstr ""
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, fuzzy, c-format
msgid "The reference disappeared! (%s)."
msgstr "Indango"
@@ -1202,7 +1204,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, fuzzy, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1211,93 +1213,93 @@
"Kuri Verisiyo Kubona Ifashayobora Idirishya kugirango Ifashayobora "
"Ibikubiyemo Ikintu kugirango Ibikubiyemo Ikintu"
-#: info/session.c:630
+#: info/session.c:619
#, fuzzy
msgid "Move down to the next line"
msgstr "Hasi Kuri i Komeza>> Umurongo"
-#: info/session.c:682
+#: info/session.c:671
#, fuzzy
msgid "Move up to the previous line"
msgstr "Hejuru Kuri i Ibanjirije Umurongo"
-#: info/session.c:952
+#: info/session.c:941
#, fuzzy
msgid "Move to the end of the line"
msgstr "Kuri i Impera Bya i Umurongo"
-#: info/session.c:963
+#: info/session.c:952
#, fuzzy
msgid "Move to the start of the line"
msgstr "Kuri i Gutangira Bya i Umurongo"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Ikurikira"
-#: info/session.c:1179 info/session.c:1304
-#, fuzzy
+#: info/session.c:1168 info/session.c:1293
+#, fuzzy, c-format
msgid "No more nodes within this document."
msgstr "Birenzeho muri iyi Inyandiko"
-#: info/session.c:1330
-#, fuzzy
+#: info/session.c:1319
+#, fuzzy, c-format
msgid "No `Prev' for this node."
msgstr "kugirango iyi"
-#: info/session.c:1350
-#, fuzzy
+#: info/session.c:1339
+#, fuzzy, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Cyangwa kugirango iyi muri iyi Inyandiko"
-#: info/session.c:1412
+#: info/session.c:1401
#, fuzzy
msgid "Move forwards or down through node structure"
msgstr "Cyangwa Hasi Gihinguranya Imiterere"
-#: info/session.c:1428
+#: info/session.c:1417
#, fuzzy
msgid "Move backwards or up through node structure"
msgstr "Inyuma Cyangwa Hejuru Gihinguranya Imiterere"
-#: info/session.c:1529
+#: info/session.c:1518
#, fuzzy
msgid "Scroll forward in this window"
msgstr "Imbere in iyi Idirishya"
-#: info/session.c:1537
+#: info/session.c:1526
#, fuzzy
msgid "Scroll forward in this window and set default window size"
msgstr "Imbere in iyi Idirishya Na Gushyiraho Mburabuzi Idirishya Ingano"
-#: info/session.c:1545
+#: info/session.c:1534
#, fuzzy
msgid "Scroll forward in this window staying within node"
msgstr "Imbere in iyi Idirishya muri"
-#: info/session.c:1553
+#: info/session.c:1542
#, fuzzy
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr "Imbere in iyi Idirishya muri Na Gushyiraho Mburabuzi Idirishya Ingano"
-#: info/session.c:1561
+#: info/session.c:1550
#, fuzzy
msgid "Scroll backward in this window"
msgstr "subira inyuma in iyi Idirishya"
-#: info/session.c:1569
+#: info/session.c:1558
#, fuzzy
msgid "Scroll backward in this window and set default window size"
msgstr ""
"subira inyuma in iyi Idirishya Na Gushyiraho Mburabuzi Idirishya Ingano"
-#: info/session.c:1578
+#: info/session.c:1567
#, fuzzy
msgid "Scroll backward in this window staying within node"
msgstr "subira inyuma in iyi Idirishya muri"
-#: info/session.c:1586
+#: info/session.c:1575
#, fuzzy
msgid ""
"Scroll backward in this window staying within node and set default window "
@@ -1305,490 +1307,494 @@
msgstr ""
"subira inyuma in iyi Idirishya muri Na Gushyiraho Mburabuzi Idirishya Ingano"
-#: info/session.c:1594
+#: info/session.c:1583
#, fuzzy
msgid "Move to the start of this node"
msgstr "Kuri i Gutangira Bya iyi"
-#: info/session.c:1601
+#: info/session.c:1590
#, fuzzy
msgid "Move to the end of this node"
msgstr "Kuri i Impera Bya iyi"
-#: info/session.c:1608
+#: info/session.c:1597
#, fuzzy
msgid "Scroll down by lines"
msgstr "Hasi ku Imirongo"
-#: info/session.c:1625
+#: info/session.c:1614
#, fuzzy
msgid "Scroll up by lines"
msgstr "Hejuru ku Imirongo"
-#: info/session.c:1643
+#: info/session.c:1632
#, fuzzy
msgid "Scroll down by half screen size"
msgstr "Hasi ku Mugaragaza Ingano"
-#: info/session.c:1669
+#: info/session.c:1658
#, fuzzy
msgid "Scroll up by half screen size"
msgstr "Hejuru ku Mugaragaza Ingano"
-#: info/session.c:1698
+#: info/session.c:1687
#, fuzzy
msgid "Select the next window"
msgstr "i Komeza>> Idirishya"
-#: info/session.c:1737
+#: info/session.c:1726
#, fuzzy
msgid "Select the previous window"
msgstr "i Ibanjirije Idirishya"
-#: info/session.c:1788
+#: info/session.c:1777
#, fuzzy
msgid "Split the current window"
msgstr "i KIGEZWEHO Idirishya"
-#: info/session.c:1869
+#: info/session.c:1858
#, fuzzy
msgid "Delete the current window"
msgstr "i KIGEZWEHO Idirishya"
-#: info/session.c:1877
-#, fuzzy
+#: info/session.c:1866
+#, fuzzy, c-format
msgid "Cannot delete a permanent window"
msgstr "Gusiba a Idirishya"
-#: info/session.c:1909
+#: info/session.c:1898
#, fuzzy
msgid "Delete all other windows"
msgstr "Byose Ikindi"
-#: info/session.c:1955
+#: info/session.c:1944
#, fuzzy
msgid "Scroll the other window"
msgstr "i Ikindi Idirishya"
-#: info/session.c:1976
+#: info/session.c:1965
#, fuzzy
msgid "Scroll the other window backward"
msgstr "i Ikindi Idirishya subira inyuma"
-#: info/session.c:1982
+#: info/session.c:1971
#, fuzzy
msgid "Grow (or shrink) this window"
msgstr "Cyangwa Kugabanuka iyi Idirishya"
-#: info/session.c:1993
+#: info/session.c:1982
#, fuzzy
msgid "Divide the available screen space among the visible windows"
msgstr "i Bihari Mugaragaza Umwanya i Kigaragara"
-#: info/session.c:2000
+#: info/session.c:1989
#, fuzzy
msgid "Toggle the state of line wrapping in the current window"
msgstr "i Leta Bya Umurongo in i KIGEZWEHO Idirishya"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
#, fuzzy
msgid "Select the Next node"
msgstr "i"
-#: info/session.c:2191
+#: info/session.c:2180
#, fuzzy
msgid "Select the Prev node"
msgstr "i"
-#: info/session.c:2199
+#: info/session.c:2188
#, fuzzy
msgid "Select the Up node"
msgstr "i"
-#: info/session.c:2206
+#: info/session.c:2195
#, fuzzy
msgid "Select the last node in this file"
msgstr "i Iheruka in iyi IDOSIYE"
-#: info/session.c:2233 info/session.c:2266
-#, fuzzy
+#: info/session.c:2222 info/session.c:2255
+#, fuzzy, c-format
msgid "This window has no additional nodes"
msgstr "Idirishya Oya"
-#: info/session.c:2239
+#: info/session.c:2228
#, fuzzy
msgid "Select the first node in this file"
msgstr "i Itangira in iyi IDOSIYE"
-#: info/session.c:2273
+#: info/session.c:2262
#, fuzzy
msgid "Select the last item in this node's menu"
msgstr "i Iheruka Ikintu in iyi Ibikubiyemo"
-#: info/session.c:2279
+#: info/session.c:2268
#, fuzzy
msgid "Select this menu item"
msgstr "iyi Ibikubiyemo Ikintu"
-#: info/session.c:2312
+#: info/session.c:2301
#, fuzzy, c-format
msgid "There aren't %d items in this menu."
msgstr "in iyi Ibikubiyemo"
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, fuzzy, c-format
msgid "Menu item (%s): "
msgstr "Ikintu"
-#: info/session.c:2510
+#: info/session.c:2499
#, fuzzy
msgid "Menu item: "
msgstr "Ikintu"
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, fuzzy, c-format
msgid "Follow xref (%s): "
msgstr "X- Ngenderwaho"
-#: info/session.c:2521
+#: info/session.c:2510
#, fuzzy
msgid "Follow xref: "
msgstr "X- Ngenderwaho"
-#: info/session.c:2650
+#: info/session.c:2639
#, fuzzy
msgid "Read a menu item and select its node"
msgstr "a Ibikubiyemo Ikintu Na Guhitamo"
-#: info/session.c:2658
+#: info/session.c:2647
#, fuzzy
msgid "Read a footnote or cross reference and select its node"
msgstr "a Ubusobanuro mpezarupapuro Cyangwa Kwambukiranya Indango Na Guhitamo"
-#: info/session.c:2664
+#: info/session.c:2653
#, fuzzy
msgid "Move to the start of this node's menu"
msgstr "Kuri i Gutangira Bya iyi Ibikubiyemo"
-#: info/session.c:2686
+#: info/session.c:2675
#, fuzzy
msgid "Visit as many menu items at once as possible"
msgstr "Nka Ibikubiyemo ku Rimwe Nka"
-#: info/session.c:2714
+#: info/session.c:2703
#, fuzzy
msgid "Read a node name and select it"
msgstr "a Izina: Na Guhitamo"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr ""
-#: info/session.c:2838
+#: info/session.c:2828
#, fuzzy, c-format
msgid "No menu in node `%s'."
msgstr "Ibikubiyemo in"
-#: info/session.c:2884
+#: info/session.c:2875
#, fuzzy, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Ibikubiyemo Ikintu in"
-#: info/session.c:2914
+#: info/session.c:2907
#, fuzzy, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Kuri Gushaka ku in"
-#: info/session.c:2964
+#: info/session.c:2957
#, fuzzy
msgid "Read a list of menus starting from dir and follow them"
msgstr "a Urutonde Bya Ibikubiyemo Bivuye Na"
-#: info/session.c:2966
+#: info/session.c:2959
#, fuzzy
msgid "Follow menus: "
msgstr "Ibikubiyemo"
-#: info/session.c:3159
+#: info/session.c:3151
#, fuzzy
msgid "Find the node describing program invocation"
msgstr "i Porogaramu"
-#: info/session.c:3161
+#: info/session.c:3153
#, fuzzy, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Bya"
-#: info/session.c:3199
+#: info/session.c:3191
#, fuzzy
msgid "Read a manpage reference and select it"
msgstr "a Indango Na Guhitamo"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr ""
-#: info/session.c:3233
+#: info/session.c:3225
#, fuzzy
msgid "Select the node `Top' in this file"
msgstr "i in iyi IDOSIYE"
-#: info/session.c:3239
+#: info/session.c:3231
#, fuzzy
msgid "Select the node `(dir)'"
msgstr "i"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr ""
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr ""
-#: info/session.c:3320
-#, fuzzy
+#: info/session.c:3312
+#, fuzzy, c-format
msgid "Cannot kill the last node"
msgstr "i Iheruka"
-#: info/session.c:3406
+#: info/session.c:3398
#, fuzzy
msgid "Select the most recently selected node"
msgstr "i Byahiswemo"
-#: info/session.c:3412
+#: info/session.c:3404
#, fuzzy
msgid "Kill this node"
msgstr "iyi"
-#: info/session.c:3420
+#: info/session.c:3412
#, fuzzy
msgid "Read the name of a file and select it"
msgstr "i Izina: Bya a IDOSIYE Na Guhitamo"
-#: info/session.c:3424
+#: info/session.c:3416
#, fuzzy
msgid "Find file: "
msgstr "IDOSIYE"
-#: info/session.c:3441
+#: info/session.c:3433
#, fuzzy, c-format
msgid "Cannot find `%s'."
msgstr "Gushaka"
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, fuzzy, c-format
msgid "Could not create output file `%s'."
msgstr "OYA Kurema Ibisohoka IDOSIYE"
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Byakozwe."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr ""
-#: info/session.c:3629
+#: info/session.c:3621
#, fuzzy
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "i Ibigize Bya iyi Gihinguranya"
-#: info/session.c:3664
+#: info/session.c:3656
#, fuzzy, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Gufungura Kuri"
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr ""
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "Kuri i Itangiriro Bya i Umurongo"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr ""
-#: info/session.c:4042
+#: info/session.c:4034
#, fuzzy
msgid "Read a string and search for it case-sensitively"
msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
-#: info/session.c:4049
+#: info/session.c:4041
#, fuzzy
msgid "Read a string and search for it"
msgstr "a Ikurikiranyanyuguti Na Gushaka kugirango"
-#: info/session.c:4057
+#: info/session.c:4049
#, fuzzy
msgid "Read a string and search backward for it"
msgstr "a Ikurikiranyanyuguti Na Gushaka subira inyuma kugirango"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%sforIkurikiranyanyuguti"
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr ""
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "Gushaka usubira inyuma"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Gushaka"
-#: info/session.c:4142
-#, fuzzy
+#: info/session.c:4134
+#, fuzzy, c-format
msgid "Search failed."
msgstr "Byanze"
-#: info/session.c:4160
+#: info/session.c:4152
#, fuzzy
msgid "Repeat last search in the same direction"
msgstr "Iheruka Gushaka in i Icyerekezo"
-#: info/session.c:4163 info/session.c:4173
-#, fuzzy
+#: info/session.c:4155 info/session.c:4165
+#, fuzzy, c-format
msgid "No previous search string"
msgstr "Ibanjirije Gushaka Ikurikiranyanyuguti"
-#: info/session.c:4170
+#: info/session.c:4162
#, fuzzy
msgid "Repeat last search in the reverse direction"
msgstr "Iheruka Gushaka in i Ihindurakerekezo Icyerekezo"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
#, fuzzy
msgid "Search interactively for a string as you type it"
msgstr "kugirango a Ikurikiranyanyuguti Nka Ubwoko"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "Gushaka subira inyuma"
-#: info/session.c:4276
+#: info/session.c:4268
#, fuzzy
msgid "I-search backward: "
msgstr "Gushaka subira inyuma"
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "Gushaka"
-#: info/session.c:4279
+#: info/session.c:4271
#, fuzzy
msgid "I-search: "
msgstr "Gushaka"
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr ""
-#: info/session.c:4797
+#: info/session.c:4789
#, fuzzy
msgid "Move to the previous cross reference"
msgstr "Kuri i Ibanjirije Kwambukiranya Indango"
-#: info/session.c:4815
+#: info/session.c:4807
#, fuzzy
msgid "Move to the next cross reference"
msgstr "Kuri i Komeza>> Kwambukiranya Indango"
-#: info/session.c:4837
+#: info/session.c:4829
#, fuzzy
msgid "Select reference or menu item appearing on this line"
msgstr "Indango Cyangwa Ibikubiyemo Ikintu ku iyi Umurongo"
-#: info/session.c:4860
+#: info/session.c:4852
#, fuzzy
msgid "Cancel current operation"
msgstr "KIGEZWEHO"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Kuvamo"
-#: info/session.c:4876
+#: info/session.c:4868
#, fuzzy
msgid "Move the cursor to a specific line of the window"
msgstr "i indanga Kuri a Umurongo Bya i Idirishya"
-#: info/session.c:4908
+#: info/session.c:4900
#, fuzzy
msgid "Redraw the display"
msgstr "i Kugaragaza"
-#: info/session.c:4945
+#: info/session.c:4937
#, fuzzy
msgid "Quit using Info"
msgstr "ikoresha"
-#: info/session.c:4958
+#: info/session.c:4950
#, fuzzy
msgid "Run command bound to this key's lowercase variant"
msgstr "Komandi: Kuri iyi Inyuguti nto"
-#: info/session.c:4969
+#: info/session.c:4961
#, fuzzy, c-format
msgid "Unknown command (%s)."
msgstr "Komandi:"
-#: info/session.c:4972
+#: info/session.c:4964
#, fuzzy, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\"ni Sibyo"
-#: info/session.c:4973
+#: info/session.c:4965
#, fuzzy, c-format
msgid "`%s' is invalid"
msgstr "`%s'ni Sibyo"
-#: info/session.c:5188
+#: info/session.c:5180
#, fuzzy
msgid "Add this digit to the current numeric argument"
msgstr "iyi Kuri i KIGEZWEHO Bikurikije umubare"
-#: info/session.c:5197
+#: info/session.c:5189
#, fuzzy
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Gutangira Cyangwa Gukuba ku 4. i KIGEZWEHO Bikurikije umubare"
-#: info/session.c:5212
+#: info/session.c:5204
#, fuzzy
msgid "Internally used by \\[universal-argument]"
msgstr "ku Ky'isi yose"
@@ -1913,31 +1919,26 @@
msgid " Subfile: %s"
msgstr ""
-#: install-info/install-info.c:221
-#, fuzzy, c-format
-msgid "%s: warning: "
-msgstr "%s:Iburira"
-
-#: install-info/install-info.c:270
+#: install-info/install-info.c:285
#, fuzzy, c-format
-msgid " for %s"
+msgid "%s for %s"
msgstr "ya:"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, fuzzy, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "kugirango a Byuzuye Urutonde Bya Amahitamo"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr ""
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1951,7 +1952,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1967,7 +1968,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1982,7 +1983,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1998,14 +1999,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -2013,7 +2014,7 @@
"Texinfo home page: http://www.gnu.org/software/texinfo/";
msgstr "org."
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, fuzzy, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2037,65 +2038,67 @@
"kugirango Itangira i Bikorwa Kanda Imbeba Akabuto 2. ku a Ibikubiyemo Ikintu "
"Cyangwa Kwambukiranya Kuri Guhitamo"
-#: install-info/install-info.c:627
+#: install-info/install-info.c:640
#, fuzzy, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s:OYA Gusoma Na OYA Kurema"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, fuzzy, c-format
msgid "%s: empty file"
msgstr "%s:ubusa IDOSIYE"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, fuzzy, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s:IDOSIYE"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, fuzzy, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s:i IDOSIYE Rimwe"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, fuzzy, c-format
msgid "excess command line argument `%s'"
msgstr "Komandi: Umurongo"
-#: install-info/install-info.c:2164
-#, fuzzy
+#: install-info/install-info.c:2175
+#, fuzzy, c-format
msgid "No input file specified; try --help for more information."
msgstr "Iyinjiza IDOSIYE Ifashayobora kugirango Birenzeho Ibisobanuro"
-#: install-info/install-info.c:2167
-#, fuzzy
+#: install-info/install-info.c:2177
+#, fuzzy, c-format
msgid "No dir file specified; try --help for more information."
msgstr "IDOSIYE Ifashayobora kugirango Birenzeho Ibisobanuro"
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, fuzzy, c-format
msgid "no info dir entry in `%s'"
msgstr "Oya Ibisobanuro Icyinjijwe in"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, fuzzy, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "Oya Ibyinjijwe Byabonetse kugirango Cyasibwe"
@@ -2167,7 +2170,7 @@
msgstr "Inyuguti in VAR"
#: makeinfo/cmds.c:1182
-#, fuzzy
+#, fuzzy, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@Byose Inyuguti nkuru Oya INGARUKA"
@@ -2177,7 +2180,7 @@
msgstr "`{'Ikitezwe:"
#: makeinfo/cmds.c:1277
-#, fuzzy
+#, fuzzy, c-format
msgid "end of file inside verb block"
msgstr "Impera Bya IDOSIYE Mo Imbere Ishinga Funga"
@@ -2186,8 +2189,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "`}'Ikitezwe:"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
-#, fuzzy
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, fuzzy, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2198,7 +2202,7 @@
msgid "%c%s is obsolete"
msgstr "%c%sni"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, fuzzy, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@SP a Bikurikije umubare OYA"
@@ -2208,17 +2212,17 @@
msgid "Bad argument to %c%s"
msgstr "Kuri"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr ""
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "ntacyo"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Kuri"
@@ -2229,33 +2233,33 @@
msgid "insert"
msgstr "Kongeramo"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Kuri"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
-#, fuzzy
+#, fuzzy, c-format
msgid "Missing `}' in @def arg"
msgstr "in"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, fuzzy, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "in Kuri Gukoresha"
@@ -2276,11 +2280,11 @@
msgstr "`%s'guhera Kuri"
#: makeinfo/files.c:693
-#, fuzzy
+#, fuzzy, c-format
msgid "Output buffer not empty."
msgstr "OYA ubusa"
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2300,12 +2304,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "kugirango Ubusobanuro mpezarupapuro"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr ""
#: makeinfo/footnote.c:209
-#, fuzzy
+#, fuzzy, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Mo Imbere Ubusobanuro mpezarupapuro OYA"
@@ -2318,22 +2323,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, fuzzy, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d:--IDOSIYE in Icyo wongeraho"
#: makeinfo/html.c:426
-#, fuzzy
+#, fuzzy, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[Oya HTML Itagi: Kuri"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, fuzzy, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[Sibyo Izina:"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, fuzzy, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Umubarendanga"
@@ -2363,14 +2368,14 @@
msgid "(line %*d)"
msgstr "(Umurongo"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, fuzzy, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Umubarendanga in"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, fuzzy, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "kugirango Umubarendanga Hanze Bya"
@@ -2381,7 +2386,7 @@
msgstr "(Hanze Bya"
#: makeinfo/insertion.c:162
-#, fuzzy
+#, fuzzy, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@Ikintu OYA in Kuri"
@@ -2391,7 +2396,7 @@
msgstr "in"
#: makeinfo/insertion.c:339
-#, fuzzy
+#, fuzzy, c-format
msgid "Enumeration stack overflow"
msgstr "Byarenze urugero"
@@ -2400,7 +2405,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "Byarenze urugero ku"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, fuzzy, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2411,14 +2416,14 @@
msgid "%cfloat environments cannot be nested"
msgstr ""
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, fuzzy, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden:"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2430,34 +2435,34 @@
msgstr "%sIbaruwa... Cyangwa"
#: makeinfo/insertion.c:1751
-#, fuzzy
+#, fuzzy, c-format
msgid "end of file inside verbatim block"
msgstr "Impera Bya IDOSIYE Mo Imbere Funga"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, fuzzy, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%sOYA Hanze"
#: makeinfo/insertion.c:2011
-#, fuzzy
+#, fuzzy, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
-#, fuzzy
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, fuzzy, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "Hejuru: in"
#: makeinfo/insertion.c:2024
-#, fuzzy
+#, fuzzy, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@Mbere Itangira"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, fuzzy, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%sOYA Hanze Na"
@@ -2467,9 +2472,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%sOYA Hanze"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2480,14 +2485,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s'Nyuma"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, fuzzy, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Kuri ikoresha"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, fuzzy, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%sOYA Mo Imbere Funga"
@@ -2532,17 +2537,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%sCyangwa Nka OYA"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, fuzzy, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%sa UMWE Inyuguti Cyangwa Nka"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, fuzzy, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "Makoro"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, fuzzy, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "ni i Ibanjirije Insobanuro Bya"
@@ -2557,53 +2562,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "ku Umurongo Na:"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, fuzzy, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cendMakoro OYA Byabonetse"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, fuzzy, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "Impera Na:"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, fuzzy, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Amakosa Hejuru"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, fuzzy, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d:Iburira"
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr ""
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, fuzzy, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "kugirango Birenzeho Ibisobanuro"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr ""
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
#, fuzzy
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
@@ -2612,7 +2619,7 @@
"Inkomoko Kuri Ikindi Imiterere ku Idosiye kugirango kiri kuri interineti Na: "
"Cyangwa"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, fuzzy, c-format
msgid ""
"General options:\n"
@@ -2632,7 +2639,7 @@
"Indango Mburabuzi v ni Byakozwe Verisiyo Kugaragaza Verisiyo Ibisobanuro Na "
"Gusohoka"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, fuzzy, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2642,7 +2649,7 @@
" --plaintext output plain text rather than Info.\n"
msgstr "Imiterere Ihitamo Mburabuzi ni Kuri InyandikoGitabo Ibisohoka HTML
Ibisohoka xml Ibisohoka Ibisohoka Byuzuye Umwandiko"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
#, fuzzy
msgid ""
"General output options:\n"
@@ -2667,7 +2674,7 @@
"Cyangwa Ibisohoka Ibisohoka IDOSIYE Umubare Ibyatoranyijwe Ibisohoka Umutwe "
"Na Imibare o Ibisohoka Ibisohoka Kuri bushyinguro NIBA Gutandukanya"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, fuzzy, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2695,7 +2702,7 @@
"Mburabuzi Igika Ikurura Ikurura Ibika ku Imyanya Mburabuzi ni OYA Ikurura "
"NIBA Gutandukanya Ingano Gutandukanya Idosiye ku Ingano Mburabuzi"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
#, fuzzy
msgid ""
"Options for HTML:\n"
@@ -2707,7 +2714,7 @@
" produce file names in ASCII transliteration.\n"
msgstr "kugirango Gushyiramo Gushyiramo in IMISUSIRE Ibisohoka Gusoma NIBA ni"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, fuzzy, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2718,7 +2725,7 @@
msgstr ""
"kugirango Na Ibisohoka Ikurura Ikurura Ibintu ku Imyanya Mburabuzi ni 0 ni"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
#, fuzzy
msgid ""
"Input file options:\n"
@@ -2733,7 +2740,7 @@
"Gushyiramo Gushaka Inzira Kuri i Gushyiramo Gushaka Inzira U i "
"IMPINDURAGACIRO Nka Na: Gusiba"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
#, fuzzy
msgid ""
"Conditional processing in input:\n"
@@ -2759,7 +2766,7 @@
"Oya OYA Na HTML Umwandiko Oya OYA Umwandiko Oya OYA Umwandiko Oya OYA Na "
"Umwandiko Oya OYA Na xml Umwandiko kugirango i Oya Amahitamo Umwandiko"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
#, fuzzy
msgid ""
" The defaults for the @if... conditionals depend on the output format:\n"
@@ -2772,7 +2779,7 @@
"NIBA ni ku Na i Ibindi Bidakora NIBA Byuzuye Umwandiko ni ku Na i Ibindi "
"Bidakora NIBA ni ku Na i Ibindi Bidakora"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2793,179 +2800,180 @@
"Kwandika HTML Imirongo Umubare Ibyatoranyijwe Kwandika Na: Iriho Imibare Oya "
"Gutandukanya Kwandika IDOSIYE"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, fuzzy, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s:Kwirengagiza Agaciro"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, fuzzy, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s:%sBikurikije umubare OYA"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, fuzzy, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s:OYA Gufungura Makoro Ibisohoka"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, fuzzy, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s:ISEGONDA Makoro Ibisohoka"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s:OYA Gufungura Makoro Ibisohoka"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s:ISEGONDA Makoro Ibisohoka"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, fuzzy, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, fuzzy, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, fuzzy, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s:Ibuze IDOSIYE"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, fuzzy, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Komandi:"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, fuzzy, c-format
msgid "Expected `%s'"
msgstr "Ikitezwe:"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, fuzzy, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Kurema bushyinguro"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, fuzzy, c-format
msgid "No `%s' found in `%s'"
msgstr "Byabonetse in"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, fuzzy, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr "%s:Makoro Kuri Nka Ibisohoka ni"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, fuzzy, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "IDOSIYE Bivuye"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, fuzzy, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
msgstr "%s:Makoro Ibisohoka IDOSIYE Kuri Amakosa Gukoresha Kuri"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, fuzzy, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr "%s:Ibisohoka IDOSIYE Kuri Amakosa Gukoresha Kuri"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
"preserve.\n"
msgstr "%s:Ibisohoka IDOSIYE Kuri Amakosa Gukoresha Kuri"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, fuzzy, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Komandi:"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, fuzzy, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, fuzzy, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%sIkitezwe: Ingirwadusodeko"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr ""
# 4203
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
#, fuzzy
msgid "NO_NAME!"
msgstr "nta zina"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, fuzzy, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%sIbuze Gufunga"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, fuzzy, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@Ishusho IDOSIYE kugirango OYA"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, fuzzy, c-format
msgid "No such file `%s'"
msgstr "IDOSIYE"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, fuzzy, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@Ishusho IDOSIYE kugirango Umwandiko"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
-#, fuzzy
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, fuzzy, c-format
msgid "@image missing filename argument"
msgstr "@Ishusho Ibuze Izina ry'idosiye:"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, fuzzy, c-format, perl-format
msgid "undefined flag: %s"
msgstr "kidasobanuye Ibendera"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, fuzzy, c-format
msgid "{No value for `%s'}"
msgstr "{Agaciro kugirango"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, fuzzy, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%sa Izina:"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, fuzzy, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Mbere Impera"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, fuzzy, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr ""
@@ -2979,16 +2987,16 @@
"."
#: makeinfo/multi.c:116
-#, fuzzy
+#, fuzzy, c-format
msgid "Missing } in @multitable template"
msgstr "in Inyandikorugero"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, fuzzy, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "Umwandiko Nyuma"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, fuzzy, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Inkingi in Ikintu KININI"
@@ -2998,8 +3006,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[Guhitamo Inkingi in"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
-#, fuzzy
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, fuzzy, c-format
msgid "ignoring @tab outside of multitable"
msgstr "Isunika Hanze Bya"
@@ -3039,12 +3047,12 @@
msgstr "Na Kuri i IDOSIYE Izina:"
#: makeinfo/node.c:922
-#, fuzzy
+#, fuzzy, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "Agafashi Komandi: Indango Kuri OYA Akazi"
#: makeinfo/node.c:924 makeinfo/node.c:1166
-#, fuzzy
+#, fuzzy, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "iyi Agafashi Cyangwa Gukoresha i Oya Ihitamo"
@@ -3059,7 +3067,7 @@
msgstr "Na Kuri i IDOSIYE Izina:"
#: makeinfo/node.c:1165
-#, fuzzy
+#, fuzzy, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "@Agafashi Komandi: Indango Kuri OYA Akazi"
@@ -3093,14 +3101,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "`%s'Oya Umwanya"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, fuzzy, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Ibikubiyemo Ikintu kugirango Intego"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr ""
@@ -3145,26 +3153,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctopMbere Kuri"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, fuzzy, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@Ishusho IDOSIYE"
-#: makeinfo/xml.c:2014
-#, fuzzy
+#: makeinfo/xml.c:2000
+#, fuzzy, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr "@Nka i Iheruka Ikintu Bya Sibyo Inyandiko"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "ya"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "kuri"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -3174,6 +3185,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -3183,11 +3195,12 @@
msgstr ""
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Kwambukiranya Indango in iyi"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -3260,13 +3273,13 @@
msgid "%s is not a valid region code"
msgstr "%sni OYA a Byemewe Ururimi ITEGEKONGENGA"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
@@ -3376,656 +3389,645 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s:Ihitamo"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "Kurema Ibisohoka IDOSIYE"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Kurema bushyinguro"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s:ubusa IDOSIYE"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "IDOSIYE"
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "ku Umurongo"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%sa Izina:"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Ikitezwe:"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Ingirwadusodeko Kuri a Komandi: Nka Kuri"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "%s:--Igika Ikurura Bikurikije umubare OYA"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Umubarendanga"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Umubarendanga"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s:%sBikurikije umubare OYA"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s:%sBikurikije umubare OYA"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Kurema bushyinguro"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Gushaka"
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "%sIndango Kuri"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, perl-format
msgid "File empty for renamed node `%s'"
msgstr ""
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Times"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr "%s:Ibisohoka IDOSIYE Kuri Amakosa Gukoresha Kuri"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d:Iburira"
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d:Iburira"
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(Umurongo"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(Umurongo"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "in"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Na Kuri i IDOSIYE Izina:"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Mo Imbere Ubusobanuro mpezarupapuro OYA"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Komandi:"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Kuri"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s:ubusa IDOSIYE"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "%sIndango Kuri"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "ingingo Kuri"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%sIndango Kuri"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@Ishusho IDOSIYE"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "ku Umurongo Na:"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "\\ in Makoro ku Bya Izina:"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@Ikintu OYA in Kuri"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, perl-format
msgid "@%s already set"
msgstr ""
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "Makoro"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "kugirango Ubusobanuro mpezarupapuro"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%sni"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%sni"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "Makoro"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%sIkitezwe: Ingirwadusodeko"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s:ubusa IDOSIYE"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "Isunika Hanze Bya"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%sCyangwa Nka OYA"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Komandi:"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Komandi:"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%sIbuze Gufunga"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%sIbuze Gufunga"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "Oya Umubarendanga Ibyinjijwe Byabonetse kugirango"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@Ishusho IDOSIYE"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Gushaka"
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@Ishusho IDOSIYE kugirango OYA"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr "@a Kwambukiranya Indango in Kuri"
-
-#: texi2html/formats/info.init:1352
-msgid "`.' or `,' must follow address@hidden"
+#: texi2html/formats/info.pm:1352
+msgid "`.' or `,' must follow @xref."
msgstr ""
-#: texi2html/formats/info.init:1357
-#, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@Ibikubiyemo Mbere Itangira"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@Ibikubiyemo Mbere Itangira"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@Ibikubiyemo Mbere Itangira"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@Ishusho IDOSIYE"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "Ikosa Kuri"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Komandi:"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Komandi:"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "Gufungura Iyinjiza IDOSIYE"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4076,7 +4078,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Kuri"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Kuri"
@@ -4092,7 +4094,7 @@
msgstr "@Ikintu OYA in Kuri"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s:Ibuze IDOSIYE"
@@ -4165,155 +4167,159 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%sOYA Mo Imbere Funga"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s:OYA Gufungura IDOSIYE"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "in Kuri Gukoresha"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@Ibikubiyemo Mbere Itangira"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@Ibikubiyemo Mbere Itangira"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Ikitezwe:"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%sOYA Hanze"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s:Ibuze IDOSIYE"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Kuri"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s:%sBikurikije umubare OYA"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "%s:--Ubusobanuro mpezarupapuro IMISUSIRE Cyangwa OYA"
-#: tp/Texinfo/Structuring.pm:201
-msgid "@top already exists"
-msgstr ""
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Kurema bushyinguro"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s:OYA Gufungura IDOSIYE"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Kurema bushyinguro"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Ibikubiyemo in iyi"
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(Hanze Bya"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Gushaka"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
msgid "`.' or `,' must follow @xref"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@Ishusho IDOSIYE"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Gushaka"
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr "@a Kwambukiranya Indango in Kuri"
+
+#, fuzzy
+#~ msgid "%s: warning: "
+#~ msgstr "%s:Iburira"
+
+#, fuzzy
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s:Ihitamo"
Index: po/sv.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/sv.po,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -b -r1.77 -r1.78
--- po/sv.po 20 Mar 2011 21:20:29 -0000 1.77
+++ po/sv.po 9 Apr 2011 00:10:41 -0000 1.78
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.11.93\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2008-03-09 20:35+0100\n"
"Last-Translator: Christian Rose <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -80,11 +80,11 @@
msgid "memory exhausted"
msgstr "minne slut"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Gå ett tecken framåt"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Gå ett tecken bakåt"
@@ -96,11 +96,11 @@
msgid "Move to the end of this line"
msgstr "Gå till slutet på raden"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Gå ett ord framåt"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Gå ett ord bakåt"
@@ -181,6 +181,7 @@
msgstr "Enda komplettering"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "En komplettering:\n"
@@ -194,6 +195,7 @@
msgstr "Infoga komplettering"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Bygger kompletteringar..."
@@ -218,10 +220,12 @@
msgstr "Slå upp en sträng i indexet för denna fil"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Söker indexposter..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Inga index hittades."
@@ -237,10 +241,12 @@
"kommandot"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Det finns ingen tidigare indexsöksträng."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Inga indexposter."
@@ -297,13 +303,13 @@
"\n"
"* Meny: Noder vars index innehåller \"%s\":\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Prova --help för mer information.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -322,12 +328,12 @@
"vidaredistribuera det. Det finns INGEN GARANTI, i den omfattning som\n"
"medges av gällande lag.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "inga indexposter för \"%s\" hittades\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -338,7 +344,7 @@
"\n"
"Läs dokumentation i Info-format.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -354,7 +360,7 @@
" FILNAMN.\n"
" -f, --file=FILNAMN ange den Info-fil som ska besökas."
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -367,7 +373,7 @@
" -n, --node=NODNAMN ange noder i den först besökta Info-filen.\n"
" -o, --output=FILNAMN skriv ut valda noder till FILNAMN."
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -380,11 +386,11 @@
" FILNAMN.\n"
" -O, --show-options, --usage gå till noden för kommandoradsflaggor."
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly var vänlig mot talsyntesprogram."
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -400,7 +406,7 @@
" --version visa versionsinformation och avsluta.\n"
" -w, --where, --location skriv ut den fysiska platsen för Info-filen."
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -416,13 +422,13 @@
"Alla återstående argument betraktas som namnen på menyposter relativa
till\n"
"den först besökta noden."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
#, fuzzy
msgid ""
"\n"
@@ -445,7 +451,7 @@
" info --subnodes -o ut.txt emacs dumpa hela manualen till ut.txt\n"
" info -f ./foo.info visa filen ./foo.info, sök inte i katalogen"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -459,72 +465,72 @@
"och synpunkter på översättningen till address@hidden"
"Hemsida för texinfo: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Kan inte hitta noden \"%s\"."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Kan inte hitta noden \"(%s)%s\"."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Kan inte hitta ett fönster!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Punkten finns inte inom detta fönsters nod!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Kan inte ta bort det sista fönstret."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Ingen meny i denna nod."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Inga fotnoter i denna nod."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Inga korsreferenser i denna nod."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Ingen \"%s\"-pekare för denna nod."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Okänt Info-kommando \"%c\". Prova \"?\" för hjälp."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Terminaltypen \"%s\" är inte tillräckligt smart för att köra Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Du är redan på sista sidan för denna nod."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Du är redan på första sidan för denna nod."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Endast ett fönster."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Resulterande fönstret skulle bli för litet."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ""
"Inte tillräckligt med utrymme för ett hjälpfönster, ta bort ett fönster."
@@ -829,10 +835,12 @@
" och välj den nod i vilken nästa förekomst hittas.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Den aktuella sökvägen är:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -841,6 +849,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -858,6 +867,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -865,62 +875,62 @@
"Följande kommandon kan inte startas alls:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Visa hjälpmeddelande"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Besök Info-noden \"(info)Help\""
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "Visa dokumentationen för NYCKEL"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Beskriv nyckel: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s är odefinierad."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s är odefinierad."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s är definierad till %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Visa vad som ska anges för att köra ett angivet kommando"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Var är kommando: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "\"%s\" finns inte på några tangenter"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s kan endast startas via %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s kan startas via %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Det finns ingen funktion med namnet \"%s\""
@@ -933,91 +943,102 @@
"Välja andra noder:\n"
"------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "felaktigt antal argument"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "kan inte öppna indatafilen \"%s\""
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "kan inte skapa utdatafilen \"%s\""
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "fel vid skrivning till \"%s\""
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "fel vid stängning av utdatafilen \"%s\""
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "nyckelsekvensen är för lång"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "nyckelsekvens saknas"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL-tecknet (\\000) är inte tillåtet"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NUL-tecknet (^%c) är inte tillåtet"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "åtgärdsnamn saknas"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "avsnittet är för långt"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "okänd åtgärd \"%s\""
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "åtgärdsnamnet är för långt"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "extra tecken följer på åtgärden \"%s\""
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "variabelnamn saknas"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "\"=\" saknas direkt efter variabelnamnet"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "variabelnamnet är för långt"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "värdet är för långt"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", rad %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1087,10 +1108,12 @@
"uppdatera den"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Felaktig data i infonyckelfil -- en del bindningar ignorerades"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "Felaktig data i infonyckelfil -- en del inställningar ignorerades"
@@ -1107,6 +1130,7 @@
msgstr "Läs ett kommandonamn i echo-området och kör det"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Kan inte köra ett \"echo-area\"-kommando här."
@@ -1172,7 +1196,7 @@
msgid "Select visited node: "
msgstr "Välj besökt nod: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Referensen försvann! (%s)."
@@ -1182,7 +1206,7 @@
msgid "regexp error: %s"
msgstr "fel i reguljärt uttryck: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1191,79 +1215,82 @@
"Välkommen till Info version %s. Skriv in \\[get-help-window] för hjälp, "
"\\[menu-item] för menypost."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Gå ned till nästa rad"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Gå upp till föregående rad"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Gå till slutet på raden"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Gå till början på raden"
# src/menus.c:332
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Nästa"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Inga fler noder i detta dokument."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Ingen \"Föreg\" för denna nod."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Inget \"Prev\" eller \"Up\" för denna nod inom detta dokument."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Gå framåt eller nedåt i nodstrukturen"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Gå bakåt eller upp i nodstrukturen"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Rulla framåt i detta fönster"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Rulla framåt i detta fönster och ställ in standardfönsterstorleken"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Rulla framåt i detta fönster och stanna inom noden"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Rulla framåt i detta fönster och stanna inom noden och ställ in "
"standardfönsterstorleken"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Rulla bakåt i detta fönster"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Rulla bakåt i detta fönster och ställ in standardfönsterstorleken"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Rulla bakåt i detta fönster och stanna inom noden"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1271,298 +1298,304 @@
"Rulla bakåt i detta fönster och stanna inom noden och ställ in "
"standardfönsterstorleken"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Gå till början på denna nod"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Gå till slutet på denna nod"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Rulla nedåt radvis"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Rulla uppåt radvis"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Rulla nedåt med halva skärmstorleken"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Rulla uppåt med halva skärmstorleken"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Välj nästa fönster"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Välj föregående fönster"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Dela aktuellt fönster"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Ta bort aktuellt fönster"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Kan inte ta bort ett permanent fönster"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Ta bort alla andra fönster"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Rulla det andra fönstret"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Rulla det andra fönstret bakåt"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Väx (eller krymp) detta fönster"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Dela det tillgängliga skärmutrymmet mellan de synliga fönstren"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Växla tillståndet för radbrytning i det aktuella fönstret"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Växla användningen av reguljära uttryck i sökningar"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Använder reguljära uttryck i sökningar."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "Använder ordagranna strängar i sökningar."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Välj nästa nod"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Välj föregående nod"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Välj uppnoden"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Välj den sista noden i denna fil"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Detta fönster har inga ytterligare noder"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Välj den första noden i denna fil"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Välj det sista objektet i denna nods meny"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Välj denna menypost"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Det finns inte %d poster i denna meny."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menypost (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menypost: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Följ xref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Följ xref: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Läs en menypost och välj dess nod"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Läs en fotnot eller korsreferens och välj dess nod"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Gå till början på denna nods meny"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Besök så många menyposter som möjligt samtidigt"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Läs ett nodnamn och välj det"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "GÃ¥ till nod: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Ingen meny i noden \"%s\"."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Ingen menypost \"%s\" i noden \"%s\"."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Kan inte hitta noden som refereras av \"%s\" i \"%s\"."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Läs en lista med menyer som börjar med katalog, och följ dem"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Följ menyer: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Hitta den nod som beskriver start av programmet"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Hitta programstartnod för [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Läs en referens till manualsida och välj den"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Hämta manualsida: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Välj noden \"Top\" i denna fil"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Välj noden \"(dir)\""
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Döda noden (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Kan inte döda noden \"%s\""
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Kan inte döda den sista noden"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Välj den senast valda noden"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Döda denna nod"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Läs namnet på en fil och välj den"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Sök fil: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Kan inte hitta \"%s\"."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Kunde inte skapa utdatafilen \"%s\"."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Färdig."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Skriver noden %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Skicka innehållet i denna nod i rör till INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Kan inte öppna rör till \"%s\"."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Skriver ut noden %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "Sökningen fortsatte från slutet av dokumentet."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "Sökningen fortsatte från början av dokumentet."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Söker i underfilen %s..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Läs en sträng och sök efter den skiftlägeskänsligt"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Läs en sträng och sök efter den"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Läs en sträng och sök baklänges efter den"
@@ -1585,127 +1618,130 @@
# messages themselves. Yes, this will result in many more messages, but
# those will be translatable, while the current design isn't.
#
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Sökning med reguljära uttryck"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " skiljandes på VERSALER/gemener"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " baklänges"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Sök"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Sökningen misslyckades."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Upprepa den senaste sökningen i samma riktning"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Ingen tidigare söksträng"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Upprepa den senaste sökningen i omvänd riktning"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Sök interaktivt efter en sträng allteftersom du skriver den"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "I-sök med reguljärt uttryck baklänges: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I-sök baklänges: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "I-sök med reguljärt uttryck: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I-sök: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Misslyckas "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Gå till föregående korsreferens"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Gå till nästa korsreferens"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Välj referens eller menypost som finns på denna rad"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Avbryt pågående åtgärd"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Avsluta"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Flytta markören till en specifik rad i fönstret"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Rita om displayen"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Avsluta användandet av Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Kör kommando som är knutet till denna tangents gemena variant"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Okänt kommando (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" är ogiltigt"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "\"%s\" är ogiltigt"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Lägg till denna siffra till det aktuella numeriska argumentet"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Börja (eller multiplicera med 4) det numeriska argumentet"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Används internt av \\[universal-argument]"
@@ -1816,34 +1852,29 @@
msgid " Subfile: %s"
msgstr " Underfil: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: varning: "
-
# char *s = concat ("", strerror (errno), _(" for %s"));
#
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " för %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tProva \"%s --help\" för en fullständig lista med flaggor.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Användning: %s [FLAGGA]... [INFO-FIL [KATALOGFIL]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
"Lägg till eller ta bort poster i INFO-FIL från Info-katalogen KATALOGFIL."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1868,7 +1899,7 @@
" användning av argumentet KATALOGFIL.\n"
" --dry-run samma som --test."
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1894,7 +1925,7 @@
" post som anges utav Info-filen inte finns och\n"
" basnamnet för Info-filen inte heller kan hittas."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1921,7 +1952,7 @@
" --no-indent formatera inte nya poster i filen KAT.\n"
" --quiet undertryck varningar."
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1950,7 +1981,7 @@
" Info-filen.\n"
" --section R AVSNITT likvärdigt med --regex=R --section=AVSNITT --add-once."
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1960,7 +1991,7 @@
" --test undertryck uppdatering av KATALOGFIL.\n"
" --version visa versionsinformation och avsluta."
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1971,7 +2002,7 @@
"och synpunkter på översättningen till address@hidden"
"Hemsida för texinfo: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2006,63 +2037,67 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: kunde inte läsa (%s) och kunde inte skapa (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: tom fil"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY utan matchande END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY utan matchande START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: har redan katalogfilen: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Ange Info-filen endast en gång.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Extra reguljärt uttryck angivet, ignorerar \"%s\""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Fel i reguljära uttrycket \"%s\": %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "för många kommandoradsargument \"%s\""
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Ingen indatafil angiven; prova --help för mer information."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "Ingen katalogfil angiven; prova --help för mer information."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "ingen info-katalogpost i \"%s\""
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "inga poster hittades för \"%s\"; ingenting togs bort"
@@ -2139,6 +2174,7 @@
msgstr "osannolikt tecken %c i @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr ""
"@sc-argumentet är enbart med stora bokstäver, därför har det ingen effekt"
@@ -2149,6 +2185,7 @@
msgstr "\"{\" förväntades, men såg \"%c\""
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "filslut inuti verb-block"
@@ -2159,7 +2196,9 @@
# Ãr det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt
som
# orsakar problem?
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2172,7 +2211,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s är föråldrat"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp kräver ett positivt numeriskt argument, inte \"%s\""
@@ -2182,17 +2221,17 @@
msgid "Bad argument to %c%s"
msgstr "Felaktigt argument till %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "oförändrad"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "ingen"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Felaktigt argument till @%s"
@@ -2201,32 +2240,33 @@
msgid "insert"
msgstr "infoga"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Felaktigt argument till @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "Förväntade @%s on eller off, inte \"%s\""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Endast @%s 10 eller 11 stöds, inte \"%s\""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "\"}\" saknas i @def-argumentet"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Måste vara i \"@%s\"-omgivning för att använda \"@%s\""
@@ -2247,10 +2287,11 @@
msgstr "\"%s\" utelämnades efter skrivning till standard ut"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Utdatabufferten är inte tom."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "Begärda flyttalstypen \"%s\" har inte tidigare använts"
@@ -2270,11 +2311,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Ingen avslutande klammer för fotnoten \"%s\""
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Fotnoten definierad utan föräldernod"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Fotnoter inuti fotnoter är inte tillåtet"
@@ -2287,22 +2330,23 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: kunde inte öppna --css-fil: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-fil slutade med kommentar"
# to pop?
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[oväntat] ingen html-tagg att poppa"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[oväntat] ogiltigt nodnamn: \"%s\""
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Okänt index \"%s\""
@@ -2331,14 +2375,14 @@
msgid "(line %*d)"
msgstr "(rad %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "Okänt index \"%s\" i @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Posten för index \"%s\" är utanför alla noder"
@@ -2348,6 +2392,7 @@
msgstr "(utanför alla noder)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item är inte tillåtet i argument till @itemize"
@@ -2356,6 +2401,7 @@
msgstr "Felaktig typ i insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Uppräkningsstacken har flödat över"
@@ -2364,7 +2410,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "bokstaveringen har flödat över, startar om vid %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2375,14 +2421,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "%cfloat-omgivningar kan inte nästlas"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "\"@end\" förväntade \"%s\", men såg \"%s\""
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2394,30 +2440,34 @@
msgstr "%s kräver bokstav eller siffra"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "filslut inuti bokstavligt block"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s är inte meningsfullt utanför \"@float\"-omgivning"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "din @top-nod ska kanske packas i @ifnottex istället för @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu sågs innan första noden, skapar \"Top\"-nod"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2428,9 +2478,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s är inte meningsfullt utanför \"@titlepage\"-omgivning"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2441,14 +2491,14 @@
msgid "`%c%s' needs something after it"
msgstr "\"%c%s\" kräver någonting efter sig"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Felaktigt argument \"%s\" till \"@%s\", använder \"%s\""
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s är inte meningsfullt inuti \"@%s\"-block"
@@ -2493,17 +2543,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s förväntar \"i\" eller \"j\" som argument, inte \"%c\""
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s förväntar ett ensamt tecken \"i\" eller \"j\" som argument"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makrot \"%s\" är redan definierat"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "här är den tidigare definitionen av \"%s\""
@@ -2518,53 +2568,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makrot \"%s\" anropades på rad %d med för många argument"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "Makrot %cend hittades inte"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion är föråldrat; använd @rmacro istället"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "@quote-arg är föråldrat; argument är citerade som standard"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@end %s och @%s passar inte"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "För många fel! Gav upp.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: varning: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Felplacerat %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Prova \"%s --help\" för mer information.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Användning: %s [FLAGGA]... TEXINFO-FIL...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2572,7 +2624,7 @@
"Ãversätt Texinfo-källdokumentation till diverse andra format, som
standard\n"
"infofiler som är lämpliga för läsning med Emacs eller GNU Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2598,7 +2650,7 @@
" -v, --verbose förklara vad som görs.\n"
" --version visa versionsinformation och avsluta.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2613,7 +2665,7 @@
" --xml generera Texinfo XML istället för Info.\n"
" --plaintext generera vanlig text istället för Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2644,7 +2696,7 @@
" --number-sections generera kapitel- och avsnittsnummer.\n"
" -o, --output=FIL generera till FIL (katalog om delad HTML).\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2686,7 +2738,7 @@
" --split-size=ANTAL dela upp Info-filer vid storleken ANTAL\n"
" (standardvärde %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
#, fuzzy
msgid ""
"Options for HTML:\n"
@@ -2704,7 +2756,7 @@
" --transliterate-file-names\n"
" producera filnamn i ASCII-translitteration.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2718,7 +2770,7 @@
" (standard %d). Om VÃRDE är 0 kastas\n"
" mellanrum som kan ignoreras.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2737,7 +2789,7 @@
" -U VARIABEL odefiniera variabeln VARIABEL, som med "
"@clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2774,7 +2826,7 @@
"\n"
" Dessutom, för flaggorna --no-ifFORMAT, behandla @ifnotFORMAT-text.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2788,7 +2840,7 @@
" om vanlig text genereras är --ifplaintext på och de andra av;\n"
" om XML genereras är --ifxml på och de andra av.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2817,77 +2869,77 @@
" makeinfo --no-split apa.texi skriv en Info-fil hur stor den än "
"är\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Ignorerar okänt TEXINFO_OUTPUT_FORMAT-värde \"%s\".\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: kunde inte öppna makroexpansionsutdata \"%s\""
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: ignorerar andra makroexpansionsutdata \"%s\".\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: kunde inte öppna makroexpansionsutdata \"%s\""
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, fuzzy, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: ignorerar andra makroexpansionsutdata \"%s\".\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: argumentet --paragraph-indent måste vara numeriskt/\"none\"/\"asis\", "
"inte \"%s\".\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte "
"\"%s\".\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: filargument saknas.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Flerradskommandot %c%s används felaktigt"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "\"%s\" förväntades"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Kan inte skapa katalogen \"%s\": %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Inget \"%s\" hittades i \"%s\""
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
@@ -2898,12 +2950,12 @@
# no_headers ? "text" : (html ? "HTML" : "info"),
# output_filename, input_filename);
#
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Skapar %s-fil \"%s\" från \"%s\".\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2911,14 +2963,14 @@
"%s: Tar bort makroutdatafilen \"%s\" på grund av fel; använd --force för
att "
"bevara.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Tar bort utdatafilen \"%s\" på grund av fel; använd --force för att "
"bevara.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2927,96 +2979,99 @@
"%s: Tar bort utdatafilen \"%s\" på grund av fel; använd --force för att "
"bevara.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Okänt kommando \"%s\""
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Använd klamrar för att ge ett komamndo som ett argument till @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s förväntade klamrar"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Ensam }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "INGET_NAMN!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s saknar avslutande klammer"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image-filen \"%s\" (för HTML) är oläslig: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Det finns ingen sådan fil \"%s\""
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image-filen \"%s\" (för text) är oläslig: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image saknar filnamnsargument"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "odefinierad flagga: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Inget värde för \"%s\"}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s kräver ett namn"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "NÃ¥dde filslut innan matchande @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "\"%.40s...\" är för lång för expansion; inte expanderad"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Ett } saknas i @multitable-mall"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "ignorerar lös text \"%s\" efter @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "För många kolumner i multitabellsobjekt (max %d)"
@@ -3026,7 +3081,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[oväntat] kan inte välja kolumn %d i multitabell"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "ignorerar @tab utanför multitabell"
@@ -3066,11 +3122,13 @@
msgstr "Ankaret \"%s\" och noden \"%s\" mappas till samma filnamn"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
"Detta @anchor-kommando ignoreras; referenser till det kommer inte att fungera"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Byt namn på detta ankare eller använd flaggan \"--no-split\""
@@ -3085,6 +3143,7 @@
msgstr "Ankarna \"%s\" och \"%s\" mappas till samma filnamn"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
"@anchor-kommandot ignoreras; referenser till det kommer inte att fungera"
@@ -3123,14 +3182,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "\"%s\" har inget upp-fält (kanske felaktig avsnittsindelning?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "Noden \"%s\" saknar menypost för \"%s\" trots att den är dess
Upp-mål"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "orefererad nod \"%s\""
@@ -3175,27 +3234,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop användes innan %cnode, använder %s som standard"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image-filen \"%s\" är oläslig: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem som det sista objektet i @multitable genererar ogiltiga Docbook-"
"dokument"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "av"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "på"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Första argumentet till korsreferens kan inte vara tomt"
@@ -3205,6 +3268,7 @@
msgstr "Tomt filnamn för HTML-korsreferens i \"%s\""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Slutet på filen nåddes då \".\" eller \",\" eftersöktes"
@@ -3214,10 +3278,12 @@
msgstr "\".\" eller \",\" måste följa på @%s, inte \"%c\""
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "använd @pxref för korsreferenser inuti parenteser"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Första argumentet till @inforef kan inte vara tomt"
@@ -3288,15 +3354,15 @@
msgid "%s is not a valid region code"
msgstr "%s är inte en giltig landskod enligt ISO 639"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte "
"\"%s\".\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3432,672 +3498,657 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: okänd flagga \"--%s\"\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "kan inte skapa utdatafilen \"%s\""
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Kan inte skapa katalogen \"%s\": %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Sök fil: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Noden \"%s\" är tidigare definierad på rad %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s kräver ett namn"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "\"%s\" förväntades"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Använd klamrar för att ge ett komamndo som ett argument till @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: argumentet --paragraph-indent måste vara numeriskt/\"none\"/\"asis\", "
"inte \"%s\".\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: argumentet --paragraph-indent måste vara numeriskt/\"none\"/\"asis\", "
"inte \"%s\".\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte "
"\"%s\".\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Okänt index \"%s\""
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Okänt index \"%s\""
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Kan inte skapa katalogen \"%s\": %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Kan inte hitta \"%s\"."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "orefererad nod \"%s\""
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "orefererad nod \"%s\""
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Indexet \"%s\" finns redan"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Tar bort utdatafilen \"%s\" på grund av fel; använd --force för att "
"bevara.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: varning: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: varning: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(rad %d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(rad %d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "\"}\" saknas i @def-argumentet"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Ankaret \"%s\" och noden \"%s\" mappas till samma filnamn"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Fotnoter inuti fotnoter är inte tillåtet"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Okänt kommando \"%s\""
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Felaktigt argument till @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "orefererad nod \"%s\""
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Första argumentet till @inforef kan inte vara tomt"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s-referens till ickeexisterande noden \"%s\" (kanske felaktig "
"avsnittsindelning?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image-filen \"%s\" är oläslig: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makrot \"%s\" anropades på rad %d med för många argument"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "\\ i makroutökning följdes av \"%s\" istället för parameternamn"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "inga indexposter för \"%s\" hittades\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item är inte tillåtet i argument till @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Indexet \"%s\" finns redan"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "makrot \"%s\" är redan definierat"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Ingen avslutande klammer för fotnoten \"%s\""
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s är föråldrat"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s är föråldrat"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "makrot \"%s\" är redan definierat"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s förväntade klamrar"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: tom fil"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "ignorerar @tab utanför multitabell"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s förväntar \"i\" eller \"j\" som argument, inte \"%c\""
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Okänt kommando \"%s\""
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Odefinierat kommando: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s saknar avslutande klammer"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s saknar avslutande klammer"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: kunde inte öppna --css-fil: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "inga indexposter för \"%s\" hittades\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: kunde inte öppna --css-fil: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image-filen \"%s\" är oläslig: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "@quote-arg är föråldrat; argument är citerade som standard"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Kan inte hitta noden \"%s\"."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image-filen \"%s\" (för HTML) är oläslig: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-# Ãr det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt
som
-# orsakar problem?
-#: texi2html/formats/info.init:1188
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Obs...} skapar en falsk korsreferens i Info; formulera om för att "
-"undvika detta"
-
-#: texi2html/formats/info.init:1352
-#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "\".\" eller \",\" måste följa på @%s, inte \"%c\""
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "\".\" eller \",\" måste följa på @%s, inte \"%c\""
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image-filen \"%s\" är oläslig: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "fel vid skrivning till \"%s\""
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Okänt kommando \"%s\""
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Okänt kommando \"%s\""
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "kan inte öppna indatafilen \"%s\""
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: kunde inte öppna --css-fil: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "@quote-arg är föråldrat; argument är citerade som standard"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4148,7 +4199,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Felaktigt argument till @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Felaktigt argument till @%s"
@@ -4164,7 +4215,7 @@
msgstr "@item är inte tillåtet i argument till @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: filargument saknas.\n"
@@ -4237,158 +4288,172 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s är inte meningsfullt inuti \"@%s\"-block"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: kunde inte öppna --css-fil: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Måste vara i \"@%s\"-omgivning för att använda \"@%s\""
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu sågs innan första @node, skapar \"Top\"-nod"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: kunde inte öppna --css-fil: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "\"%s\" förväntades"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s är inte meningsfullt utanför \"@float\"-omgivning"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: filargument saknas.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Felaktigt argument till @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: argumentet %s måste vara numeriskt, inte \"%s\".\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: argumentet --footnote-style måste vara \"separate\" eller \"end\", inte "
"\"%s\".\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Indexet \"%s\" finns redan"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Kan inte skapa katalogen \"%s\": %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: kunde inte öppna --css-fil: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Kan inte skapa katalogen \"%s\": %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Ingen meny i denna nod."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(utanför alla noder)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Kan inte hitta noden \"%s\"."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "\".\" eller \",\" måste följa på @%s, inte \"%c\""
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "\".\" eller \",\" måste följa på @%s, inte \"%c\""
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image-filen \"%s\" är oläslig: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Kan inte hitta noden \"%s\"."
+
+# Ãr det kombinationen "@strong{Note:.." eller bara @strong{} rent allmänt
som
+# orsakar problem?
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Obs...} skapar en falsk korsreferens i Info; formulera om för att
"
+#~ "undvika detta"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "\".\" eller \",\" måste följa på @%s, inte \"%c\""
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: varning: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Indexet \"%s\" finns redan"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: otillåten flagga -- %c\n"
Index: po/tr.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/tr.po,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- po/tr.po 20 Mar 2011 21:20:29 -0000 1.73
+++ po/tr.po 9 Apr 2011 00:10:41 -0000 1.74
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.12.94\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2008-08-25 21:25-0500\n"
"Last-Translator: Eyüp Hakan Duran <address@hidden>\n"
"Language-Team: Turkish <address@hidden>\n"
@@ -82,11 +82,11 @@
msgid "memory exhausted"
msgstr "bellek tükendi"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Bir karakter ileri gider"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Bir karakter geri gider"
@@ -98,11 +98,11 @@
msgid "Move to the end of this line"
msgstr "Satýrýn sonuna gider"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Bir kelime ileri gider"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Bir kelime geri gider"
@@ -183,6 +183,7 @@
msgstr "Tek tamamlama"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Bir tamamlama:\n"
@@ -196,6 +197,7 @@
msgstr "Tamamlamayý yerleþtir"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Tamamlamalarý oluþturuyor..."
@@ -220,10 +222,12 @@
msgstr "Bu dosyada indeks içinde bir dizgeyi arar"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "indeks girdilerini buluyor..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Hiç indis yok."
@@ -238,10 +242,12 @@
"Son `\\[index-search]'komutundan bir sonraki eþleþen indeks öðesine gider"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Daha önce bir indeks arama dizgesi yok."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Hiç indeks girdisi yok."
@@ -293,13 +299,13 @@
"\n"
"* Menü: `%s' indislerini içeren düðümler:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Daha fazla bilgi için --help seçeneðini kullanýn.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -314,12 +320,12 @@
"Bu özgür yazýlýmdýr: deðiþtirip daðýtma özgürlüðüne sahipsiniz.\n"
"Yasalarýn elverdiði ölçüde HÝÇBÝR GARANTÝ yoktur.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "`%s' için indeks girdisi yok.\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -330,7 +336,7 @@
"\n"
"Info biçemindeki belgeleri okuyun.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -347,7 +353,7 @@
"anýmsar.\n"
" -f, --file=DOSYAADI ziyaret edilecek Info dosyasýný belirler."
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -361,7 +367,7 @@
"belirler.\n"
" -o, --output=DOSYAADI Seçili düðümlerden DOSYAAYDI'na çýktý alýr."
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -374,11 +380,11 @@
" --restore=DOSYAADI ilk tuþbasýmlarýný DOSYAADI'ndan okur.\n"
" -Q, --show-options, --usage komut satýrý seçenekler düðümüne gider."
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly konuþma sentezcilerine dostça davranýr."
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -394,7 +400,7 @@
" --version sürüm bilgisini gösterir ve çýkar.\n"
" -w, --where, --location Info dosyasýnýn fiziksel konumunu yazdýrýr."
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -410,7 +416,7 @@
"Kalan tüm argümanlar, ilk ziyaret edilen düðüme göreceli menü\n"
"ögesi isimleri olarak iþlem görür."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -418,7 +424,7 @@
"\n"
"Tuþ baðlantýlarýnýn bir özeti için Info içinden h tuþlayýn."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -445,7 +451,7 @@
" info --subnodes -o out.txt emacs tüm elkitabýný out.txt'e çýkartýr\n"
" info -f ./foo.info dir aramadan ./foo.info dosyasýný gösterir"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -458,72 +464,72 @@
"genel soru ve tartýþmalarý address@hidden'a gönderiniz.\n"
"Texinfo anasayfasý: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "`%s' düðümü bulunamadý."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "`(%s)%s' düðümü bulunamadý."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Bir pencere bulunamadý!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Orasý bu pencerenin düðümü gibi görünmüyor!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Son pencere silinemez."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Bu düðümde menü yok."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Bu düðümde dipnot yok."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Bu düðümde çapraz baþvuru yok."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Bu düðüm için `%s' yer gösterici yok."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Info komutu `%c' bilinmiyor; yardým almak için `?' deneyin."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "`%s' terminal türü Info çalýþtýrmak için yeterince akýllý deðil."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Zaten bu düðümün son sayfasýndasýnýz."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Zaten bu düðümün ilk sayfasýndasýnýz."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Sadece bir pencere."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Pencere çok küçük olacaktý."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Bir yardým penceresi için yer yok, lütfen bir pencere silin."
@@ -830,10 +836,12 @@
" ve sonraki bulunanýn içinde olduðu düðümü seçer.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "Þu anki arama yolu:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -842,6 +850,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -859,67 +868,68 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
msgstr " tümü\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Bu yardým iletisini gösterir"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Info düðümünü `(info)Help' ziyaret eder"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "KEY ile ilgili belgeleri basar"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Tuþ açýklamasý: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s atanmamýþ."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s atanmamýþ."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s %s olarak atanmýþ."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Verilen komutu çalýþtýracak türü gösterir"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Komutun yeri: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' bir tuþ üzerinde deðil"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s sadece %s üzerinden çaðrýlabilir."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s, %s üzerinden çaðrýlabilir."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "`%s' isimli bir iþlev yok"
@@ -932,91 +942,102 @@
"Diðer düðümleri seçme:\n"
"----------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "argüman sayýsý yanlýþ"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "`%s' girdi dosyasý açýlamýyor"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "`%s' çýktý dosyasý oluþturulamýyor"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "`%s''e yazma hatasý"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "`%s' çýktý dosyasýný kapatmada hata"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "anahtar sýralamasý çok uzun"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "anahtar sýralamasý kayýp"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "NUL karakterine (\\000) izin verilmiyor"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "NUL karakterine (^%c) izin verilmiyor"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "kayýp eylem adý"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "bölüm çok uzun"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "bilinmeyen eylem `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "eylem adý çok uzun"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "`%s' eylemini izleyen fazladan karakterler"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "kayýp deðiþken adý"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "deðiþken adýndan hemen sonra kayýp `=' "
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "deðiþken adý çok uzun"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "deðer çok uzun"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", satýr %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1085,10 +1106,12 @@
"infokey yürütün"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Infokey dosyasýnda hatalý veri -- bazý tuþ baðlantýlarý yoksayýldý"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "Infokey dosyasýnda hatalý veri -- bazý deðiþken ayarlarý yoksayýldý"
@@ -1105,6 +1128,7 @@
msgstr "Eko alanýndan komut ismini okur ve onu çalýþtýrýr"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Bir `eko-alaný' komutu burada çalýþtýrýlamaz."
@@ -1171,7 +1195,7 @@
msgid "Select visited node: "
msgstr "Uðramýþ olduðunuz düðümü seçiniz: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Referans yokoldu! (%s)."
@@ -1181,7 +1205,7 @@
msgid "regexp error: %s"
msgstr "düzenli ifade hatasý: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1190,501 +1214,513 @@
"Info sürüm %s'e hoþgeldiniz. Yardým için \\[get-help-window], menü öðesi "
"için \\[menu-item] yazýnýz."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Sonraki satýra (aþaðý) gider"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Önceki satýra (yukarý) gider"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Satýr sonuna gider"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Satýr baþýna gider"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Sonraki"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Bu belge içinde baþka düðüm yok."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Bu düðüm için baþka `Önceki' yok."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Bu belge içinde, bu düðüm için `Önceki' ya da `Yukarý' yok."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Düðüm yapýsý içinde ileriye ya da aþaðýya gider"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Düðüm yapýsý içinde geriye ya da yukarýya gider"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Bu pencerede ileriye doðru kaydýrýr"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr ""
"Bu pencerede ileriye doðru kaydýrýr ve öntanýmlý pencere boyutuna ayarlar"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Bu pencerede, düðüm içinde kalarak ileriye doðru kaydýrýr"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Bu pencerede, düðüm içinde kalarak ileriye doðru kaydýrýr ve öntanýmlý "
"pencere boyutunu ayarlar"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Bu pencerede geriye doðru kaydýrýr"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr ""
"Bu pencerede geriye doðru kaydýrýr ve öntanýmlý pencere boyutunu ayarlar"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Bu pencerede, düðüm içinde kalarak geriye doðru kaydýrýr"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
msgstr "geri ve set öntanýmlý"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Bu düðümün baþlangýcýna gider"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Bu düðümün sonuna gider"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Aþaðýya doðru satýr kaydýrýr"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Yukarýya doðru satýr kaydýrýr"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Aþaðýya doðru yarým ekran boyutu kaydýrýr"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Yukarýya doðru yarým ekran boyutu kaydýrýr"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Sonraki pencereyi seçer"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Önceki pencereyi seçer"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Mevcut pencereyi böler"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Mevcut pencereyi siler"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Kalýcý bir pencere silinemez"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Diðer tüm pencereleri siler"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Diðer pencereyi kaydýrýr"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Diðer pencereyi geriye doðru kaydýrýr"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Bu pencereyi büyütür (ya da küçültür)"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Mevcut ekran boþluðunu görünür pencereler arasýnda bölüþtürür"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Mevcut penceredeki satýr sarma durumunu deðiþtirir"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Aramalarda düzenli ifade kullanýmýna geç"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Aramalarda düzenli ifade kullanýlýyor."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "Aramalarda yazýlý dizge kullanýlýyor."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Sonraki düðümü seçer"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Önceki düðümü seçer"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Üstteki düðümü seçer"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Bu dosyadaki son düðümü seçer"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Bu pencerenin baþka düðümü yok"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Bu dosyadaki ilk düðümü seçer"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Bu düðümün menüsündeki son öðeyi seçer"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Bu menü öðesini seçer"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Bu menüde %d adet öðe yok."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Menü öðesi (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Menü öðesi: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Ýzlenecek xref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Ýzlenecek xref: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Bir menü öðesini okur ve düðümünü seçer"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Oku yada ve select"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Bu düðüm menüsünün baþlangýcýna gider"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Tek seferde mümkün olan en fazla sayýda menü öðesine uðrar"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Bir düðüm adý okur ve seçer"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Düðüme gider: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Menüsü olmayan düðüm `%s'."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "`%2$s' düðümünde `%1$s' menü öðesi yok."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "`%2$s''de `%1$s' tarafýndan baþvurulan düðüm bulunamadý."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Dizinden baþlayarak bir menü listesini oku ve izle"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Menüleri izle: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Program çaðýrmayý açýklayan düðümü bulur"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "[%s]'in çaðýrma düðümünü bulur: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Bir klavuz sayfasý baþvurusunu okur ve seçer"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Alýnacak klavuz sayfasý: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Bu dosyadaki `En Üst' düðümü seç"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "`(dizin)' düðümünü seç"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Düðümü öldür (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Öldürülemeyen düðüm `%s' "
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Son düðüm öldürülemiyor"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "En son seçilen düðümü seçer"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Bu düðümü öldürür"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Bir dosyanýn adýný okur ve seçer"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Dosyayý bul: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "`%s' bulunamýyor."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Çýktý dosyasý `%s' oluþturulamýyor."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Bitti."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "%s düðümü yazýlýyor..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "Bu düðümün içeriðini INFO_PRINT_COMMAND üzerinden veri yolla"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Veri yolu `%s''e açýlamýyor."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "%s düðümü yazdýrýlýyor..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "Arama, belgenin sonundan sürdürülüyor."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "Arama, belgenin baþýndan sürdürülüyor."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "%s altdosyasý aranýyor ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Bir dizge okur ve onu büyük/küçük harf duyarlý þekilde arar"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Bir dizge okur ve (onu) arar"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Bir dizge okur ve (onu) geriye doðru arar"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Düzenli ifade arama"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " büyük/küçük harf duyarlý þekilde "
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " geriye doðru"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Ara"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Arama baþarýsýz"
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Son aramayý ayný yönde yineler"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Daha önceden arama dizgesi yok"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Son aramayý ters yönde yineler"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Bir dizgeyi siz yazarken etkileþimli þekilde arar"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "Düzenli ifade I-arama, geriye doðru: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "I-arama, geriye doðru: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "Düzenli ifade I-arama: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "I-arama: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Baþarýlamýyor "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Önceki çapraz baþvuruya gider"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Sonraki çapraz baþvuruya gider"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Bu satýrdaki referans ya da menü öðesini seçer"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Mevcut iþlemi iptal eder"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Çýk"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Ýmleci pencerenin belirli bir satýrýna taþýr"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Görüntüyü yeniden çizer"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Info'dan çýkar"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Bu tuþun küçük harfine atanmýþ komutu yürütür"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Bilinmeyen komut (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" geçersiz"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "`%s' geçersiz"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Mevcut sayýsal argümana bu sayýyý ekle"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Mevcut sayýsal argümaný baþlat (ya da 4'le çarp)"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Dahili olarak \\[universal argument] tarafýndan kullanýlýyor"
@@ -1798,32 +1834,27 @@
msgid " Subfile: %s"
msgstr " Altdosya: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: uyarý: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " %s için"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tSeçeneklerin tam bir listesi için `%s --help''i deneyiniz.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Kullaným: %s [SEÇENEK]... [INFO-DOSYASI [DÝZÝN-DOSYASI]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
"DÝZÝN-DOSYASI Info dizininden INFO-DOSYASI içine girdi ekle ya da çýkar"
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1849,7 +1880,7 @@
" argümanýný kullanmakla eþdeðerdir.\n"
" --dry-run --test ile ayný."
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1879,7 +1910,7 @@
" ve Info dosyasýnýn temel adý da bulunamýyorsa\n"
" METÝN yalnýzca son çare olarak silinir."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1905,7 +1936,7 @@
" --no-indent DÝZÝN dosyasýndaki yeni girdileri biçemlemez.\n"
" --quiet uyarýlarý baskýlar."
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1935,7 +1966,7 @@
" bilgiden belirlenir.\n"
" --section R BÖLÜM --regex=R --section=BÖLÜM --add-once ile eþdeðer."
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1945,7 +1976,7 @@
" --test DÝZÝN-DOSYASI'nýn güncellenmesini engeller.\n"
" --version sürüm bilgisini gösterir ve çýkar."
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1955,7 +1986,7 @@
"genel soru ve tartýþmalarý address@hidden'a gönderiniz.\n"
"Texinfo anasayfasý: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1991,63 +2022,67 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%1$s: (%2$s) okunamýyor ve (%3$s) oluþturulamýyor\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: boþ dosya"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "Eþleþen END-INFO-DIR-ENTRY'siz START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "Eþleþen START-INFO-DIR-ENTRY'siz END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: zaten dir dosyasý var: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: Info dosyasýný yalnýzca bir kez belirtin.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Bir baþka düzenli ifade belirlendi, `%s' yok sayýlýyor"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Düzenli ifadede hata `%s': %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "fazladan komut satýrý argümaný `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "Girdi dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "dizin dosyasý belirtilmemiþ; daha fazla bilgi için --help deneyin."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "`%s' içinde info dizin girdisi yok"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "`%s' için girdi bulunamadý; hiçbir þey silinmedi"
@@ -2119,6 +2154,7 @@
msgstr "@var içinde düþük olasýlýklý karakter %c"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@sc argümaný tamamen büyükharf(le yazýlmýþ), etkisiz"
@@ -2128,6 +2164,7 @@
msgstr "`{' beklenirdi, `%c' görüldü"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "fiil bloðu içinde dosya sonu"
@@ -2136,7 +2173,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "`}' beklenirdi, `%c' görüldü"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2149,7 +2188,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s kullanýmdan kalkmýþ"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp pozitif bir sayýsal argüman gerektirir, `%s' deðil"
@@ -2159,17 +2198,17 @@
msgid "Bad argument to %c%s"
msgstr "%c%s'ye hatalý argüman"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "yok"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "@%s'ye hatalý argüman"
@@ -2178,32 +2217,33 @@
msgid "insert"
msgstr "ekle"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "@%s:%s'ye hatalý argüman"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "%1$s'de açýk ya da kapalý bakleniyordu, `%2$s' deðil"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "Yalnýzca @%1$s 10 ya da 11 destekleniyor, `%2$s' deðil"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "@def arg'da kayýp `}'"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "address@hidden' kullanmak için address@hidden' ortamý içinde
ol(un)malýdýr"
@@ -2224,10 +2264,11 @@
msgstr "stdout'a yazýlýyor olduðundan `%s' yok sayýldý"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Çýktý tamponu boþ deðil"
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "Ýstenen yüzer türü `%s' daha önce kullanýlmadý"
@@ -2247,11 +2288,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Dipnot `%s' için kapama } yok"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "Dipnot, ebeveyn düðümsüz tanýmlanmýþ"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Dipnot içi dipnotlara izin verilmez"
@@ -2264,21 +2307,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: açýlamayan --css-dosyasý: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-dosyasý yorum içinde sonlandý"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "hayýr :"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[beklenmeyen] geçersiz düðüm ismi: `%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "Bilinmeyen indeks `%s'"
@@ -2307,14 +2351,14 @@
msgid "(line %*d)"
msgstr "(satýr %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "@printindex içinde bilinmeyen indeks `%s'"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "`%s' indeks girdisi tüm düðümlerin dýþýnda"
@@ -2324,6 +2368,7 @@
msgstr "(tüm düðümlerin dýþýnda)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "@item, @itemize'a argüman olarak kullanýlamaz"
@@ -2332,6 +2377,7 @@
msgstr "insertion_type_pname içinde Kýrýk-Tip"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Numaralandýrma yýðýn taþmasý"
@@ -2340,7 +2386,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "harflendirme taþmasý, %c'den yeniden baþlanýyor"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2351,14 +2397,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "%cfloat çevreler içiçelendirilemez"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden' `%1$s' beklerdi, `%2$s' gördü"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2370,20 +2416,23 @@
msgstr "%s harf ya da rakam gerektirir"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "verbatim bloðu içinde dosya sonu"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "address@hidden' çevresi dýþýnda @%s anlamlý deðil"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "önce Üst"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
@@ -2391,11 +2440,12 @@
"sarýlmalýdýr?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "@detailmenu ilk düðümden önce görüldü, `En Üst' düðüm oluþturuluyor"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "address@hidden' ve address@hidden' çevreleri dýþýnda @%s anlamlý deðil"
@@ -2405,9 +2455,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "address@hidden' çevresi dýþýnda @%s anlamlý deðil"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2418,14 +2468,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s' sonrasýnda birþeyler gereklidir"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "`%2$s''e hatalý argüman, `%1$s', `%3$s' kullanýlýyor"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "address@hidden' bloðu içinde @%s anlamlý deðil"
@@ -2470,17 +2520,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s argüman olarak `i' ya da `j' gerektirir, %c deðil"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s argüman olarak tek karakter, `i' ya da `j' gerektirir"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "makro `%s' daha önce tanýmlanmýþ"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "iþte `%s''nin önceki tanýmý"
@@ -2495,54 +2545,56 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Makro `%s', %d satýrýnda çok sayýda arg.la çaðrýldý"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "%cson makrosu bulunamadý"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion kullanýlmýyor; lütfen yerine @rmacro kullanýnýz"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
"@quote-arg kullanýlmýyor; argümanlar öntanýmlý olarak týrnak içine alýnýyor"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@%s ile eþleþmeyen @end %s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Çok sayýda hata! Vazgeçildi.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: uyarý: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Yanlýþ yerleþtirilmiþ %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Daha fazla bilgi için `%s --help' yazýn.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "Kullaným: %s [SEÇENEK]... TEXINFO-DOSYASI...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2551,7 +2603,7 @@
"Info dosyalarý çevrimiçi Emacs ya da tek baþýna GNU Info'yla okunmak için "
"uygundur.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2578,7 +2630,7 @@
" -v, --verbose ne yapýlýyor olduðunu açýklar.\n"
" --version sürüm bilgisini görüntüler ve çýkar.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2593,7 +2645,7 @@
" --xml Info yerine Texinfo XML çýktýsý üretir.\n"
" --plaintext Info yerine salt metin çýktýsý üretir.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2628,7 +2680,7 @@
" -o, --output=DOSYA çýktýyý DOSYA'ya yazar (bölünmüþ HTML ise "
"dizine).\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2669,7 +2721,7 @@
" --spilt-size=NUM Info dosyalarýný NUM boyutuna böler (öntanýmlý "
"%d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2688,7 +2740,7 @@
" dosya isimlerini ASCII alfabesine dönüþtürerek "
"üretir.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2703,7 +2755,7 @@
" eðer DEÐER 0 ise yok sayýlabilen beyaz "
"boþluk silinir.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2721,7 +2773,7 @@
" -U VAR VAR deðiþkeninin tanýmýný, @clear ile "
"olduðu gibi geri alýr.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2757,7 +2809,7 @@
"\n"
" Ayrýca --no-ifFORMAT seçenekleri için ifnotFORMAT metnini iþler.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2771,7 +2823,7 @@
" eðer salt metin oluþturuluyorsa, --ifplaintext açýk, diðerleri kapalýdýr;\n"
" eðer XML oluþturuluyorsa, --ifxml açýk, deiðerleri kapalýdýr.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2799,88 +2851,88 @@
" makeinfo --no-split foo.texi ne büyüklükte olursa olsun tek Info "
"dosyasý yazar\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: Tanýnamayan TEXINFO_OUTPUT_FORMAT deðeri `%s' yok sayýlýyor.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%1$s: %2$s arg sayýsal olmalýdýr, `%3$s' deðil.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s:makro geniþleme çýktýsý `%s' açýlamadý"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: ikinci makro geniþleme çýktýsý yok sayýlýyor `%s'.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: iç linkler çýktýsý açýlamadý `%s'"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: ikinci iç linkler çýktýsý yok sayýlýyor `%s'.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%1$s: --paragraph-indent arg. sayýsal/`none'/`asis' olmalýdýr, `%2$s' "
"deðil.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
"%1$s: --footnote-style arg. `separate' ya da `end' olmalýdýr, `%2$s' deðil.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: dosya argümaný eksik.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Çok satýrlý komut %c%s uygunsuz kullanýldý"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "`%s' gerekir"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "`%1$s' dizini oluþturulamýyor: %2$s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "`%2$s' içinde `%1$s' yok"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Makro geniþlemesini, Info çýktýsý da oraya gittiðinden, stdout'a "
"atlatýyor.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "`%3$s''den %1$s dosya `%2$s' yapýlýyor.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2888,14 +2940,14 @@
"%1$s: Makro çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --"
"force kullanýnýz.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%1$s: Çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --force "
"kullanýnýz.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2904,96 +2956,99 @@
"%s: Ýç linkler çýktý dosyasý `%s' hatalardan dolayý siliniyor; korumak için "
"--force kullanýnýz.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Bilinmeyen komut `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "@%s'e argüman olarak bir komut vermek için {} kullanýn"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s küme parantezi bekledi"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "Eþleþmemiþ }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "ÝSÝMSÝZ!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s eksik kapama }"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image dosyasý `%1$s' (HTML için) okunamýyor: %2$s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "`%s' adýnda dosya yok"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image dosyasý `%1$s' (metin için) okunamýyor: %2$s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image eksik dosyaadý argümaný"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "tanýmlanmamýþ bayrak: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "(`%s' için deðer yok)"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s bir isim gerektirir"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Eþleþen @end %s'den önce dosya sonuna ulaþýldý"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' geniþleme için çok uzun; geniþletilmedi"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "@multitable þablonunda eksik }"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "@multitable'dan sonraki baþýboþ metin `%s' yoksayýlýyor"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Çok-tablolu öðede, çok fazla sütun (maks %d)"
@@ -3003,7 +3058,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[beklenmeyen] çok-tabloluda sütun #%d seçilemiyor"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "çok-tablolunun dýþýndaki @tab yoksayýlýyor"
@@ -3043,10 +3099,12 @@
msgstr "Çýpa `%1$s' ve düðüm `%2$s' ayný dosya adýna yönlendiriyor"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "Bu @anchor komutu yoksayýldý; buraya yönelik baþvurular çalýþmayacak"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "Bu çýpayý yeniden adlandýrýn ya da `--no-split' seçeneðini kullanýn"
@@ -3061,6 +3119,7 @@
msgstr "`%1$s' ve `%2$s' çýpalarý ayný dosya adýna yönlendiriyor"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "@anchor komutu yoksayýldý; buraya yönelik baþvurular çalýþmayacak"
@@ -3096,16 +3155,16 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "`%s''in Yukarý alaný yok (yanlýþ bölümleme nedeniyle?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Düðüm `%s', Yukarý hedefi olmasýna karþýn, `%s' için eksik menü öðesi "
"içeriyor"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "baþvurulmamýþ düðüm `%s'"
@@ -3150,25 +3209,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%cüst, %cdüðümden önce kullanýldý, %s'e öntanýmlanýyor"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image dosyasý `%1$s' okunamýyor: %2$s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr "@multitable'ýn son öðesi @headitem geçersiz Docbook belgeleri üretiyor"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "kapalý"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "açýk"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Çapraz baþvuru kurulacak ilk argüman boþ olmayabilir"
@@ -3178,6 +3241,7 @@
msgstr "`%s' deHTML çapraz baþvurusu için boþ dosya adý"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "`.' ya da `,'ararken dosya sonuna ulaþýldý"
@@ -3187,10 +3251,12 @@
msgstr "`.' ya da `,' @%s'i izlemelidir, `%c'yi deðil"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "parantez içindeki çapraz baþvurular için @pxref kullanýnýz"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "@inforef'e ilk argüman boþ olmayabilir"
@@ -3262,14 +3328,14 @@
msgid "%s is not a valid region code"
msgstr "%s geçerli bir ISO 639 dil kodu deðildir"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%1$s: --footnote-style arg. `separate' ya da `end' olmalýdýr, `%2$s' deðil.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3411,668 +3477,655 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: `--%s' seçeneði bilinmiyor\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "`%s' çýktý dosyasý oluþturulamýyor"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "`%1$s' dizini oluþturulamýyor: %2$s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: boþ dosya"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Dosyayý bul: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Düðüm `%s' daha önce satýr %d'de tanýmlandý"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s bir isim gerektirir"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "`%s' gerekir"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "@%s'e argüman olarak bir komut vermek için {} kullanýn"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%1$s: --paragraph-indent arg. sayýsal/`none'/`asis' olmalýdýr, `%2$s' "
"deðil.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%1$s: --paragraph-indent arg. sayýsal/`none'/`asis' olmalýdýr, `%2$s' "
"deðil.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%1$s: --footnote-style arg. `separate' ya da `end' olmalýdýr, `%2$s' deðil.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "Bilinmeyen indeks `%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "Bilinmeyen indeks `%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%1$s: %2$s arg sayýsal olmalýdýr, `%3$s' deðil.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%1$s: %2$s arg sayýsal olmalýdýr, `%3$s' deðil.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "`%1$s' dizini oluþturulamýyor: %2$s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "`%s' bulunamýyor."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "baþvurulmamýþ düðüm `%s'"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "baþvurulmamýþ düðüm `%s'"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Ýndeks `%s' zaten mevcut"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%1$s: Çýktý dosyasý `%2$s' hatalardan dolayý siliniyor; korumak için --force "
"kullanýnýz.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: uyarý: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: uyarý: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(satýr %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(satýr %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "@def arg'da kayýp `}'"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Çýpa `%1$s' ve düðüm `%2$s' ayný dosya adýna yönlendiriyor"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Dipnot içi dipnotlara izin verilmez"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Bilinmeyen komut `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "@%s'ye hatalý argüman"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: boþ dosya"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "baþvurulmamýþ düðüm `%s'"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "@inforef'e ilk argüman boþ olmayabilir"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s baþvuru mevcut olmayan düðüme `%s' (yanlýþ bölümleme nedeniyle?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image dosyasý `%1$s' okunamýyor: %2$s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Makro `%s', %d satýrýnda çok sayýda arg.la çaðrýldý"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "makro geniþlemesindeki \\'i, parametre adý yerine `%s' izliyor"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "`%s' için indeks girdisi yok.\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "@item, @itemize'a argüman olarak kullanýlamaz"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Ýndeks `%s' zaten mevcut"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "makro `%s' daha önce tanýmlanmýþ"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Dipnot `%s' için kapama } yok"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s kullanýmdan kalkmýþ"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s kullanýmdan kalkmýþ"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "önce Üst"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "makro `%s' daha önce tanýmlanmýþ"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s küme parantezi bekledi"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: boþ dosya"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "çok-tablolunun dýþýndaki @tab yoksayýlýyor"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s argüman olarak `i' ya da `j' gerektirir, %c deðil"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Bilinmeyen komut `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "tanýmlanmamýþ komut: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s eksik kapama }"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s eksik kapama }"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: açýlamayan --css-dosyasý: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "`%s' için indeks girdisi yok.\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: açýlamayan --css-dosyasý: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image dosyasý `%1$s' okunamýyor: %2$s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr ""
+"@quote-arg kullanýlmýyor; argümanlar öntanýmlý olarak týrnak içine alýnýyor"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "`%s' düðümü bulunamadý."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image dosyasý `%1$s' (HTML için) okunamýyor: %2$s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Not...} Info'da sahte bir çapraz-baþvuru oluþturur; bundan kaçýnmak "
-"için yazýmý deðiþtirin"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "`.' ya da `,' @%s'i izlemelidir, `%c'yi deðil"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' ya da `,' @%s'i izlemelidir, `%c'yi deðil"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "önce Üst"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "önce Üst"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "önce Üst"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image dosyasý `%1$s' okunamýyor: %2$s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "`%s''e yazma hatasý"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Bilinmeyen komut `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Bilinmeyen komut `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "`%s' girdi dosyasý açýlamýyor"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: açýlamayan --css-dosyasý: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr ""
-"@quote-arg kullanýlmýyor; argümanlar öntanýmlý olarak týrnak içine alýnýyor"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4123,7 +4176,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "@%s:%s'ye hatalý argüman"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "@%s'ye hatalý argüman"
@@ -4139,7 +4192,7 @@
msgstr "@item, @itemize'a argüman olarak kullanýlamaz"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: dosya argümaný eksik.\n"
@@ -4212,157 +4265,169 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "address@hidden' bloðu içinde @%s anlamlý deðil"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: açýlamayan --css-dosyasý: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "address@hidden' kullanmak için address@hidden' ortamý içinde
ol(un)malýdýr"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "önce Üst"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "önce Üst"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: açýlamayan --css-dosyasý: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "`%s' gerekir"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "address@hidden' çevresi dýþýnda @%s anlamlý deðil"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: dosya argümaný eksik.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "@%s:%s'ye hatalý argüman"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%1$s: %2$s arg sayýsal olmalýdýr, `%3$s' deðil.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%1$s: --footnote-style arg. `separate' ya da `end' olmalýdýr, `%2$s' deðil.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Ýndeks `%s' zaten mevcut"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "`%1$s' dizini oluþturulamýyor: %2$s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: açýlamayan --css-dosyasý: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "`%1$s' dizini oluþturulamýyor: %2$s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Bu düðümde menü yok."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(tüm düðümlerin dýþýnda)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "`%s' düðümü bulunamadý."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "`.' ya da `,' @%s'i izlemelidir, `%c'yi deðil"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "`.' ya da `,' @%s'i izlemelidir, `%c'yi deðil"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image dosyasý `%1$s' okunamýyor: %2$s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "`%s' düðümü bulunamadý."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Not...} Info'da sahte bir çapraz-baþvuru oluþturur; bundan "
+#~ "kaçýnmak için yazýmý deðiþtirin"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "`.' ya da `,' @%s'i izlemelidir, `%c'yi deðil"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: uyarý: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Ýndeks `%s' zaten mevcut"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: kuraldýþý seçenek -- %c\n"
Index: po/uk.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/uk.po,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- po/uk.po 20 Mar 2011 21:20:29 -0000 1.9
+++ po/uk.po 9 Apr 2011 00:10:42 -0000 1.10
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.13\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2010-06-01 14:53+0300\n"
"Last-Translator: Maxim V. Dziumanenko <address@hidden>\n"
"Language-Team: Ukrainian <address@hidden>\n"
@@ -82,11 +82,11 @@
msgid "memory exhausted"
msgstr "виÑеÑпано памâÑÑÑ"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "ÐеÑейÑи на Ñимвол впеÑед"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "ÐеÑейÑи на Ñимвол назад"
@@ -98,11 +98,11 @@
msgid "Move to the end of this line"
msgstr "ÐеÑейÑи в кÑнеÑÑ ÑÑого ÑÑдка"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "ÐеÑейÑи впеÑед на одне Ñлово"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "ÐеÑейÑи назад на одне Ñлово"
@@ -183,6 +183,7 @@
msgstr "Ðдине доповненнÑ"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Ðдне доповненнÑ:\n"
@@ -196,6 +197,7 @@
msgstr "ÐÑÑавиÑи доповненнÑ"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "ÐобÑдова ÑпиÑÐºÑ Ð´Ð¾Ð¿Ð¾Ð²Ð½ÐµÐ½Ñ..."
@@ -220,10 +222,12 @@
msgstr "ÐнайÑи ÑÑдок Ñ Ð¿Ð¾ÐºÐ°Ð¶ÑÐ¸ÐºÑ ÑÑого ÑайлÑ"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "ТÑÐ¸Ð²Ð°Ñ Ð¿Ð¾ÑÑк пÑнкÑÑв покажÑикÑ..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Ðе знайдено покажÑикÑв."
@@ -239,11 +243,12 @@
"\\[index-search]'"
#: info/indices.c:367
-#, fuzzy
+#, fuzzy, c-format
msgid "No previous index search string."
msgstr "Ðема попеÑеднÑого ÑÑÐ´ÐºÑ Ð´Ð»Ñ Ð¿Ð¾ÑÑÐºÑ Ñ
покажÑикÑ."
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "ÐÐµÐ¼Ð°Ñ Ð¿ÑнкÑÑв покажÑикÑ."
@@ -296,13 +301,13 @@
"\n"
"* ÐенÑ: ÐÑзли, покажÑик ÑкиÑ
мÑÑÑиÑÑ `%s':\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "СпÑобÑйÑе --help, Ñоб оÑÑимаÑи бÑлÑÑе
ÑнÑоÑмаÑÑÑ.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -318,12 +323,12 @@
"його.\n"
"Ðе надаÑÑÑÑÑ ÐÐЯÐÐÐ¥ ÐÐÐ ÐÐТÐÐ Ñ ÑамкаÑ
,
пеÑедбаÑениÑ
законом.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "не знайдено пÑнкÑÑв покажÑÐ¸ÐºÑ Ð´Ð»Ñ `%s'\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -334,7 +339,7 @@
"\n"
"ÐеÑеглÑд докÑменÑаÑÑÑ Ñ ÑоÑмаÑÑ Info.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -350,7 +355,7 @@
" --dribble=ФÐÐРзбеÑегÑи ввÑд
коÑиÑÑÑваÑа Ñ Ð¤ÐÐÐ.\n"
" -f, --file=ФÐÐРвказаÑи Ñайл Info длÑ
пеÑеглÑдÑ."
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -364,7 +369,7 @@
"Info.\n"
" -o, --output=ФÐÐРзбеÑегÑи обÑÐ°Ð½Ñ Ð²Ñзли
до ФÐÐÐУ."
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -377,11 +382,11 @@
" --restore=ФÐÐРпÑоÑиÑаÑи поÑаÑковÑ
команди з ФÐÐÐУ.\n"
" -O, --show-options, --usage пеÑейÑи до вÑзла
паÑамеÑÑÑв командного ÑÑдкÑ."
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly зÑÑÑний длÑ
генеÑаÑоÑÑв пÑомов вивÑд."
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -397,7 +402,7 @@
" --version показаÑи ÑнÑоÑмаÑÑÑ Ð¿Ñо
веÑÑÑÑ Ñа вийÑи.\n"
" -w, --where, --location вивеÑÑи ÑÑзиÑне
ÑозÑаÑÑÐ²Ð°Ð½Ð½Ñ ÑÐ°Ð¹Ð»Ñ Info."
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -414,7 +419,7 @@
"ÐÑдÑ-ÑÐºÑ Ð·Ð°Ð»Ð¸ÑÐºÐ¾Ð²Ñ Ð°ÑгÑменÑи вважаÑÑÑÑÑ
назвами пÑнкÑÑв\n"
"менÑ, вÑдноÑними до поÑаÑкового вÑзла."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -423,7 +428,7 @@
"Щоб оÑÑимаÑи коÑоÑкий звÑÑ Ð¿Ñо
пÑизнаÑÐµÐ½Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´ клавÑÑам - наÑиÑнÑÑÑ h "
"ÑÑеÑÐµÐ´Ð¸Ð½Ñ Info."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -452,7 +457,7 @@
" info -f ./foo.info пÑоÑÑо показаÑи Ñайл
./foo.info, без поÑÑÐºÑ Ñ "
"dir"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -465,73 +470,73 @@
"загалÑÐ½Ñ Ð¿Ð¸ÑÐ°Ð½Ð½Ñ Ñа обговоÑÐµÐ½Ð½Ñ - на
адÑеÑÑ address@hidden"
"ÐомаÑÐ½Ñ ÑÑоÑÑнка texinfo: http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи вÑзол `%s'."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи вÑзол `(%s)%s'."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи вÑкно!"
-#: info/info.c:699
+#: info/info.c:719
#, fuzzy
msgid "Point doesn't appear within this window's node!"
msgstr "ÐказÑвник знаÑ
одиÑÑÑÑ Ð·Ð° межами вÑзла
ÑÑого вÑкна!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Ðеможливо вилÑÑиÑи Ñдине вÑкно."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Цей вÑзол не Ð¼Ð°Ñ Ð¼ÐµÐ½Ñ."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Цей вÑзол не Ð¼Ð°Ñ Ð²Ð¸Ð½Ð¾Ñок."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Цей вÑзол не мÑÑÑиÑÑ Ð¿ÐµÑеÑ
ÑеÑниÑ
поÑиланÑ."
-#: info/info.c:704
+#: info/info.c:724
#, fuzzy, c-format
msgid "No `%s' pointer for this node."
msgstr "Цей вÑзол не мÑÑÑиÑÑ Ð²ÐºÐ°Ð·Ñвника `%s'."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "ÐевÑдома команда `%c'; ÑпÑобÑйÑе `?', Ñоб
оÑÑимаÑи довÑдкÑ."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "ТеÑмÑнал `%s' недоÑÑаÑнÑо поÑÑжний длÑ
ÑобоÑи Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Ðи вже на оÑÑаннÑй ÑÑоÑÑнÑÑ ÑÑого
вÑзла."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Ðи вже на пеÑÑÑй ÑÑоÑÑнÑÑ ÑÑого вÑзла."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "РлиÑе одне вÑкно."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "ÐÑÑимане вÑкно бÑде занадÑо малим."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr ""
"ÐедоÑÑаÑнÑо мÑÑÑÑ Ð´Ð»Ñ Ð²Ñкна довÑдки, бÑдÑ
лаÑка, пÑибеÑÑÑÑ Ð¾Ð´Ð½Ðµ з вÑкон."
@@ -842,10 +847,12 @@
" Ñа обÑаÑи вÑзол, де бÑде пеÑÑий
збÑг.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "ÐоÑоÑний ÑлÑÑ
поÑÑкÑ:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -854,6 +861,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -871,6 +879,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -878,62 +887,62 @@
"Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ не можÑÑÑ Ð±ÑÑи запÑÑенÑ
взагалÑ:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "ÐоказÑÑ Ð´Ð¾Ð²ÑдкÑ"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "ÐавÑÑайÑе до вÑзла Info `(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "ÐоказаÑи довÑÐ´ÐºÑ Ð´Ð»Ñ ÐºÐ»Ð°Ð²ÑÑÑ KEY"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "ÐÐ¿Ð¸Ñ Ð´Ð»Ñ ÐºÐ»Ð°Ð²ÑÑÑ: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s не пÑизнаÑено Ð¶Ð¾Ð´Ð½Ð¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s не пÑизнаÑено команди."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s пÑизнаÑено %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "ÐоказаÑи, Ñо ÑÑеба наÑиÑнÑÑи, Ñоб
запÑÑÑиÑи Ð²ÐºÐ°Ð·Ð°Ð½Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Ðе Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð°: "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' не пÑизнаÑено Ð¶Ð¾Ð´Ð½Ð¾Ñ Ð¿Ð¾ÑлÑдовноÑÑÑ
клавÑÑ"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s може бÑÑи запÑÑено лиÑе за допомогоÑ
%s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s може бÑÑи запÑÑено за Ð´Ð¾Ð¿Ð¾Ð¼Ð¾Ð³Ð¾Ñ %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "ÐÐµÐ¼Ð°Ñ ÑÑнкÑÑÑ Ð· Ð½Ð°Ð·Ð²Ð¾Ñ `%s'"
@@ -946,91 +955,102 @@
"ÐибÑÑ ÑнÑиÑ
вÑзлÑв:\n"
"-------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "невÑÑна кÑлÑкÑÑÑÑ Ð°ÑгÑменÑÑв"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи вÑ
Ñдний Ñайл `%s'"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "не вдаÑÑÑÑÑ ÑÑвоÑиÑи Ñайл Ð²Ð¸Ð²Ð¾Ð´Ñ `%s'"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "помилка запиÑÑ Ð´Ð¾ `%s'"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "помилка закÑиÑÑÑ ÑÐ°Ð¹Ð»Ñ Ð²Ð¸Ð²Ð¾Ð´Ñ `%s'"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "поÑлÑдовнÑÑÑÑ ÐºÐ»Ð°Ð²ÑÑ Ð·Ð°Ð½Ð°Ð´Ñо довга"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "вÑдÑÑÑÐ½Ñ Ð¿Ð¾ÑлÑдовнÑÑÑÑ ÐºÐ»Ð°Ð²ÑÑ"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "Ñимвол NUL (\\000) не дозволений"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "Ñимвол NUL (^%c) не дозволений"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "пÑопÑÑено Ð½Ð°Ð·Ð²Ñ Ð´ÑÑ"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "ÑекÑÑÑ Ð·Ð°Ð½Ð°Ð´Ñо довга"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "невÑдома дÑÑ `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "назва дÑÑ Ð·Ð°Ð½Ð°Ð´Ñо довга"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "Ð·Ð°Ð¹Ð²Ñ Ñимволи пÑÑÐ»Ñ Ð´ÑÑ `%s'"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "пÑопÑÑено Ð½Ð°Ð·Ð²Ñ Ð·Ð¼ÑнноÑ"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "пÑопÑÑено знак `=' одÑÐ°Ð·Ñ Ð¿ÑÑÐ»Ñ Ð½Ð°Ð·Ð²Ð¸
змÑнноÑ"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "назва змÑÐ½Ð½Ð¾Ñ Ð·Ð°Ð½Ð°Ð´Ñо довга"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "знаÑÐµÐ½Ð½Ñ Ð·Ð°Ð½Ð°Ð´Ñо довге"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "\"%s\", ÑÑдок %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1100,11 +1120,13 @@
"Ñоб оновиÑи його"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
"ÐевÑÑÐ½Ñ Ð´Ð°Ð½Ñ Ñ ÑÐ°Ð¹Ð»Ñ infokey -- деÑкÑ
пÑизнаÑÐµÐ½Ð½Ñ ÐºÐ»Ð°Ð²ÑÑ Ð±Ñде пÑопÑÑено"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"ÐевÑÑÐ½Ñ Ð´Ð°Ð½Ñ Ñ ÑÐ°Ð¹Ð»Ñ infokey -- вÑÑановленнÑ
деÑкиÑ
змÑнниÑ
бÑде пÑопÑÑено"
@@ -1122,6 +1144,7 @@
msgstr "ЧиÑÐ°Ñ Ð½Ð°Ð·Ð²Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ з ÑÑдка
повÑÐ´Ð¾Ð¼Ð»ÐµÐ½Ñ Ñа запÑÑÐºÐ°Ñ ÑÑ"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Ðеможливо запÑÑÑиÑи ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ `echo-area'
звÑдÑи."
@@ -1187,7 +1210,7 @@
msgid "Select visited node: "
msgstr "ÐбеÑÑÑÑ Ð²ÑдвÑданий вÑзол: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "ÐоÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð·Ð½Ð¸ÐºÐ»Ð¾! (%s)."
@@ -1197,7 +1220,7 @@
msgid "regexp error: %s"
msgstr "помилка ÑегÑлÑÑного виÑазÑ: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1206,79 +1229,82 @@
"ÐÑÑаÑмо Ñ Info веÑÑÑÑ %s. ÐаÑиÑнÑÑÑ
\\[get-help-window], Ñоб оÑÑимаÑи "
"довÑдкÑ, \\[menu-item] Ð´Ð»Ñ Ð²Ð¸Ð±Ð¾ÑÑ Ð¿ÑнкÑÑ Ð¼ÐµÐ½Ñ."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "ÐеÑейÑи вниз на наÑÑÑпний ÑÑдок"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "ÐеÑейÑи ввеÑÑ
на попеÑеднÑй ÑÑдок"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "ÐеÑейÑи в кÑнеÑÑ ÑÑдка"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "ÐеÑейÑи на поÑаÑок ÑÑдка"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "ÐаÑÑÑпний"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Це оÑÑаннÑй вÑзол ÑÑого докÑменÑÑ."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "У ÑÑого вÑзла нема `ÐопеÑеднÑого'
вÑзла."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr ""
"У ÑÑого вÑзла Ð½ÐµÐ¼Ð°Ñ `ÐопеÑеднÑого' Ñи
`ÐоÑÑÑнÑого' вÑзла Ñ ÑÑÐ¾Ð¼Ñ Ð´Ð¾ÐºÑменÑÑ."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "ÐеÑейÑи впеÑед Ñи вниз по ÑÑÑÑкÑÑÑÑ
вÑзлÑв"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "ÐеÑейÑи назад Ñи ввеÑÑ
по ÑÑÑÑкÑÑÑÑ
вÑзлÑв"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "ÐÑокÑÑÑиÑи впеÑед Ñе вÑкно"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "ÐÑокÑÑÑиÑи впеÑед Ñе вÑкно й
вÑÑановиÑи ÑÑандаÑÑний ÑозмÑÑ Ð²Ñкна"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "ÐÑокÑÑÑиÑи впеÑед Ñе вÑкно, не
пеÑеÑинаÑÑи меж вÑзла"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"ÐÑокÑÑÑиÑи впеÑед Ñе вÑкно, не
пеÑеÑинаÑÑи меж вÑзла й вÑÑановиÑи "
"ÑÑандаÑÑний ÑозмÑÑ Ð²Ñкна"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "ÐÑокÑÑÑиÑи назад Ñе вÑкно"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "ÐÑокÑÑÑиÑи назад Ñе вÑкно й
вÑÑановиÑи ÑÑандаÑÑний ÑозмÑÑ Ð²Ñкна"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "ÐÑокÑÑÑиÑи назад Ñе вÑкно, не
пеÑеÑинаÑÑи меж вÑзла"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1286,428 +1312,436 @@
"ÐÑокÑÑÑиÑи назад Ñе вÑкно, не пеÑеÑинаÑÑи
меж вÑзла й вÑÑановиÑи ÑÑандаÑÑний "
"ÑозмÑÑ Ð²Ñкна"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "ÐеÑейÑи до поÑаÑÐºÑ Ð²Ñзла"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "ÐеÑейÑи до кÑнÑÑ Ð²Ñзла"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "ÐÑокÑÑÑÑваÑи вниз по ÑÑдкÑ"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "ÐÑокÑÑÑÑваÑи ввеÑÑ
по ÑÑдкÑ"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "ÐÑокÑÑÑÑваÑи вниз на Ð¿Ð¾Ð»Ð¾Ð²Ð¸Ð½Ñ ÐµÐºÑанÑ"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "ÐÑокÑÑÑÑваÑи ввеÑÑ
на Ð¿Ð¾Ð»Ð¾Ð²Ð¸Ð½Ñ ÐµÐºÑанÑ"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "ÐбÑаÑи наÑÑÑпне вÑкно"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "ÐбÑаÑи попеÑÐµÐ´Ð½Ñ Ð²Ñкно"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "РоздÑлиÑи поÑоÑне вÑкно"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "ÐÑибÑаÑи поÑоÑне вÑкно"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Ðе вдаÑÑÑÑÑ Ð¿ÑибÑаÑи поÑÑÑйне вÑкно"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "ÐÑибÑаÑи ÑÑÑ ÑнÑÑ Ð²Ñкна"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "ÐÑокÑÑÑиÑи ÑнÑе вÑкно"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "ÐÑокÑÑÑиÑи ÑнÑе вÑкно назад"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "ÐбÑлÑÑиÑи (або ÑкоÑоÑиÑи) Ñе вÑкно"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "РоздÑлиÑи доÑÑÑпний пÑоÑÑÑÑ ÐµÐºÑанÑ
мÑж видимими вÑкнами"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "ÐеÑемикнÑÑи ÑÑан веÑÑÐ°Ð½Ð½Ñ ÑÑдкÑв Ñ
поÑоÑÐ½Ð¾Ð¼Ñ Ð²ÑкнÑ"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "ÐеÑемикнÑÑи викоÑиÑÑÐ°Ð½Ð½Ñ ÑегÑлÑÑниÑ
виÑазÑв пÑд ÑÐ°Ñ Ð¿Ð¾ÑÑкÑ"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "ÐÑд ÑÐ°Ñ Ð¿Ð¾ÑÑÐºÑ Ð²Ð¸ÐºÐ¾ÑиÑÑовÑваÑимÑÑÑÑÑ
ÑегÑлÑÑÐ½Ñ Ð²Ð¸Ñази."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "ÐÑд ÑÐ°Ñ Ð¿Ð¾ÑÑÐºÑ Ð²Ð¸ÐºÐ¾ÑиÑÑовÑваÑимÑÑÑÑÑ
звиÑÐ°Ð¹Ð½Ñ ÑÑдки."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "ÐбÑаÑи наÑÑÑпний вÑзол"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "ÐбÑаÑи попеÑеднÑй вÑзол"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "ÐбÑаÑи гоÑÑÑнÑй вÑзол"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "ÐбÑаÑи оÑÑаннÑй вÑзол ÑÑого ÑайлÑ"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Це вÑкно не Ð¼Ð°Ñ Ð´Ð¾Ð´Ð°ÑковиÑ
вÑзлÑв"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "ÐбÑаÑи пеÑÑий вÑзол ÑÑого ÑайлÑ"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "ÐбÑаÑи оÑÑаннÑй пÑÐ½ÐºÑ Ð¼ÐµÐ½Ñ ÑÑого
вÑзла"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "ÐбÑаÑи Ñей пÑÐ½ÐºÑ Ð¼ÐµÐ½Ñ"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "У ÑÑÐ¾Ð¼Ñ Ð¼ÐµÐ½Ñ Ð½ÐµÐ¼Ð° %d-го пÑнкÑÑ."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "ÐÑÐ½ÐºÑ Ð¼ÐµÐ½Ñ (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "ÐÑÐ½ÐºÑ Ð¼ÐµÐ½Ñ: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "ÐеÑейÑи за xref (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "ÐеÑейÑи за поÑиланнÑм: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "ÐÑоÑиÑаÑи пÑÐ½ÐºÑ Ð¼ÐµÐ½Ñ Ð¹ обÑаÑи його
вÑзол"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "ÐÑоÑиÑаÑи виноÑÐºÑ Ñи пеÑеÑ
ÑеÑне
поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð¹ обÑаÑи ÑÑ Ð²Ñзол"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "ÐеÑейÑи до поÑаÑÐºÑ Ð¼ÐµÐ½Ñ ÑÑого вÑзла"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "ÐÑдкÑиÑи одноÑаÑно ÑÑÑлÑки пÑнкÑÑв
менÑ, ÑкÑлÑки вдаÑÑÑÑÑ"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "ÐÑоÑиÑаÑи Ð½Ð°Ð·Ð²Ñ Ð²Ñзла й обÑаÑи його"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "ÐеÑейÑи до вÑзла: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "ÐÑзол `%s' не мÑÑÑиÑÑ Ð¼ÐµÐ½Ñ."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "ÐÐµÐ½Ñ Ð²Ñзла `%2$s' не мÑÑÑиÑÑ Ð¿ÑнкÑÑ `%1$s'."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи вÑзол, на Ñкий
поÑилаÑÑÑÑÑ `%s' Ñ `%s'."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "ÐÑоÑиÑаÑи ÑпиÑок пÑнкÑÑв менÑ,
поÑинаÑÑи вÑд dir Ñа пеÑейÑи за ними"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "ÐÑи за менÑ: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "ÐнайÑи вÑзол, Ñо опиÑÑÑ Ð·Ð°Ð¿ÑÑк
пÑогÑами"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "ÐнайÑи вÑзол запÑÑÐºÑ Ð¿ÑогÑами [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "ÐÑоÑиÑаÑи поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° ÑÑоÑÑÐ½ÐºÑ man Ñа
обÑаÑи ÑÑ"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "ÐÑÑимаÑи man-ÑÑоÑÑнкÑ: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "ÐбÑаÑи `ÐеÑÑ
нÑй' вÑзол ÑÑого ÑайлÑ"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "ÐбÑаÑи вÑзол `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, fuzzy, c-format
msgid "Kill node (%s): "
msgstr "ÐбиÑи вÑзол (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, fuzzy, c-format
msgid "Cannot kill node `%s'"
msgstr "Ðе вдаÑÑÑÑÑ Ð²Ð±Ð¸Ñи вÑзол `%s'"
-#: info/session.c:3320
-#, fuzzy
+#: info/session.c:3312
+#, fuzzy, c-format
msgid "Cannot kill the last node"
msgstr "Ðе вдаÑÑÑÑÑ Ð²Ð±Ð¸Ñи оÑÑаннÑй вÑзол"
-#: info/session.c:3406
+#: info/session.c:3398
#, fuzzy
msgid "Select the most recently selected node"
msgstr "ÐбÑаÑи вÑзол, Ñкий бÑло обÑано
оÑÑаннÑм"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "ÐбиÑи Ñей вÑзол"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "ÐÑоÑиÑаÑи Ð½Ð°Ð·Ð²Ñ ÑÐ°Ð¹Ð»Ñ Ð¹ обÑаÑи його"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "ÐнайÑи Ñайл: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Ðе вдаÑÑÑÑÑ ÑÑвоÑиÑи Ñайл Ð²Ð¸Ð²Ð¾Ð´Ñ `%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "ÐÑоблено."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "ÐÐ°Ð¿Ð¸Ñ Ð²Ñзла %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "ÐеÑедаÑи вмÑÑÑ ÑÑого вÑзла ÑеÑез
канал до INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Ðе вдаÑÑÑÑÑ ÑÑвоÑиÑи канал до `%s'."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "ÐÑÑк вÑзла %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "ÐоÑÑк пÑодовжено з кÑнÑÑ Ð´Ð¾ÐºÑменÑа."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "ÐоÑÑк пÑодовжено з поÑаÑÐºÑ Ð´Ð¾ÐºÑменÑа."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "ÐоÑÑк пÑдÑÐ°Ð¹Ð»Ñ %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "ÐÑоÑиÑаÑи ÑÑдок Ñа знайÑи його, вÑаÑ
овÑÑÑи ÑегÑÑÑÑ"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "ÐÑоÑиÑаÑи ÑÑдок Ñа знайÑи його"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "ÐÑоÑиÑаÑи ÑÑдок Ñа знайÑи його Ñ
попеÑеднÑÐ¾Ð¼Ñ ÑекÑÑÑ"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "ÐоÑÑк за ÑегÑлÑÑним виÑазом"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " з вÑаÑ
ÑваннÑм ÑегÑÑÑÑÑ"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " назад"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "ÐоÑÑк"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "ÐоÑÑк не вдавÑÑ."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "ÐовÑоÑиÑи попеÑеднÑй поÑÑк Ñ ÑÐ¾Ð¼Ñ Ð¶
напÑÑмÑ"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Ðема попеÑеднÑого ÑÑÐ´ÐºÑ Ð¿Ð¾ÑÑкÑ"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "ÐовÑоÑиÑи поÑÑк Ñ Ð·Ð²Ð¾ÑоÑнÑÐ¾Ð¼Ñ Ð½Ð°Ð¿ÑÑмÑ"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "ШÑкаÑи ÑÑдок ÑнÑеÑакÑивно, поки ви
його набиÑаÑÑе"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "I-поÑÑк назад за ÑегÑлÑÑним виÑазом: "
-#: info/session.c:4276
+#: info/session.c:4268
#, fuzzy
msgid "I-search backward: "
msgstr "I-поÑÑк назад: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "I-поÑÑк за ÑегÑлÑÑним виÑазом: "
-#: info/session.c:4279
+#: info/session.c:4271
#, fuzzy
msgid "I-search: "
msgstr "I-поÑÑк: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Ðевдалий "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "ÐеÑейÑи до попеÑеднÑого пеÑеÑ
ÑеÑного
поÑиланнÑ"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "ÐеÑейÑи до наÑÑÑпного пеÑеÑ
ÑеÑного
поÑиланнÑ"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "ÐбÑаÑи поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñи пÑÐ½ÐºÑ Ð¼ÐµÐ½Ñ Ð· ÑÑого
ÑÑдка"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "СкаÑÑваÑи поÑоÑÐ½Ñ Ð¾Ð¿ÐµÑаÑÑÑ"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "ÐавеÑÑено"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "ÐеÑеÑÑнÑÑи кÑÑÑÐ¾Ñ Ð´Ð¾ вказаного ÑÑдка
вÑкна"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "ÐновиÑи зобÑаженнÑ"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "ÐийÑи з Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "ÐапÑÑÑиÑи командÑ, пÑизнаÑÐµÐ½Ñ ÑÑй
клавÑÑÑ Ñ Ð½Ð¸Ð¶Ð½ÑÐ¾Ð¼Ñ ÑегÑÑÑÑÑ"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "ÐевÑдома команда (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "невÑÑна поÑлÑдовнÑÑÑÑ \"%s\""
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "невÑÑна поÑлÑдовнÑÑÑÑ `%s'"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "ÐодаÑи ÑÑ ÑиÑÑÑ Ð´Ð¾ поÑоÑного
ÑиÑлового аÑгÑменÑÑ"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "ÐнÑÑÑÑваÑи (Ñи помножиÑи на 4) поÑоÑний
ÑиÑловий аÑгÑменÑ"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "ÐикоÑиÑÑовÑÑÑÑÑÑ \\[universal-argument]
внÑÑÑÑÑнÑо"
@@ -1815,31 +1849,26 @@
msgid " Subfile: %s"
msgstr " ÐÑд-Ñайл: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: попеÑедженнÑ: "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " Ð´Ð»Ñ %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tСпÑобÑйÑе `%s --help', Ñоб оÑÑимаÑи повний
ÑпиÑок паÑамеÑÑÑв.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "ÐикоÑиÑÑаннÑ: %s [ÐÐÐ ÐÐÐТР]... [ФÐÐÐ-INFO
[ФÐÐÐ-DIR]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr "ÐÐ¾Ð´Ð°Ñ Ñи вилÑÑÐ°Ñ Ð¿ÑнкÑи ФÐÐÐУ-INFO з
ÑÐ°Ð¹Ð»Ñ ÐºÐ°ÑÐ°Ð»Ð¾Ð³Ñ Info ФÐÐÐ-DIR."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1863,7 +1892,7 @@
" Ñе ж Ñаме, Ñо викоÑиÑÑаÑи
аÑгÑÐ¼ÐµÐ½Ñ Ð¤ÐÐÐ-DIR.\n"
" --dry-run Ñе ж Ñаме, Ñо й --test."
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1892,7 +1921,7 @@
" запиÑÑ, Ñо вÑдповÑдаÑ
ÑнÑоÑмаÑÑÑ Ð· ÑÐ°Ð¹Ð»Ñ Info\n"
" Ñ Ñакож не бÑде знайдено назви
ÑайлÑ."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1918,7 +1947,7 @@
" --no-indent не ÑоÑмаÑÑваÑи Ð½Ð¾Ð²Ñ Ð·Ð°Ð¿Ð¸Ñи Ñ
ÑÐ°Ð¹Ð»Ñ ÐºÐ°ÑалогÑ.\n"
" --quiet не показÑваÑи попеÑедженÑ."
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1947,7 +1976,7 @@
" за ÑнÑоÑмаÑÑÑÑ Ñ ÑÐ°Ð¹Ð»Ñ Info.\n"
" --section R СÐÐЦÐЯ Ñе ж Ñаме, Ñо й --regex=R
--section=СÐÐЦÐЯ --add-once."
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1957,7 +1986,7 @@
" --test не оновлÑваÑи ФÐÐÐ-DIR.\n"
" --version показаÑи ÑнÑоÑмаÑÑÑ Ð¿Ñо
веÑÑÑÑ Ð¹ вийÑи."
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1967,7 +1996,7 @@
"загалÑÐ½Ñ Ð·Ð°Ð¿Ð¸ÑÐ°Ð½Ð½Ñ Ð¹ обговоÑÐµÐ½Ð½Ñ Ð´Ð¾
address@hidden"
"ÐомаÑÐ½Ñ ÑÑоÑÑнка texinfo: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -2004,65 +2033,69 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: не вдаÑÑÑÑÑ Ð¿ÑоÑиÑаÑи (%s) Ñ Ð½Ðµ
вдаÑÑÑÑÑ ÑÑвоÑиÑи (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: поÑожнÑй Ñайл"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY без вÑдповÑдного
END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY без вÑдповÑдного
START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: вже Ð¼Ð°Ñ Ñайл каÑалогÑ: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: ÐкажÑÑÑ Ñайл Info лиÑе один Ñаз.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "ÐÑопÑÑено зайвий ÑегÑлÑÑний виÑаз `%s'"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Ðомилка Ñ ÑегÑлÑÑÐ½Ð¾Ð¼Ñ Ð²Ð¸ÑÐ°Ð·Ñ `%s': %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "зайвий аÑгÑÐ¼ÐµÐ½Ñ `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"Ðе вказано вÑ
ÑдниÑ
ÑайлÑв; ÑпÑобÑйÑе --help,
Ñоб оÑÑимаÑи бÑлÑÑе ÑнÑоÑмаÑÑÑ."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"Ðе вказано Ñайл каÑалогÑ; ÑпÑобÑйÑе --help,
Ñоб оÑÑимаÑи бÑлÑÑе ÑнÑоÑмаÑÑÑ."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "Ð½ÐµÐ¼Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑ info dir Ñ `%s'"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "Ñ `%s' запиÑÑв не знайдено; нÑÑого не
вилÑÑено"
@@ -2134,6 +2167,7 @@
msgstr "навÑÑд Ñи Ñимвол %c Ñ @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @sc веÑÑ Ñ Ð²ÐµÐ»Ð¸ÐºÐ¾Ð¼Ñ
ÑегÑÑÑÑÑ, оÑож нÑÑкого еÑекÑÑ"
@@ -2143,6 +2177,7 @@
msgstr "оÑÑкÑвалоÑÑ `{', наÑомÑÑÑÑ Ð¾ÑÑимано `%c'"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "Ñайл закÑнÑивÑÑ Ð²ÑеÑÐµÐ´Ð¸Ð½Ñ Ð±Ð»Ð¾ÐºÑ verb"
@@ -2151,7 +2186,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "оÑÑкÑвалоÑÑ `}', наÑомÑÑÑÑ Ð¾ÑÑимано `%c'"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2164,7 +2201,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s Ñ Ð·Ð°ÑÑаÑÑлим"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp поÑÑебÑÑ Ð¿Ð¾Ð·Ð¸Ñивний ÑиÑловий
аÑгÑменÑ, а не `%s'"
@@ -2174,17 +2211,17 @@
msgid "Bad argument to %c%s"
msgstr "ÐепÑавилÑний аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "none"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "ÐепÑавилÑний аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @%s"
@@ -2193,32 +2230,33 @@
msgid "insert"
msgstr "insert"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "ÐепÑавилÑний аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "ÐÑÑкÑÑÑÑÑÑ @%s on Ñи off, а не `%s'"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "ÐÑдÑÑимÑÑÑÑÑÑ Ð»Ð¸Ñе @%s 10 Ñи 11, а не `%s'"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "СеÑед аÑгÑменÑÑв @def пÑопÑÑено `}'"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "ÐÐ»Ñ Ð²Ð¸ÐºÐ¾ÑиÑÑÐ°Ð½Ð½Ñ address@hidden' поÑÑÑбне
оÑоÑÐµÐ½Ð½Ñ address@hidden'"
@@ -2239,10 +2277,11 @@
msgstr "пÑопÑÑено `%s', бо Ð·Ð°Ð¿Ð¸Ñ Ð¹Ð´Ðµ Ñ
ÑÑандаÑÑний вивÑд"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "ÐÑÑÐµÑ Ð²Ð¸Ð²Ð¾Ð´Ñ Ð½Ðµ Ñ Ð¿Ð¾ÑожнÑм."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "ÐапиÑаний Ñип float `%s' не
викоÑиÑÑовÑвавÑÑ Ð´Ð¾ ÑÑого"
@@ -2262,11 +2301,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "Ðема заклÑÑÐ½Ð¾Ñ Ð´Ñжки Ð´Ð»Ñ Ð²Ð¸Ð½Ð¾Ñки `%s'"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "ÐизнаÑÐµÐ½Ð½Ñ Ð²Ð¸Ð½Ð¾Ñки без вÑзла, до Ñкого
вона вÑдноÑиÑÑÑÑ"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "ÐиноÑки з виноÑок не дозволенÑ"
@@ -2279,21 +2320,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи --css-file: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file закÑнÑивÑÑ ÑÑеÑединÑ
коменÑаÑÑ"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[unexpected] Ð½ÐµÐ¼Ð°Ñ ÑеÒÑ html Ð´Ð»Ñ Ð²Ð¸ÑÑовÑ
ÑваннÑ"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[unexpected] недопÑÑÑима назва вÑзла: `%s'"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "ÐевÑдомий покажÑик `%s'"
@@ -2322,14 +2364,14 @@
msgid "(line %*d)"
msgstr "(ÑÑдок %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "ÐевÑдомий покажÑик `%s' Ñ @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "ÐÑÐ½ÐºÑ Ð¿Ð¾ÐºÐ°Ð¶ÑÐ¸ÐºÑ `%s' Ð·Ð·Ð¾Ð²Ð½Ñ Ð±ÑдÑ-Ñкого
вÑзла"
@@ -2339,6 +2381,7 @@
msgstr "(Ð·Ð·Ð¾Ð²Ð½Ñ Ð±ÑдÑ-Ñкого вÑзла)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "Ñ Ð°ÑгÑменÑаÑ
до @itemize не дозволене @item"
@@ -2347,6 +2390,7 @@
msgstr "Broken-Type Ñ insertion_type_pname"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "ÐеÑÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ ÑÑÐµÐºÑ Ð½ÑмеÑÑваннÑ"
@@ -2355,7 +2399,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "пеÑÐµÐ¿Ð¾Ð²Ð½ÐµÐ½Ð½Ñ Ð»ÑÑеÑÑваннÑ, поÑинаÑмо
знов з %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2366,14 +2410,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "оÑоÑÐµÐ½Ð½Ñ %cfloat не можÑÑÑ Ð±ÑÑи
вкладеними"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden' оÑÑкÑÑ `%s', наÑомÑÑÑÑ Ð¾ÑÑимано
`%s'"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2385,32 +2429,36 @@
msgstr "%s поÑÑебÑÑ Ð»ÑÑеÑÑ Ñи ÑиÑÑÑ"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "Ñайл закÑнÑивÑÑ ÑÑеÑÐµÐ´Ð¸Ð½Ñ Ð±Ð»Ð¾ÐºÑ verbatim"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s не Ð¼Ð°Ñ ÑенÑÑ Ð·Ð·Ð¾Ð²Ð½Ñ Ð¾ÑоÑеннÑ
address@hidden'"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "знайдено @menu пеÑед пеÑÑим @node,
ÑÑвоÑÑÑÑÑÑÑ Ð³Ð¾ÑÑÑнÑй вÑзол `Top'"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
"мабÑÑÑ, Ð²Ð°Ñ Ð²Ñзол @top повинен бÑÑи
обгоÑнÑÑий Ñ @ifnottex замÑÑÑÑ @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr ""
"знайдено @detailmenu пеÑед пеÑÑим вÑзлом,
ÑÑвоÑÑÑÑÑÑÑ Ð³Ð¾ÑÑÑнÑй вÑзол `Top'"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "@%s не Ð¼Ð°Ñ ÑенÑÑ Ð·Ð·Ð¾Ð²Ð½Ñ Ð¾ÑоÑÐµÐ½Ñ address@hidden'
Ñа address@hidden'"
@@ -2420,9 +2468,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s не Ð¼Ð°Ñ ÑенÑÑ Ð·Ð·Ð¾Ð²Ð½Ñ Ð¾ÑоÑеннÑ
address@hidden'"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2433,14 +2481,14 @@
msgid "`%c%s' needs something after it"
msgstr "`%c%s' поÑÑебÑÑ Ñоб за ним ÑоÑÑ Ð±Ñло"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "ÐепÑавилÑний аÑгÑÐ¼ÐµÐ½Ñ `%s' до address@hidden',
беÑеÑÑÑÑ `%s'"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s не Ð¼Ð°Ñ ÑенÑÑ ÑÑеÑÐµÐ´Ð¸Ð½Ñ Ð±Ð»Ð¾ÐºÑ `%s'"
@@ -2485,17 +2533,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s оÑÑкÑÑ `i' Ñи `j' Ñк аÑгÑменÑ, не `%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s оÑÑкÑÑ Ñк аÑгÑÐ¼ÐµÐ½Ñ Ð¾Ð´Ð½Ñ Ð»ÑÑеÑÑ - `i'
Ñи `j'"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "макÑовизнаÑÐµÐ½Ð½Ñ `%s' вже бÑло визнаÑене"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "попеÑÐµÐ´Ð½Ñ Ð²Ð¸Ð·Ð½Ð°ÑÐµÐ½Ð½Ñ `%s' ÑÑÑ"
@@ -2512,55 +2560,57 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "Ðиклик макÑовизнаÑÐµÐ½Ð½Ñ `%s' з ÑÑдка %d
Ð¼Ð°Ñ Ð·Ð°Ð½Ð°Ð´Ñо багаÑо аÑгÑменÑÑв"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "не знайдено %cend macro"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
"@allow-recursion Ñ Ð·Ð°ÑÑаÑÑлим; бÑÐ´Ñ Ð»Ð°Ñка,
викоÑиÑÑовÑйÑе замÑÑÑÑ Ð½Ñого "
"@rmacro"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "@quote-arg Ñ Ð·Ð°ÑÑаÑÑлим; аÑгÑменÑи
беÑÑÑÑÑÑ Ð² лапки Ñипово"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "невÑдповÑдний @end %s до @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "ÐанадÑо багаÑо помилок! ÐеÑеÑвано.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: попеÑедженнÑ: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "ÐепÑавилÑно ÑозÑаÑоване %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "СпÑобÑйÑе `%s --help', Ñоб оÑÑимаÑи бÑлÑÑе
ÑнÑоÑмаÑÑÑ.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "ÐикоÑиÑÑовÑйÑе: %s [ÐÐÐ ÐÐÐТР]...
ФÐÐÐ-TEXINFO...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2569,7 +2619,7 @@
"зазвиÑай,\n"
"Ñ Ñайли Info, Ñо можна ÑиÑаÑи за допомогоÑ
Emacs Ñи GNU Info.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2597,7 +2647,7 @@
" -v, --verbose опиÑÑваÑи, Ñо бÑде
ÑобиÑиÑÑ.\n"
" --version показаÑи ÑнÑоÑмаÑÑÑ Ð¿Ñо
веÑÑÑÑ Ð¹ вийÑи.\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2612,7 +2662,7 @@
" --xml виводиÑи Ñк Texinfo XML а не Ñк
Info.\n"
" --plaintext виводиÑи Ñк пÑоÑÑий ÑекÑÑ
а не Ñк Info.\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2648,7 +2698,7 @@
" -o, --output=ФÐÐРвиводиÑи до ФÐÐÐУ (Ñи
диÑекÑоÑÑÑ Ð´Ð»Ñ HTML з "
"ÑозбиÑÑÑм).\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, fuzzy, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2689,7 +2739,7 @@
" --split-size=ЧÐСÐÐ ÑозбиваÑи Ñайли Info,
коли вони бÑлÑÑÑ Ð·Ð° "
"ЧÐСÐÐ (Ñипово %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2707,7 +2757,7 @@
" --transliterate-file-names\n"
" ÑÑанÑлÑÑеÑовÑваÑи Ñ ASCII
назви ÑайлÑв.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2722,7 +2772,7 @@
" ЯкÑо ÐÐÐЧÐÐÐЯ 0, ÑÑÑ Ð½ÐµÑ
ÑÐ¾Ð²Ð½Ñ Ð¿ÑобÑли бÑдÑÑÑ "
"пÑопÑÑенÑ.\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2741,7 +2791,7 @@
" -U ÐÐÐÐÐÐ ÑкинÑÑи знаÑеннÑ
ÐÐÐÐÐÐÐ, Ñе ж Ñаме, Ñо "
"@clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2779,7 +2829,7 @@
"\n"
" ÐаÑамеÑÑи --no-ifФÐÐ ÐÐТ Ñакож вмикаÑÑÑ
обÑÐ¾Ð±ÐºÑ ÑекÑÑÑ Ñ @ifnotФÐÐ ÐÐТ.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2794,7 +2844,7 @@
"вимкнено;\n"
" ÑкÑо генеÑÑÑÑÑÑÑ XML - --ifxml ввÑмкнено, а
ÑнÑÑ - вимкнено.\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2827,88 +2877,88 @@
" makeinfo --no-split foo.texi запиÑаÑи вÑе в один
Ñайл Info (вÑн "
"бÑде великим)\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: ÐÑопÑÑено невÑдоме знаÑеннÑ
TEXINFO_OUTPUT_FORMAT `%s'.\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: аÑгÑÐ¼ÐµÐ½Ñ %s Ð¼Ð°Ñ Ð±ÑÑи ÑиÑлом, а не `%s'.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи вивÑд длÑ
ÑозкÑиÑÑÑ Ð¼Ð°ÐºÑовизнаÑÐµÐ½Ñ `%s'"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: пÑопÑÑено дÑÑгий вивÑд длÑ
ÑозкÑиÑÑÑ Ð¼Ð°ÐºÑовизнаÑÐµÐ½Ñ `%s'.\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи вивÑд длÑ
запиÑÑ Ð¿Ð¾ÑÐ¸Ð»Ð°Ð½Ñ Ð² докÑменÑÑ `%s'"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: пÑопÑÑено дÑÑгий вивÑд Ð´Ð»Ñ Ð¿Ð¾ÑиланÑ
в докÑменÑÑ `%s'.\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
"%s: аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ --paragraph-indent Ð¼Ð°Ñ Ð±ÑÑи ÑиÑлом,
`none' Ñи `asis', а не `"
"%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-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:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: не вказано аÑгÑÐ¼ÐµÐ½Ñ Ð½Ð°Ð·Ð²Ð¸ ÑайлÑ.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "ÐепÑавилÑне викоÑиÑÑаннÑ
багаÑоÑÑÐ´ÐºÐ¾Ð²Ð¾Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ð¸ %c%s"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "ÐÑÑкÑвалоÑÑ `%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Ðе вдаÑÑÑÑÑ ÑÑвоÑиÑи диÑекÑоÑÑÑ `%s': %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "`%s' не знайдено Ñ `%s'"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: РозкÑиÑÑÑ Ð¼Ð°ÐºÑовизнаÑÐµÐ½Ñ Ð½Ðµ виводиÑÑÑÑ
Ñ ÑÑандаÑÑний вивÑд, бо ÑÑди бÑде "
"виведено Info.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "СÑвоÑÐµÐ½Ð½Ñ %s ÑÐ°Ð¹Ð»Ñ `%s' з `%s'.\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2916,14 +2966,14 @@
"%s: ÐилÑÑÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»Ñ ÑозкÑиÑÑÑ
макÑовизнаÑÐµÐ½Ñ `%s' з-за помилок; заÑÑоÑÑйÑе
--"
"force, Ñоб збеÑегÑи його.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: ÐилÑÑÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»Ñ Ð²Ð¸Ð²Ð¾Ð´Ñ `%s' з-за помилок;
заÑÑоÑÑйÑе --force, Ñоб "
"збеÑегÑи його.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2932,96 +2982,99 @@
"%s: ÐилÑÑÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»Ñ Ð· поÑиланнÑми Ñ
докÑменÑÑ `%s' з-за помилок; заÑÑоÑÑйÑе "
"--force, Ñоб збеÑегÑи його.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "ÐевÑдома команда `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "ÐикоÑиÑÑовÑйÑе дÑжки, Ñоб пеÑедаÑи
ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ñк аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s оÑÑкÑвалиÑÑ Ð´Ñжки"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "ÐевÑдповÑдна }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "ÐÐÐÐ_ÐÐÐÐÐ!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s не Ð¼Ð°Ñ Ð·Ð°ÐºÐ»ÑÑÐ½Ð¾Ñ Ð´Ñжки"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "Ñайл @image `%s' (Ð´Ð»Ñ HTML) неможливо
пÑоÑиÑаÑи: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Ðема Ñакого ÑÐ°Ð¹Ð»Ñ `%s'"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "Ñайл @image `%s' (Ð´Ð»Ñ ÑекÑÑÑ) неможливо
пÑоÑиÑаÑи: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "не вказано аÑгÑÐ¼ÐµÐ½Ñ Ð½Ð°Ð·Ð²Ð¸ ÑÐ°Ð¹Ð»Ñ Ð´Ð»Ñ
@image"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "невÑдомий пÑапоÑеÑÑ: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Ðе вказане знаÑÐµÐ½Ð½Ñ Ð´Ð»Ñ `%s'}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ Ð²ÐºÐ°Ð·Ð°Ñи назвÑ"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Ðе знайдено вÑдповÑдного @end %s - кÑнеÑÑ
ÑайлÑ"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "`%.40s...' занадÑо довге Ð´Ð»Ñ ÑозкÑиÑÑÑ; не
ÑозкÑиваÑимеÑÑÑÑ"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "ÐÑопÑÑено } Ñ ÑÐ°Ð±Ð»Ð¾Ð½Ñ @multitable"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "пÑопÑÑкаÑÑÑÑÑ ÑекÑÑ `%s', загÑблений
пÑÑÐ»Ñ @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "ÐанадÑо багаÑо ÑÑовпÑикÑв Ñ Ð¾Ð±âÑкÑÑ
multitable (макÑимÑм %d)"
@@ -3031,7 +3084,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[unexpected] не вдаÑÑÑÑÑ Ð¾Ð±ÑаÑи ÑÑовпÑик â%d
з multitable"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "пÑопÑÑкаÑÑÑÑÑ @tab Ð·Ð¾Ð²Ð½Ñ multitable"
@@ -3071,10 +3125,12 @@
msgstr "ÐвâÑзок `%s' Ñа вÑзол `%s' поÑилаÑÑÑÑÑ Ð½Ð°
один Ñайл"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "Ð¦Ñ ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ @anchor бÑде пÑопÑÑено;
поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð° Ð½ÐµÑ Ð½Ðµ пÑаÑÑваÑимÑÑÑ"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "ÐеÑейменÑйÑе Ñей звâÑзок Ñи
викоÑиÑÑайÑе паÑамеÑÑ `--no-split'"
@@ -3089,6 +3145,7 @@
msgstr "ÐвâÑзки `%s' Ñа `%s' поÑилаÑÑÑÑÑ Ð½Ð° один
Ñайл"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "ÐÑопÑÑено ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ @anchor; поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ð°
Ð½ÐµÑ Ð½Ðµ пÑаÑÑваÑимÑÑÑ"
@@ -3125,14 +3182,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "`%s' не Ð¼Ð°Ñ Ð¿Ð¾Ð»Ñ Up (мабÑÑÑ, з-за
непÑавилÑного ÑекÑÑÑваннÑ?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "ÐÑзол `%s' не Ð¼Ð°Ñ Ð¿ÑнкÑÑ Ð¼ÐµÐ½Ñ Ð´Ð»Ñ `%s', Ñ
оÑа й Ñ Ð¹Ð¾Ð³Ð¾ гоÑÑÑнÑм вÑзлом"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "вÑзол, на Ñкий нема поÑÐ¸Ð»Ð°Ð½Ñ `%s'"
@@ -3177,29 +3234,33 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop викоÑиÑÑано пеÑед %cnode,
повеÑÑаÑмоÑÑ Ð´Ð¾ Ñипового %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Ðеможливо пÑоÑиÑаÑи Ñайл @image `%s': %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem, Ñк оÑÑаннÑй обâÑÐºÑ @multitable
пÑизводиÑÑ Ð´Ð¾ непÑавилÑниÑ
"
"докÑменÑÑв Docbook"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
#, fuzzy
msgid "of"
msgstr "of"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
#, fuzzy
msgid "on"
msgstr "on"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "ÐеÑÑий аÑгÑÐ¼ÐµÐ½Ñ Ð¿ÐµÑеÑ
ÑеÑного
поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ð½Ðµ може бÑÑи поÑожнÑм"
@@ -3209,6 +3270,7 @@
msgstr "ÐоÑÐ¾Ð¶Ð½Ñ Ð½Ð°Ð·Ð²Ð° ÑÐ°Ð¹Ð»Ñ Ð´Ð»Ñ Ð¿ÐµÑеÑ
ÑеÑного
поÑÐ¸Ð»Ð°Ð½Ð½Ñ HTML Ñ `%s'"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "У поÑÑкаÑ
`.' Ñи `,' доÑÑгнÑÑо кÑнÑÑ
Ñайла"
@@ -3218,10 +3280,12 @@
msgstr "`.' Ñи `,' маÑÑÑ Ð¹Ñи пÑÑÐ»Ñ @%s, а не `%c'"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Ñоб оÑÑимаÑи пеÑеÑ
ÑеÑне поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ
дÑжкаÑ
, викоÑиÑÑовÑйÑе @pxref"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "ÐеÑÑий аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @inforef не може бÑÑи
поÑожнÑм"
@@ -3291,14 +3355,14 @@
msgid "%s is not a valid region code"
msgstr "%s не Ñ Ð¿ÑавилÑним кодом мови за ISO 639"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
"%s: аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ --footnote-style Ð¼Ð°Ñ Ð±ÑÑи `separate' Ñи
`end', а не `%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3442,671 +3506,658 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: невÑдомий паÑамеÑÑ `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "не вдаÑÑÑÑÑ ÑÑвоÑиÑи Ñайл Ð²Ð¸Ð²Ð¾Ð´Ñ `%s'"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Ðе вдаÑÑÑÑÑ ÑÑвоÑиÑи диÑекÑоÑÑÑ `%s': %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: поÑожнÑй Ñайл"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "ÐнайÑи Ñайл: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "ÐÑзол `%s' вже визнаÑено ÑÑдком %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s Ð²Ð¸Ð¼Ð°Ð³Ð°Ñ Ð²ÐºÐ°Ð·Ð°Ñи назвÑ"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "ÐÑÑкÑвалоÑÑ `%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "ÐикоÑиÑÑовÑйÑе дÑжки, Ñоб пеÑедаÑи
ÐºÐ¾Ð¼Ð°Ð½Ð´Ñ Ñк аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
"%s: аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ --paragraph-indent Ð¼Ð°Ñ Ð±ÑÑи ÑиÑлом,
`none' Ñи `asis', а не `"
"%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
"%s: аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ --paragraph-indent Ð¼Ð°Ñ Ð±ÑÑи ÑиÑлом,
`none' Ñи `asis', а не `"
"%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
"%s: аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ --footnote-style Ð¼Ð°Ñ Ð±ÑÑи `separate' Ñи
`end', а не `%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "ÐевÑдомий покажÑик `%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "ÐевÑдомий покажÑик `%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: аÑгÑÐ¼ÐµÐ½Ñ %s Ð¼Ð°Ñ Ð±ÑÑи ÑиÑлом, а не `%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: аÑгÑÐ¼ÐµÐ½Ñ %s Ð¼Ð°Ñ Ð±ÑÑи ÑиÑлом, а не `%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Ðе вдаÑÑÑÑÑ ÑÑвоÑиÑи диÑекÑоÑÑÑ `%s': %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "вÑзол, на Ñкий нема поÑÐ¸Ð»Ð°Ð½Ñ `%s'"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "вÑзол, на Ñкий нема поÑÐ¸Ð»Ð°Ð½Ñ `%s'"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "ÐокажÑик `%s' вже ÑÑнÑÑ"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: ÐилÑÑÐµÐ½Ð½Ñ ÑÐ°Ð¹Ð»Ñ Ð²Ð¸Ð²Ð¾Ð´Ñ `%s' з-за помилок;
заÑÑоÑÑйÑе --force, Ñоб "
"збеÑегÑи його.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: попеÑедженнÑ: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: попеÑедженнÑ: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "СеÑед аÑгÑменÑÑв @def пÑопÑÑено `}'"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "ÐвâÑзок `%s' Ñа вÑзол `%s' поÑилаÑÑÑÑÑ Ð½Ð°
один Ñайл"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "ÐиноÑки з виноÑок не дозволенÑ"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "ÐевÑдома команда `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "ÐепÑавилÑний аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: поÑожнÑй Ñайл"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "вÑзол, на Ñкий нема поÑÐ¸Ð»Ð°Ð½Ñ `%s'"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "ÐеÑÑий аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @inforef не може бÑÑи
поÑожнÑм"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s поÑилаÑÑÑÑÑ Ð½Ð° неÑÑнÑÑÑий вÑзол `%s'
(мабÑÑÑ, з-за непÑавилÑного "
"ÑекÑÑÑваннÑ?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "Ðеможливо пÑоÑиÑаÑи Ñайл @image `%s': %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "Ðиклик макÑовизнаÑÐµÐ½Ð½Ñ `%s' з ÑÑдка %d
Ð¼Ð°Ñ Ð·Ð°Ð½Ð°Ð´Ñо багаÑо аÑгÑменÑÑв"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
"\\ пÑд ÑÐ°Ñ ÑозкÑиÑÑÑ Ð¼Ð°ÐºÑовизнаÑеннÑ, за
Ñким йÑло `%s' замÑÑÑÑ Ð½Ð°Ð·Ð²Ð¸ "
"паÑамеÑÑÑ"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "не знайдено пÑнкÑÑв покажÑÐ¸ÐºÑ Ð´Ð»Ñ `%s'\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "Ñ Ð°ÑгÑменÑаÑ
до @itemize не дозволене @item"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "ÐокажÑик `%s' вже ÑÑнÑÑ"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "макÑовизнаÑÐµÐ½Ð½Ñ `%s' вже бÑло визнаÑене"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Ðема заклÑÑÐ½Ð¾Ñ Ð´Ñжки Ð´Ð»Ñ Ð²Ð¸Ð½Ð¾Ñки `%s'"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s Ñ Ð·Ð°ÑÑаÑÑлим"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s Ñ Ð·Ð°ÑÑаÑÑлим"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "знайдено @menu пеÑед пеÑÑим @node,
ÑÑвоÑÑÑÑÑÑÑ Ð³Ð¾ÑÑÑнÑй вÑзол `Top'"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "макÑовизнаÑÐµÐ½Ð½Ñ `%s' вже бÑло визнаÑене"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s оÑÑкÑвалиÑÑ Ð´Ñжки"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: поÑожнÑй Ñайл"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "пÑопÑÑкаÑÑÑÑÑ @tab Ð·Ð¾Ð²Ð½Ñ multitable"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s оÑÑкÑÑ `i' Ñи `j' Ñк аÑгÑменÑ, не `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "ÐевÑдома команда `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "ÐевÑдома команда: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s не Ð¼Ð°Ñ Ð·Ð°ÐºÐ»ÑÑÐ½Ð¾Ñ Ð´Ñжки"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s не Ð¼Ð°Ñ Ð·Ð°ÐºÐ»ÑÑÐ½Ð¾Ñ Ð´Ñжки"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи --css-file: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "не знайдено пÑнкÑÑв покажÑÐ¸ÐºÑ Ð´Ð»Ñ `%s'\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи --css-file: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "Ðеможливо пÑоÑиÑаÑи Ñайл @image `%s': %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "@quote-arg Ñ Ð·Ð°ÑÑаÑÑлим; аÑгÑменÑи
беÑÑÑÑÑÑ Ð² лапки Ñипово"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи вÑзол `%s'."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Ñайл @image `%s' (Ð´Ð»Ñ HTML) неможливо
пÑоÑиÑаÑи: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"@strong{Note...} ÑÑвоÑÑÑ Ñ
Ð¸Ð±Ð½Ñ Ð¿ÐµÑеÑ
ÑеÑнÑ
поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ Info; пеÑеÑоÑмÑлÑйÑе, "
-"ÑникаÑÑи ÑÑого"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "`.' Ñи `,' маÑÑÑ Ð¹Ñи пÑÑÐ»Ñ @%s, а не `%c'"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' Ñи `,' маÑÑÑ Ð¹Ñи пÑÑÐ»Ñ @%s, а не `%c'"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "знайдено @menu пеÑед пеÑÑим @node,
ÑÑвоÑÑÑÑÑÑÑ Ð³Ð¾ÑÑÑнÑй вÑзол `Top'"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "знайдено @menu пеÑед пеÑÑим @node,
ÑÑвоÑÑÑÑÑÑÑ Ð³Ð¾ÑÑÑнÑй вÑзол `Top'"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "знайдено @menu пеÑед пеÑÑим @node,
ÑÑвоÑÑÑÑÑÑÑ Ð³Ð¾ÑÑÑнÑй вÑзол `Top'"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "Ðеможливо пÑоÑиÑаÑи Ñайл @image `%s': %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "помилка запиÑÑ Ð´Ð¾ `%s'"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "ÐевÑдома команда `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "ÐевÑдома команда `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи вÑ
Ñдний Ñайл `%s'"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи --css-file: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "@quote-arg Ñ Ð·Ð°ÑÑаÑÑлим; аÑгÑменÑи
беÑÑÑÑÑÑ Ð² лапки Ñипово"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4159,7 +4210,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "ÐепÑавилÑний аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "ÐепÑавилÑний аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @%s"
@@ -4175,7 +4226,7 @@
msgstr "Ñ Ð°ÑгÑменÑаÑ
до @itemize не дозволене @item"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: не вказано аÑгÑÐ¼ÐµÐ½Ñ Ð½Ð°Ð·Ð²Ð¸ ÑайлÑ.\n"
@@ -4248,157 +4299,169 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s не Ð¼Ð°Ñ ÑенÑÑ ÑÑеÑÐµÐ´Ð¸Ð½Ñ Ð±Ð»Ð¾ÐºÑ `%s'"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи --css-file: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "ÐÐ»Ñ Ð²Ð¸ÐºÐ¾ÑиÑÑÐ°Ð½Ð½Ñ address@hidden' поÑÑÑбне
оÑоÑÐµÐ½Ð½Ñ address@hidden'"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "знайдено @menu пеÑед пеÑÑим @node,
ÑÑвоÑÑÑÑÑÑÑ Ð³Ð¾ÑÑÑнÑй вÑзол `Top'"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "знайдено @menu пеÑед пеÑÑим @node,
ÑÑвоÑÑÑÑÑÑÑ Ð³Ð¾ÑÑÑнÑй вÑзол `Top'"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи --css-file: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "ÐÑÑкÑвалоÑÑ `%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s не Ð¼Ð°Ñ ÑенÑÑ Ð·Ð·Ð¾Ð²Ð½Ñ Ð¾ÑоÑеннÑ
address@hidden'"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: не вказано аÑгÑÐ¼ÐµÐ½Ñ Ð½Ð°Ð·Ð²Ð¸ ÑайлÑ.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "ÐепÑавилÑний аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: аÑгÑÐ¼ÐµÐ½Ñ %s Ð¼Ð°Ñ Ð±ÑÑи ÑиÑлом, а не `%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
"%s: аÑгÑÐ¼ÐµÐ½Ñ Ð´Ð¾ --footnote-style Ð¼Ð°Ñ Ð±ÑÑи `separate' Ñи
`end', а не `%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "ÐокажÑик `%s' вже ÑÑнÑÑ"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Ðе вдаÑÑÑÑÑ ÑÑвоÑиÑи диÑекÑоÑÑÑ `%s': %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: не вдаÑÑÑÑÑ Ð²ÑдкÑиÑи --css-file: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Ðе вдаÑÑÑÑÑ ÑÑвоÑиÑи диÑекÑоÑÑÑ `%s': %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Цей вÑзол не Ð¼Ð°Ñ Ð¼ÐµÐ½Ñ."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(Ð·Ð·Ð¾Ð²Ð½Ñ Ð±ÑдÑ-Ñкого вÑзла)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи вÑзол `%s'."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "`.' Ñи `,' маÑÑÑ Ð¹Ñи пÑÑÐ»Ñ @%s, а не `%c'"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "`.' Ñи `,' маÑÑÑ Ð¹Ñи пÑÑÐ»Ñ @%s, а не `%c'"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "Ðеможливо пÑоÑиÑаÑи Ñайл @image `%s': %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Ðе вдаÑÑÑÑÑ Ð·Ð½Ð°Ð¹Ñи вÑзол `%s'."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Note...} ÑÑвоÑÑÑ Ñ
Ð¸Ð±Ð½Ñ Ð¿ÐµÑеÑ
ÑеÑнÑ
поÑÐ¸Ð»Ð°Ð½Ð½Ñ Ñ Info; "
+#~ "пеÑеÑоÑмÑлÑйÑе, ÑникаÑÑи ÑÑого"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "`.' Ñи `,' маÑÑÑ Ð¹Ñи пÑÑÐ»Ñ @%s, а не `%c'"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: попеÑедженнÑ: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "ÐокажÑик `%s' вже ÑÑнÑÑ"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: непÑавилÑний паÑамеÑÑ -- %c\n"
Index: po/vi.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/vi.po,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- po/vi.po 20 Mar 2011 21:20:29 -0000 1.46
+++ po/vi.po 9 Apr 2011 00:10:42 -0000 1.47
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.13\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2009-09-23 21:25+0930\n"
"Last-Translator: Clytie Siddall <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -83,11 +83,11 @@
msgid "memory exhausted"
msgstr "hết bỠnhỠhoà n toà n"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "Tiếp má»t ký tá»±"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "Lùi má»t ký tá»±"
@@ -99,11 +99,11 @@
msgid "Move to the end of this line"
msgstr "Tá»i cuá»i dòng nà y"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "Tiếp má»t từ"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "Lùi má»t từ"
@@ -184,6 +184,7 @@
msgstr "Sự gõ xong duy nhất"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "Má»t sá»± gõ xong:\n"
@@ -197,6 +198,7 @@
msgstr "Chèn sự gõ xong"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "Äang xây dá»±ng các sá»± gõ xong..."
@@ -222,10 +224,12 @@
msgstr "Tra tìm chuá»i trong chá» mục cho táºp tin nà y"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "Äang tìm mục nháºp chá» mục..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "Không tìm thấy chỠmục."
@@ -241,10 +245,12 @@
"cuá»i cùng."
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "Không có chuá»i tìm kiếm chá» mục trÆ°á»c"
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "Không có gì trong chỠmục."
@@ -298,13 +304,13 @@
"\n"
"* Trình ÄÆ¡n: nút có chá» mục chứa « %s »:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "Hãy thá» lá»nh trợ giúp « --help » Äá» xem thông tin
thêm.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -319,12 +325,12 @@
"Äây là phần má»m tá»± do : bạn có quyá»n thay Äá»i và phát hÃ
nh lại nó.\n"
"KHÃNG Cà BẢO HÃNH Gà CẢ, vá»i Äiá»u kiá»n Äược pháp luáºt
cho phép\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "không tìm thấy gì trong chỠmục cho « %s »\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -335,7 +341,7 @@
"\n"
"Äá»c tà i liá»u hÆ°á»ng dẫn theo Äá»nh dạng Info.\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -351,7 +357,7 @@
" --dribble=TẬP_TIN lÆ°u các cú bấm phÃm và o táºp tin nÃ
y.\n"
" -f, --file=TẬP_TIN ghi rõ táºp tin Info cần thÄm."
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -364,7 +370,7 @@
"tiên.\n"
" -o, --output=TẬP_TIN xuất các nút Äã chá»n và o táºp tin
nà y."
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -376,12 +382,12 @@
" --restore=TẬP_TIN Äá»c các cú bấm phÃm Äầu tiên từ
táºp tin nà y.\n"
" -O, --show-options, --usage \tÄi tá»i nút chứa các tùy chá»n dòng
lá»nh."
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
" -b, --speech-friendly thân thiá»n vá»i thiết bá» tá»ng hợp
tiếng nói"
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -396,7 +402,7 @@
" --version hiá»n thá» thông tin phiên bản rá»i
thoát\n"
" -w, --where, --location in vá» trà váºt lý của táºp tin Info."
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -413,7 +419,7 @@
"Bất cứ Äá»i sá» còn lại nà o Äược xá» lý nhÆ° tên của
mục trình ÄÆ¡n\n"
"tÆ°Æ¡ng Äá»i vá»i nút Äầu tiên Äược thÄm."
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -421,7 +427,7 @@
"\n"
"Äá» xem bản tóm tắt các tá» hợp phÃm, hãy gõ « h » bên trong
Info."
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -448,7 +454,7 @@
" info -f ./foo.info hiá»n thá» táºp tin « ./foo.info », không
tìm kiếm "
"thư mục"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -461,72 +467,72 @@
"và gá»i câu há»i chung, thảo luáºn v.v. cho <address@hidden>.\n"
"Trang chủ texinfo: <http://www.gnu.org/software/texinfo/>."
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "Không tìm thấy nút thông tin « %s »."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "Không tìm thấy nút thông tin « (%s)%s »."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "Không tìm thấy cá»a sá»."
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "Äiá»m không xuất hiá»n bên trong cái nút thông tin của
cá»a sá» nà y."
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "Không thá» xóa cá»a sá» cuá»i cùng."
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "Không có trình ÄÆ¡n trong nút thông tin nà y."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "Không có cÆ°á»c chú trong nút thông tin nà y."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "Không có tham chiếu chéo trong nút thông tin nà y."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "Không có con trỠ« %s » cho nút thông tin nà y."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "Không nháºn ra lá»nh Info « %c »: hãy thá» lá»nh « ? » Äá»
xem trợ giúp."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "Thiết bá» cuá»i kiá»u « %s » không Äủ khéo Äá» chạy
Info."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "Bạn á» trang cuá»i cùng của nút thông tin nà y."
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "Bạn á» trang Äầu tiên của nút thông tin nà y."
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "Chá» má»t cá»a sá»."
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "Cá»a sá» kết quả quá nhá»."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "Không Äủ chá» cho cá»a sá» trợ giúp: hãy xóa má»t cá»a
sá»."
@@ -832,10 +838,12 @@
"và chá»n nút á» Äó gặp lần tìm kế tiếp.\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "ÄÆ°á»ng dẫn tìm kiếm hiá»n thá»i:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -844,6 +852,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -861,67 +870,68 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
msgstr "Theo Äây có những lá»nh không thá» gá»i:\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Hiá»n thá» thông Äiá»p trợ giúp"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "Xem nút Info « (info)Help »"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "In ra tà i liá»u hÆ°á»ng dẫn cho KHÃA"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "Diá»
n tả khoá: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ChÆ°a Äá»nh nghÄ©a ESC %s."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "ChÆ°a Äá»nh nghÄ©a %s."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s Äã Äược Äá»nh nghÄ©a thà nh %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Hiá»n thá» chuá»i cần gõ Äá» thá»±c hiá»n lá»nh Äã cho"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "Lá»nh á» Äâu : "
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "« %s » không phải trên khoá nà o"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s có thá» Äược gá»i chá» bằng %s."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s có thá» Äược gá»i bằng %s."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "Không có hà m tên « %s »"
@@ -934,91 +944,102 @@
"Chá»n các nút khác:\n"
"âââââââ\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "có sá» Äá»i sá» không Äúng"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "không thá» má» táºp tin nháºp và o « %s »"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "không thá» tạo táºp tin xuất « %s »"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "gặp lá»i khi ghi và o « %s »"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "gặp lá»i khi Äóng táºp tin xuất « %s »"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "chuá»i phÃm quá dà i"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "thiếu chuá»i phÃm"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "không cho phép ký tự vô giá trỠ(\\000)"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "không cho phép ký tự vô giá trỠ(^%c)"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "thiếu tên hà nh Äá»ng"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "phần quá dà i"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "hà nh Äá»ng lạ « %s »"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "tên hà nh Äá»ng quá dà i"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "có ký tá»± thêm nằm sau hà nh Äá»ng « %s »"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "thiếu tên biến"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "thiếu ký tự bằng « = » ngay sau tên biến"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "tên biến quá dà i"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "giá trỠquá dà i"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "« %s », dòng %u: "
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1091,10 +1112,12 @@
"nháºt nó"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "Gặp dữ liá»u sai trong táºp tin infokey nên bá» qua má»t sá»
tá» hợp phÃm"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
"Gặp dữ liá»u sai trong táºp tin infokey nên bá» qua má»t sá» cách
thiết láºp « var "
@@ -1113,6 +1136,7 @@
msgstr "Äá»c tên lá»nh trong vùng phản há»i và thá»±c hiá»n nó"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "Không thá» thá»±c hiá»n lá»nh « vùng phản há»i » á» Äây."
@@ -1177,7 +1201,7 @@
msgid "Select visited node: "
msgstr "Chá»n nút Äã xem: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "Tham chiếu Äã biến máºt. (%s)"
@@ -1187,7 +1211,7 @@
msgid "regexp error: %s"
msgstr "Lá»i biá»u thức chÃnh quy: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1197,78 +1221,81 @@
"\t \\[get-help-window]\t\tÄá» xem trợ giúp,\n"
"\t\\[menu-item] \t\t\tcho mục trình ÄÆ¡n."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "Tá»i dòng kế"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "Vá» dòng trÆ°á»c"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "Tá»i cuá»i dòng"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "Vá» Äầu dòng"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "Kế"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "Không có nút nữa trong tà i liá»u nà y."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "Không có « Lùi » cho nút nà y"
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "Không có « Lùi » hay « Lên » cho nút nà y trong tà i liá»u
nà y."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "Chuyá»n tá»i hay xuá»ng qua cấu trúc nút"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "Chuyá»n lùi hay lên qua cấu trúc nút"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "Cuá»n tá»i trong cá»a sá» nà y"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "Cuá»n tá»i trong cá»a sá» nà y và láºp kÃch cỡ cá»a sá»
mặc Äá»nh"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "Cuá»n tá»i trong cá»a sá» nà y mà còn lại trong nút nà y"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr ""
"Cuá»n tá»i trong cá»a sá» nà y, mà còn lại trong nút nà y và láºp
kÃch cỡ cá»a sá» "
"mặc Äá»nh"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "Cuá»n lùi trong cá»a sá» nà y"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "Cuá»n lùi trong cá»a sá» nà y và láºp kÃch cỡ cá»a sá»
mặc Äá»nh"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "Cuá»n lùi trong cá»a sá» nà y, mà còn lại trong nút nà y"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
@@ -1276,424 +1303,433 @@
"Cuá»n lùi trong cá»a sá» nà y, mà còn lại trong nút nà y và láºp
kÃch cỡ cá»a sá» "
"mặc Äá»nh"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "Vá» Äầu nút nà y"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "Tá»i cuá»i nút nà y"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "Cuá»n xuá»ng theo dòng"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "Cuá»n lên theo dòng"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "Cuá»n xuá»ng theo ná»a mà n hình"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "Cuá»n lên theo ná»a mà n hình"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "Chá»n cá»a sá» kế"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "Chá»n cá»a sá» lùi"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "Chia tách cá»a sá» hiá»n có"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "Xóa cá»a sá» hiá»n có"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "Không thá» xóa cá»a sá» lâu bá»n"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "Xóa các cá»a sá» khác"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "Cuá»n cá»a sá» khác"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "Cuá»n lùi cá»a sá» khác"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "Phóng to (hay thu nhá») cá»a sá» nà y"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "Chia chá» mà n hình sẵn sà ng ra các cá»a sá» hiá»n rõ"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "Báºt tắt tÃnh trạng ngắt dòng trong cá»a sá» hiá»n thá»i"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "Báºt/tắt khả nÄng sá» dụng biá»u thức chÃnh quy khi tìm
kiếm"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "Dùng biá»u thức chÃnh quy khi tìm kiếm."
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "Dùng chuá»i nghÄ©a chữ khi tìm kiếm."
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "Chá»n nút Kế"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "Chá»n nút Lùi"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "Chá»n nút Lên"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "Chá»n nút cuá»i trong táºp tin nà y"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "Cá»a sá» nà y không có nút thêm"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "Chá»n nút Äầu trong táºp tin nà y"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "Chá»n mục cuá»i trong trình ÄÆ¡n nút nà y"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "Chá»n mục trình ÄÆ¡n nà y"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "Không có %d mục trong trình ÄÆ¡n nà y."
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "Mục trình ÄÆ¡n (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "Mục trình ÄÆ¡n: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "Theo tham chiếu chéo (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "Theo tham chiếu chéo : "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "Äá»c mục trình ÄÆ¡n và chá»n nút của nó"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "Äá»c cÆ°á»c chú hay tham chiếu chéo và chá»n nút của nó"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "Vá» Äầu trình ÄÆ¡n của nút nà y"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "Xem Äá»ng thá»i cà ng nhiá»u mục trình ÄÆ¡n cà ng có thá»"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Äá»c tên nút và chá»n nó"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "Tá»i nút: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "Không có trình ÄÆ¡n trong nút « %s »."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "Không có mục trình ÄÆ¡n « %s » trong nút « %s »."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "Không tìm thấy nút Äược tham chiếu bá»i « %s » trong «
%s »."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Äá»c danh sách các trình ÄÆ¡n bắt Äầu từ « thÆ° mục »
và theo chúng"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "Theo trình ÄÆ¡n: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "Tìm nút diá»
n tả cuá»c gá»i chÆ°Æ¡ng trình"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "Tìm nút gá»i của [%s]: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Äá»c tham chiếu trang hÆ°á»ng dẫn (man) và chá»n nó"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "Lấy trang Man: "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "Chá»n « Trên » trong táºp tin nà y"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "Chá»n nút « thÆ° mục »"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "Giết nút (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "Không thỠgiết nút « %s »"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "Không thá» giết nút cuá»i"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "Chá»n nút má»i chá»n"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "Giết nút nà y"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Äá»c tên táºp tin và chá»n nó"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "Tìm táºp tin: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "Không tìm thấy « %s »"
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "Không thá» tạo táºp tin xuất « %s »."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "Hoà n tất."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "Äang ghi nút %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr ""
"Gá»i ná»i dung của nút nay qua á»ng dẫn kiá»u « INFO_PRINT_COMMAND
» (Info in ra "
"lá»nh)"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "Không thá» má» á»ng dẫn Äến « %s »."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "Äang in nút %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "Tiến trình tìm kiếm Äã tiếp tục từ cuá»i của tà i
liá»u."
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "Tiến trình tìm kiếm Äã tiếp tục từ Äầu của tà i
liá»u."
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "Äang tìm kiếm táºp tin phụ %s..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "Äá»c chuá»i và tìm kiếm nó, phân biá»t chữ hoa/thÆ°á»ng"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "Äá»c chuá»i và tìm kiếm nó"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "Äá»c chuá»i và tìm kiếm lùi nó"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "Tìm kiếm dùng biá»u thức chÃnh quy"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr " phân biết chữ hoa/thÆ°á»ng "
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr " ngược"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "Tìm kiếm"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "Lá»i tìm kiếm."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "Là m lại viá»c tìm kiếm cuá»i, vá» cùng phÃa hÆ°á»ng"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "Không có chuá»i tìm kiếm trÆ°á»c"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "Là m lại viá»c tìm kiếm cuá»i, vá» ngược phÃa hÆ°á»ng"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "Tìm kiếm tÆ°Æ¡ng tác chuá»i Äang gõ"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "Tìm kiếm ngược I dùng biá»u thức chÃnh quy: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "Tìm kiếm ngược I: "
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "Tìm kiếm I dùng biá»u thức chÃnh quy: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "Tìm kiếm I: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "Äang thất bại "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "Vá» tham chiếu chéo trÆ°á»c"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "Tá»i tham chiếu chéo kế"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "Chá»n tham chiếu hay mục trình ÄÆ¡n xuất hiá»n trên dòng
nà y"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "Hủy thao tác Äang chạy"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "Thoát"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "Chuyá»n con chạy tá»i má»t Äóng riêng trong cá»a sá»"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "Vẽ lại mà n hình"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "Thoát khá»i Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "Chạy lá»nh Äã Äóng kết Äến biến thế chữ thÆ°á»ng
của phÃm nà y"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "Lá»nh không rõ (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "« %s » không hợp lá»"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "« %s » không hợp lá»"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "Thêm chữ sá» nà y và o Äá»i sá» thuá»c sá» hiá»n thá»i"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "Bắt Äầu (hoặc nhân vá»i 4) Äá»i sá» thuá»c sá» hiá»n
thá»i)"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "Dùng bên trong bá»i « \\[universal-argument] » (Äá»i sá» toà n
thá»)"
@@ -1800,32 +1836,27 @@
msgid " Subfile: %s"
msgstr " Táºp tin phụ: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: cảnh báo : "
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " cho %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr ""
"\tHãy thá» lá»nh trợ giúp « %s --help » Äá» xem danh sách tùy
chá»n hoà n toà n.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "Sá» dụng: %s [TÃY_CHá»N]... [TẬP_TIN_INFO
[TẬP_TIN_THƯ_MỤC]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr "Thêm hoặc gỡ bá» mục nháºp trong TẬP_TIN_INFO và o/khá»i
TẬP_TIN_THƯ_MỤC."
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1849,7 +1880,7 @@
"\t\t\t\tcó cùng kết quả vá»i Äá»i sá» TẬP_TIN_THƯ_MỤC.
--dry-run có "
"cùng kết quả vá»i tùy chá»n « --test »."
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1875,7 +1906,7 @@
"\tnếu không có mục nháºp Äược xác Äá»nh từ táºp tin Info,\n"
"\tvà cÅ©ng không tìm thấy tên cÆ¡ bản của táºp tin Info."
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1902,7 +1933,7 @@
" --no-indent Äừng Äá»nh dạng mục nháºp má»i trong táºp
tin THƯ_MỤC\n"
" --quiet thu há»i cảnh báo."
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1930,7 +1961,7 @@
"\t\t\t\ttừ thông tin trong táºp tin Info chÃnh nó.\n"
" --section R PHẦN bằng « --regex=R --section=PHẦN --add-once »."
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1940,7 +1971,7 @@
" --test thu há»i nâng cấp TẬP_TIN_THƯ_MỤC.\n"
" --version hiá»n thá» thông tin phiên bản rá»i thoát."
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1950,7 +1981,7 @@
"và gá»i câu há»i chung, thảo luáºn v.v. cho address@hidden"
"Trang chủ texinfo: http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1988,71 +2019,75 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: không thá» Äá»c (%s) và không thá» tạo (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: táºp tin rá»ng"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr ""
"Có « START-INFO-DIR-ENTRY » (mục nháºp thÆ° mục Info Äầu) mÃ
không có « END-"
"INFO-DIR-ENTRY » (mục nháºp thÆ° mục Info kết thúc) tÆ°Æ¡ng ứng"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr ""
"Có « END-INFO-DIR-ENTRY » (mục nháºp thÆ° mục Info kết thúc) mÃ
không có « "
"START-INFO-DIR-ENTRY » (mục nháºp thÆ° mục Info Äầu) tÆ°Æ¡ng ứng"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: Äã có táºp tin thÆ° mục: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: hãy ghi rõ táºp tin Info chá» má»t lần.\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "Biá»u thức chÃnh quy thêm Äược ghi rõ nên bá» qua « %s »"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "Gặp lá»i trong biá»u thức chÃnh quy « %s »: %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "Äá»i sá» dòng lá»nh thừa « %s »"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr ""
"ChÆ°a ghi rõ táºp tin nháºp và o. Hãy chạy lá»nh trợ giúp « --help
» Äá» xem thông "
"tin thêm."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr ""
"ChÆ°a ghi rõ táºp tin thÆ° mục. Hãy chạy lá»nh trợ giúp « --help
» Äá» xem thông "
"tin thêm."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "không có mục nháºp thÆ° mục Info trong « %s »"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "không tìm thấy mục nháºp cho « %s » nên không xóa gì"
@@ -2124,6 +2159,7 @@
msgstr "gặp ký tá»± bất thÆ°á»ng %c trong @var"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "Äá»i sá» @sc hoà n toà n chữ hoa nên không có tác Äá»ng"
@@ -2133,6 +2169,7 @@
msgstr "mong Äợi « { » còn gặp « %c »"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "kết thức táºp tin bên trong khá»i Äá»ng từ"
@@ -2141,7 +2178,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "mong Äợi « } » còn gặp « %c »"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2154,7 +2193,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s quá cũ"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "« @sp » cần Äến má»t Äá»i sá» dÆ°Æ¡ng thuá»c sá», không
phải « %s »"
@@ -2164,17 +2203,17 @@
msgid "Bad argument to %c%s"
msgstr "Äá»i sá» sai tá»i %c%s"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "như thế"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "không có"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "Äá»i sá» sai tá»i @%s"
@@ -2183,32 +2222,33 @@
msgid "insert"
msgstr "chèn"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "Äá»i sá» sai tá»i @%s: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "Mong Äợi @%s báºt hay tắt, không phải « %s »"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "ChỠhỠtrợ @%s 10 hay 11, không phải « %s »"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "Thiếu « } » trong Äá»i sá» xác Äá»nh @def"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "Phải bên trong môi trÆ°á»ng « @%s » Äá» dùng « @%s »"
@@ -2229,10 +2269,11 @@
msgstr "« %s » bỠbỠsót vì ghi ra thiết bỠxuất chuẩn"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "Bá» Äá»m xuất không rá»ng."
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "Kiá»u ná»i Äã yêu cầu « %s » không phải Äược dùng
trÆ°á»c"
@@ -2255,11 +2296,13 @@
# Type: text
# Description
# Main menu item
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "CÆ°á»c chú Äã xác Äá»nh mà không có nút cha"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "Không cho phép cÆ°á»c chú bên trong cÆ°á»c chú (lá»ng nhau)"
@@ -2272,21 +2315,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: không thá» má» táºp tin CSS « --css-file »: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: táºp tin CSS « --css-file » kết thúc vá»i ghi chú"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[bất thÆ°á»ng] không có thẻ HTML cần báºt"
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[bất thÆ°á»ng] tên nút không hợp lá»: « %s »"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "ChỠmục lạ « %s »"
@@ -2315,14 +2359,14 @@
msgid "(line %*d)"
msgstr "(dòng %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "ChỠmục lạ « %s » trong @printindex"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "Mục nháºp cho chá» mục « %s » nằm á» ngoại nút nà o"
@@ -2332,6 +2376,7 @@
msgstr "(Ỡngoại nút nà o)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "không cho phép @item trong Äá»i sá» tá»i @itemize"
@@ -2342,6 +2387,7 @@
"chèn)"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "Trà n Äá»ng Äếm"
@@ -2350,7 +2396,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "trà n vẽ chữ, khá»i chạy lại tại %c"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2361,14 +2407,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "Môi trÆ°á»ng %cfloat không thá» Äược lá»ng nhau"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "« @end » mong Äợi « %s », còn gặp « %s »"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2380,20 +2426,23 @@
msgstr "%s cần thiết chữ hay chữ sá»"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "kết thúc táºp tin bên trong khá»i Äúng nguyên vÄn"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s không có nghÄ©a bên ngoà i môi trÆ°á»ng « @float » (ná»i)"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "gặp @menu trÆ°á»c @node Äầu thì tạo nút « Trên »"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr ""
@@ -2401,11 +2450,12 @@
"@ifinfo ?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "gặp @detailmenu trÆ°á»c nút Äầu thì tạo nút « Trên »"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2416,9 +2466,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s không có nghÄ©a bên ngoà i môi trÆ°á»ng « @titlepage »"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2429,14 +2479,14 @@
msgid "`%c%s' needs something after it"
msgstr "« %c%s » cần gì Äó theo nó"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "Äá»i sá» sai « %s » tá»i « %s » nên dùng « %s »"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s không có nghÄ©a bên trong khá»i « @%s »"
@@ -2481,17 +2531,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s mong Äợi « i » hay « j » là m Äá»i sá», không phải
« %c »"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s mong Äợi má»t ký tá»± riêng lẻ « i » hay « j » là m
Äá»i sá»"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "vÄ© lá»nh « %s » Äược xác Äá»nh trÆ°á»c"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "Äây là lá»i xác Äá»nh trÆ°á»c của « %s »"
@@ -2507,48 +2557,50 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "VÄ© lá»nh « %s » Äược gá»i trên dòng %d vá»i quá nhiá»u
Äá»i sá»"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "Không tìm thấy vÄ© lá»nh %cend"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "@allow-recursion bá» phản Äá»i; hãy sá» dụng @rmacro thay
thế"
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "@quote-arg bá» phản Äá»i; các Äá»i sá» Äược trÃch dẫn
theo mặc Äá»nh"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "khá»p sai @end %s vá»i @%s"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "Quá nhiá»u lá»i nên thôi.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: cảnh báo : "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "Äá»nh vá» sai %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "Hãy thá» lá»nh trợ giúp « %s --help » Äá» xem thông tin
thêm.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr ""
@@ -2556,7 +2608,7 @@
"\n"
"[TTT\t\tTáºp Tin Texinfo]\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2564,7 +2616,7 @@
"Dá»ch tà i liá»u nguá»n Texinfo sang nhiá»u Äá»nh dạng khác nhau,
mặc Äá»nh là táºp "
"tin Info thÃch hợp Äá» Äá»c trá»±c tuyến bằng Emacs hoặc Info
GNU Äá»c nhất.\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2595,7 +2647,7 @@
" --version hiá»n thá» thông tin phiên bản rá»i
thoát (_phiên "
"bản_)\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2610,7 +2662,7 @@
" --xml \txuất XML Texinfo thay cho Info.\n"
" --plaintext \txuất vÄn bản thô thay cho Info (_nháºp
thô_).\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2644,7 +2696,7 @@
" -o, --output=TẬP_TIN\txuất ra táºp tin nà y (và o thÆ° mục nếu\n"
"\t\tHTML Äã chia tách) (_kết xuất_).\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2688,7 +2740,7 @@
" --split-size=Sá» chia tách các táºp tin Info á» kÃch cỡ
SỠ(mặc "
"Äá»nh là %d).\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2707,7 +2759,7 @@
" trong táºp tin nà y\n"
" --transliterate-file-names\ttạo các tên táºp tin Äã chuyá»n
chữ ASCII.\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2721,7 +2773,7 @@
"\t\t(mặc Äá»nh là %d). Giá trá» là 0 thì bá» các khoảng trắng
có thỠbỠqua.\n"
"\t\t(_xuất thụt lá»_)\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2739,7 +2791,7 @@
"@include.\n"
" -U BIẾN \thủy xác Äá»nh biến nà y, nhÆ° bằng
@clear.\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2778,7 +2830,7 @@
" HÆ¡n nữa, Äá»i vá»i các tùy chá»n « --no-ifÄá»NH_DẠNG », có
phải xá» lý vÄn bản "
"@ifnotÄá»NH_DẠNG.\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2793,7 +2845,7 @@
" tạo ra nháºp thô thì báºt « --ifplaintext » và các Äiá»u khác
bỠtắt;\n"
" tạo ra XML thì báºt « --ifxml » và các Äiá»u khác bá» tắt;\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2822,40 +2874,40 @@
" makeinfo --no-split phu.texi\n"
"\t\tghi má»t táºp tin Info, bất chấp kÃch cỡ tá»i Äa\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
"%s: Äang bá» qua giá trá» không Äược nháºn ra «
TEXINFO_OUTPUT_FORMAT » (Äá»nh "
"dạng xuất Texinfo) « %s ».\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s Äá»i sá» phải có kiá»u sá», không phải « %s ».\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: không thá» má» kết xuất má» rá»ng vÄ© lá»nh « %s »"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: Äang bá» qua kết xuất má» rá»ng vÄ© lá»nh thứ hai « %s
».\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: không thá» má» kết xuất các liên kết ná»i bỠ« %s
»"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: Äang bá» qua kết xuất các liên kết ná»i bá» thứ hai
« %s ».\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr ""
@@ -2865,7 +2917,7 @@
" ⢠asis\t\tnhư thế\n"
"không phải « %s ».\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr ""
@@ -2873,44 +2925,44 @@
" ⢠separate\triêng\n"
" ⢠end\t\tcuá»inkhông phải « %s ».\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: thiếu Äá»i sá» táºp tin.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "Lá»nh Äa dòng %c%s dùng sai"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Mong Äợi « %s »"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "Không thỠtạo thư mục « %s »: %s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "Không tìm thấy « %s » trong « %s »."
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
"%s: Äang nhảy qua phần má» rá»ng vÄ© lá»nh ra thiết bá» xuất
chuẩn vì kết xuất "
"Info Äang Äi ra Äó.\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "Äang tạo táºp tin %s « %s » từ « %s ».\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
@@ -2918,14 +2970,14 @@
"%s: Äang gỡ bá» táºp tin xuất vÄ© lá»nh « %s » do lá»i; hãy dùng
tùy chá»n « --"
"force » (buá»c) Äá» bảo tá»n nó.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr ""
"%s: Äang gỡ bá» táºp tin xuất « %s » do lá»i; hãy dùng tùy
chá»n « --force "
"» (buá»c) Äá» bảo tá»n nó.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
@@ -2934,96 +2986,99 @@
"%s: Äang gỡ bá» táºp tin kết xuất các liên kết ná»i bỠ« %s
» do lá»i; hãy dùng "
"tùy chá»n « --force » (buá»c) Äá» bảo tá»n nó.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "Lá»nh không rõ « %s »"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "Dùng dấu ngoặc móc {} Äá» ÄÆ°a ra lá»nh dạng Äá»i sá»
tá»i @%s"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s mong Äợi dấu ngoặc móc {}"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "ChÆ°a khá»p }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "Không có tên."
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s: thiếu dấu ngoặc móc Äóng « } »"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "Táºp tin @image « %s » (cho HTML) không Äá»c Äược: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "Không có táºp tin nhÆ° váºy « %s »"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "Táºp tin @image « %s » (cho vÄn bản) không Äá»c Äược: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image thiếu Äá»i sá» tên táºp tin"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "chÆ°a xác Äá»nh cá» : %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{Không có giá trỠcho « %s »}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s cần Äến tên"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "Äã tá»i kết thúc táºp tin trÆ°á»c khi khá»p @end %s"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "« %.40s... » quá dà i Äá» má» rá»ng nên chÆ°a má» rá»ng"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "Thiếu « } » trong mẫu @multitable"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "Äang bá» qua vÄn bản rải rác « %s » sau @multitable"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "Quá nhiá»u cá»t trong mục Äa bảng (tá»i Äà là %d)"
@@ -3033,7 +3088,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[bất thÆ°á»ng] không thá» chá»n cá»t sá» %d trong Äa bảng"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "Äang bá» qua @tab bên ngoà i Äa bảng"
@@ -3073,10 +3129,12 @@
msgstr "Neo « %s » và nút « %s » ánh xạ vá»i cùng má»t tên táºp
tin"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "Lá»nh @anchor bá» bá» qua nên tham chiếu Äến nó sẽ không
hoạt Äá»ng"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr ""
"Thay Äá»i tên neo nà y, hoặc dùng tùy chá»n « --no-split » (không
chia tách)"
@@ -3092,6 +3150,7 @@
msgstr "Cả hai neo « %s » và « %s » Äá»u ánh xạ vá»i cùng má»t
tên táºp tin"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "Lá»nh @anchor bá» bá» qua nên tham chiếu Äến nó sẽ không
hoạt Äá»ng"
@@ -3129,16 +3188,16 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "« %s » không có trÆ°á»ng Lên (có lẽ Äã chia ra từng
phần không Äúng?)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
"Nút « %s » không có mục trình ÄÆ¡n cho « %s », không ká» nút nÃ
y là ÄÃch Lên "
"của nó"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "nút chÆ°a Äược tham chiếu « %s »"
@@ -3183,26 +3242,30 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop Äược dùng trÆ°á»c %cnode nên dùng giá trá» mặc
Äá»nh %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "Không thá» Äá»c táºp tin @image « %s »: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
"@headitem nhÆ° mục cuá»i của @multitable thì tạo tà i liá»u Docbook
không hợp lá»"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr "của"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr "trên"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "Äá»i sá» Äầu tá»i tham chiếu chéo có lẽ không rá»ng"
@@ -3212,6 +3275,7 @@
msgstr "Tên táºp tin rá»ng cho tham chiếu chéo HTML trong « %s »"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "Tá»i kết thúc táºp tin trong khi tìm dấu chấm « . » hay
dấu phẩy « , »"
@@ -3222,10 +3286,12 @@
"@%s phải có dấu chấm « . » hay dấu phẩy « , » theo sau, không
phải « %c »"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "Äá»i vá»i tham chiếu chéo trong ngoặc, hãy dùng @pxref"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "Äá»i sá» Äầu tá»i @inforef có lẽ không rá»ng"
@@ -3297,7 +3363,7 @@
msgid "%s is not a valid region code"
msgstr "%s không phải mã ngôn ngữ kiá»u ISO 639 hợp lá»"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr ""
@@ -3305,8 +3371,8 @@
" ⢠separate\triêng\n"
" ⢠end\t\tcuá»inkhông phải « %s ».\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr ""
@@ -3454,81 +3520,81 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: không nháºn ra tùy chá»n « --%s »\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "không thá» tạo táºp tin xuất « %s »"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "Không thỠtạo thư mục « %s »: %s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: táºp tin rá»ng"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "Tìm táºp tin: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "Nút « %s » Äược xác Äá»nh trÆ°á»c tại dòng %d"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s cần Äến tên"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Mong Äợi « %s »"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "Dùng dấu ngoặc móc {} Äá» ÄÆ°a ra lá»nh dạng Äá»i sá»
tá»i @%s"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr ""
@@ -3538,7 +3604,7 @@
" ⢠asis\t\tnhư thế\n"
"không phải « %s ».\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr ""
@@ -3548,12 +3614,12 @@
" ⢠asis\t\tnhư thế\n"
"không phải « %s ».\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr ""
@@ -3561,573 +3627,560 @@
" ⢠separate\triêng\n"
" ⢠end\t\tcuá»inkhông phải « %s ».\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "ChỠmục lạ « %s »"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "ChỠmục lạ « %s »"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s Äá»i sá» phải có kiá»u sá», không phải « %s ».\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s Äá»i sá» phải có kiá»u sá», không phải « %s ».\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "Không thỠtạo thư mục « %s »: %s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "Không tìm thấy « %s »"
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "nút chÆ°a Äược tham chiếu « %s »"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "nút chÆ°a Äược tham chiếu « %s »"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "Chá» mục « %s » Äã có."
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr ""
"%s: Äang gỡ bá» táºp tin xuất « %s » do lá»i; hãy dùng tùy
chá»n « --force "
"» (buá»c) Äá» bảo tá»n nó.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: cảnh báo : "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: cảnh báo : "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(dòng %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(dòng %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "Thiếu « } » trong Äá»i sá» xác Äá»nh @def"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Neo « %s » và nút « %s » ánh xạ vá»i cùng má»t tên táºp
tin"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "Không cho phép cÆ°á»c chú bên trong cÆ°á»c chú (lá»ng nhau)"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "Lá»nh không rõ « %s »"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "Äá»i sá» sai tá»i @%s"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: táºp tin rá»ng"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "nút chÆ°a Äược tham chiếu « %s »"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "Äá»i sá» Äầu tá»i @inforef có lẽ không rá»ng"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr ""
"%s tham chiếu Äến nút không tá»n tại « %s » (có lẽ Äã chia
ra từng phần không "
"Äúng?)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "Không thá» Äá»c táºp tin @image « %s »: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "VÄ© lá»nh « %s » Äược gá»i trên dòng %d vá»i quá nhiá»u
Äá»i sá»"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
"« \\ » trong phần má» rá»ng vÄ© lá»nh có « %s » theo sau, thay cho
tên tham sá»"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "không tìm thấy gì trong chỠmục cho « %s »\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "không cho phép @item trong Äá»i sá» tá»i @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "Chá» mục « %s » Äã có."
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "vÄ© lá»nh « %s » Äược xác Äá»nh trÆ°á»c"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "Không có ngoặc móc Äóng cho cÆ°á»c chú « %s »"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s quá cũ"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s quá cũ"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "gặp @menu trÆ°á»c @node Äầu thì tạo nút « Trên »"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "vÄ© lá»nh « %s » Äược xác Äá»nh trÆ°á»c"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s mong Äợi dấu ngoặc móc {}"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: táºp tin rá»ng"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "Äang bá» qua @tab bên ngoà i Äa bảng"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s mong Äợi « i » hay « j » là m Äá»i sá», không phải
« %c »"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "Lá»nh không rõ « %s »"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "Lá»nh chÆ°a xác Äá»nh: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s: thiếu dấu ngoặc móc Äóng « } »"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s: thiếu dấu ngoặc móc Äóng « } »"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: không thá» má» táºp tin CSS « --css-file »: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "không tìm thấy gì trong chỠmục cho « %s »\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: không thá» má» táºp tin CSS « --css-file »: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "Không thá» Äá»c táºp tin @image « %s »: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "@quote-arg bá» phản Äá»i; các Äá»i sá» Äược trÃch dẫn
theo mặc Äá»nh"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "Không tìm thấy nút thông tin « %s »."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "Táºp tin @image « %s » (cho HTML) không Äá»c Äược: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-"« @strong{Note...} » tạo má»t tham chiếu chéo giả trong Info; hãy
sá»a Äá»i Äá» "
-"tránh nó"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr ""
"@%s phải có dấu chấm « . » hay dấu phẩy « , » theo sau, không
phải « %c »"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr ""
"@%s phải có dấu chấm « . » hay dấu phẩy « , » theo sau, không
phải « %c »"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "gặp @menu trÆ°á»c @node Äầu thì tạo nút « Trên »"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "gặp @menu trÆ°á»c @node Äầu thì tạo nút « Trên »"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "gặp @menu trÆ°á»c @node Äầu thì tạo nút « Trên »"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "Không thá» Äá»c táºp tin @image « %s »: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "gặp lá»i khi ghi và o « %s »"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "Lá»nh không rõ « %s »"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "Lá»nh không rõ « %s »"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "không thá» má» táºp tin nháºp và o « %s »"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: không thá» má» táºp tin CSS « --css-file »: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "@quote-arg bá» phản Äá»i; các Äá»i sá» Äược trÃch dẫn
theo mặc Äá»nh"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4179,7 +4232,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "Äá»i sá» sai tá»i @%s: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "Äá»i sá» sai tá»i @%s"
@@ -4195,7 +4248,7 @@
msgstr "không cho phép @item trong Äá»i sá» tá»i @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: thiếu Äá»i sá» táºp tin.\n"
@@ -4268,82 +4321,77 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s không có nghÄ©a bên trong khá»i « @%s »"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: không thá» má» táºp tin CSS « --css-file »: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "Phải bên trong môi trÆ°á»ng « @%s » Äá» dùng « @%s »"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "gặp @menu trÆ°á»c @node Äầu thì tạo nút « Trên »"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "gặp @menu trÆ°á»c @node Äầu thì tạo nút « Trên »"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: không thá» má» táºp tin CSS « --css-file »: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Mong Äợi « %s »"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s không có nghÄ©a bên ngoà i môi trÆ°á»ng « @float » (ná»i)"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: thiếu Äá»i sá» táºp tin.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "Äá»i sá» sai tá»i @%s: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s Äá»i sá» phải có kiá»u sá», không phải « %s ».\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr ""
@@ -4351,78 +4399,95 @@
" ⢠separate\triêng\n"
" ⢠end\t\tcuá»inkhông phải « %s ».\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "Chá» mục « %s » Äã có."
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "Không thỠtạo thư mục « %s »: %s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: không thá» má» táºp tin CSS « --css-file »: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "Không thỠtạo thư mục « %s »: %s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "Không có trình ÄÆ¡n trong nút thông tin nà y."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(Ỡngoại nút nà o)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "Không tìm thấy nút thông tin « %s »."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr ""
-"@%s phải có dấu chấm « . » hay dấu phẩy « , » theo sau, không
phải « %c »"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr ""
"@%s phải có dấu chấm « . » hay dấu phẩy « , » theo sau, không
phải « %c »"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "Không thá» Äá»c táºp tin @image « %s »: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "Không tìm thấy nút thông tin « %s »."
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "« @strong{Note...} » tạo má»t tham chiếu chéo giả trong Info;
hãy sá»a Äá»i "
+#~ "Äá» tránh nó"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr ""
+#~ "@%s phải có dấu chấm « . » hay dấu phẩy « , » theo sau,
không phải « %c »"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: cảnh báo : "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "Chá» mục « %s » Äã có."
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: không cho phép tùy chá»n « -- %c »\n"
Index: po/zh_CN.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/zh_CN.po,v
retrieving revision 1.67
retrieving revision 1.68
diff -u -b -r1.67 -r1.68
--- po/zh_CN.po 20 Mar 2011 21:20:30 -0000 1.67
+++ po/zh_CN.po 9 Apr 2011 00:10:42 -0000 1.68
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.13\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2009-05-21 15:08ä¸å½æ åæ¶é´\n"
"Last-Translator: Ji ZhengYu <address@hidden>\n"
"Language-Team: Chinese (simplified) <address@hidden"
@@ -82,11 +82,11 @@
msgid "memory exhausted"
msgstr "èæå
åèå°½"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "åå移å¨ä¸ä¸ªå符"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "åå移å¨ä¸ä¸ªå符"
@@ -98,11 +98,11 @@
msgid "Move to the end of this line"
msgstr "移å¨å°æ¬è¡çæ«å°¾"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "åå移å¨ä¸ä¸ªåè¯"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "åå移å¨ä¸ä¸ªåè¯"
@@ -183,6 +183,7 @@
msgstr "å¯ä¸çè¡¥é½"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "ä¸ä¸ªè¡¥é½ï¼\n"
@@ -196,6 +197,7 @@
msgstr "æå
¥è¡¥é½"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "æ£å¨å建补é½..."
@@ -220,10 +222,12 @@
msgstr "å¨æ¬æ件çç´¢å¼ä¸æç´¢å符串"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "æ£å¨æ索索å¼æ¡ç®..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "æªæ¾å°ç´¢å¼ã"
@@ -237,10 +241,12 @@
msgstr "ä»æåä¸ä¸ªâ\\[index-search]âå½ä»¤è½¬ç§»å°ä¸ä¸ä¸ªå¹é
çç´¢å¼é¡¹ç®"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "没æä¸ä¸ä¸ªç´¢å¼æç´¢å符串ã"
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "没æç´¢å¼æ¡ç®ã"
@@ -289,13 +295,13 @@
"\n"
"* èåï¼å
¶ç´¢å¼å«æâ%sâçèç¹ï¼\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "å°è¯ --æ´å¤çæ±å©ä¿¡æ¯ã\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -310,12 +316,12 @@
"This is free software: you are free to change and redistribute it.\n"
"There is NO WARRANTY, to the extent permitted by law.\n"
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "æ¾ä¸å°å«æâ%sâçç´¢å¼\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -326,7 +332,7 @@
"\n"
"以 Info æ ¼å¼é
读ææ¡£ã\n"
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -341,7 +347,7 @@
" --dribble=FILENAME å°ç¨æ·çå»é®æ¡ç®å¨ FILENAME ä¸ã\n"
" -f, --file=FILENAME æå®æ³æµè§ç Info æ件ã"
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -353,7 +359,7 @@
" -n, --node=NODENAME å¨é¦ä¸ªæµè§è¿ç Info
æ件ä¸æå®èç¹ã\n"
" -o, --output=FILENAME å°éä¸çèç¹å
¨è¾åºè³ FILENAMEã"
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -365,12 +371,12 @@
" --restore=FILENAME ä» FILENAME ä¸è¯»ååå§å»é®æ¡ç®ã\n"
" -O, --show-options, --usage 跳转è³å½ä»¤è¡é项èç¹ã"
-#: info/info.c:630
+#: info/info.c:650
#, fuzzy
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr " -b, --speech-friendly 对åé³å¨å
¼å®¹ã"
-#: info/info.c:634
+#: info/info.c:654
#, fuzzy
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
@@ -385,7 +391,7 @@
" --version æ¾ç¤ºçæ¬ä¿¡æ¯å¹¶éåºã\n"
" -w, --where, --location æå° Info æ件å¨ç³»ç»ä¸çä½ç½®ã"
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -401,7 +407,7 @@
"ä»»ä½åç»åæ°é½è¢«è®¤ä¸ºæ¯ä¸åå§æµè§\n"
"èç¹æå
³çèå项å称ã"
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
@@ -409,7 +415,7 @@
"\n"
"å¨å¸®å©ä¿¡æ¯ä¸æ h è·åæå
³æé®ç»å®çå
容ã"
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -433,7 +439,7 @@
" info --subnodes -o out.txt emacs å°æ´ä¸ªæå页è¾åºè³ out.txt\n"
" info -f ./foo.info æ¾ç¤ºæ件 ./foo.infoï¼èä¸æ¯æ¥æ¾ç®å½"
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
msgid ""
"\n"
@@ -446,72 +452,72 @@
"ä¸è¬çé®é¢å讨论请åéå° address@hidden"
"Texinfo 主页ï¼http://www.gnu.org/software/texinfo/";
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "æ æ³æ¾å°èç¹â%sâã"
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "æ æ³æ¾å°èç¹â(%s)%sâã"
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "æ æ³æ¾å°ä¸ä¸ªçªå£ï¼"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "å
æ 没æåºç°å¨è¯¥çªå£çèç¹ä¹ä¸ï¼"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "æ æ³å é¤æåççªå£ã"
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "该èç¹ä¸æ²¡æèåã"
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "该èç¹ä¸æ²¡æè注ã"
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "该èç¹ä¸æ²¡æ交åå¼ç¨ã"
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "该èç¹ä¸æ²¡æâ%sâæé"
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "æªç¥ç Info å½ä»¤â%câï¼è¯·ä»¥â?âè·å¾å¸®å©ã"
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "ç»ç«¯ç±»åâ%sâçè½åä¸è¶³ä»¥æ¯æ Info çè¿è¡ã"
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "æ¨å·²ç»å¨è¯¥èç¹çæåä¸ä¸ªé¡µé¢ä¸äºã"
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "æ¨å·²ç»å¨è¯¥èç¹ç第ä¸é¡µä¸äºã"
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "åªæä¸ä¸ªçªå£ã"
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "ç»æçªå£å°ä¼å¤ªå°ã"
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "没æ足å¤ç空é´ç¨äºæ±å©çªå£ï¼è¯·å é¤ä¸ä¸ªçªå£ã"
@@ -813,10 +819,12 @@
" 并éæ©ææ¾å°çä¸ä¸ä¸ªå®ä¾æå¨çèç¹ã\n"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "å½åæ索路å¾ä¸ºï¼\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -825,6 +833,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -842,6 +851,7 @@
"\n"
#: info/infodoc.c:347
+#, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -849,62 +859,62 @@
"以ä¸å½ä»¤æ ¹æ¬æ æ³è°ç¨ï¼\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "æ¾ç¤ºæ±å©æ¶æ¯"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "è®¿é® Info èç¹â(info)Helpâ"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "æå°å
³äº KEY çææ¡£"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "说ææé®ï¼%s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s æªå®ä¹ã"
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s æªå®ä¹ã"
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s 被å®ä¹ä¸º %sã"
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "æ¾ç¤ºæ§è¡ç»å®å½ä»¤æéçæé®"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr "å½ä»¤ä¸º:"
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "â%sâæªç»å®å°ä»»ä½æé®"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s ä¸è½éè¿ %s è°ç¨ã"
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s å¯ä»¥éè¿ %s è°ç¨ã"
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "没æå为â%sâçå½æ°"
@@ -917,91 +927,102 @@
"éæ©å
¶å®èç¹ï¼\n"
"----------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr "é误çåæ°æ°"
-#: info/infokey.c:201
+#: info/infokey.c:199
#, c-format
msgid "cannot open input file `%s'"
msgstr "æ æ³æå¼è¾å
¥æ件â%sâ"
-#: info/infokey.c:215
+#: info/infokey.c:213
#, c-format
msgid "cannot create output file `%s'"
msgstr "æ æ³å建è¾åºæ件â%sâ"
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr "åå
¥â%sâæ¶åºé"
-#: info/infokey.c:232
+#: info/infokey.c:230
#, c-format
msgid "error closing output file `%s'"
msgstr "å
³éè¾åºæ件â%sâæ¶åºé"
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr "æé®åºåè¿é¿"
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr "éæ¼æé®åºå"
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr "ä¸å
许ç空å符 (\\\\000)"
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr "ä¸å
许ç空å符 (^%c)"
-#: info/infokey.c:665
+#: info/infokey.c:660
+#, c-format
msgid "missing action name"
msgstr "éæ¼å¨ä½å称"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr "è太é¿"
-#: info/infokey.c:688
+#: info/infokey.c:681
#, c-format
msgid "unknown action `%s'"
msgstr "æªç¥çå¨ä½â%sâ"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr "å¨ä½åè¿é¿"
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr "å¨ä½â%sâä¹ååºç°é¢å¤çå符"
-#: info/infokey.c:723
+#: info/infokey.c:715
+#, c-format
msgid "missing variable name"
msgstr "éæ¼åéå"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr "åéåä¹åéæ¼äºâ=â"
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr "åéåè¿é¿"
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr "å¼è¿é¿"
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr "â%sâï¼è¡ %uï¼"
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1063,10 +1084,12 @@
msgstr "éæ³ç infokey æ件â%sâ (é误çèç¼ç ) -- è¿è¡
infokey 以便æ´æ°"
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr "infokey æ件ä¸çé误æ°æ® -- 忽ç¥æäºæé®ç»å®"
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr "infokey æ件ä¸çé误æ°æ® -- 忽ç¥æäºåé设置"
@@ -1083,6 +1106,7 @@
msgstr "å¨åæ¾åºè¯»å
¥å½ä»¤å并æ§è¡å®"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "æ æ³å¨è¿éè¿è¡âåæ¾åºâå½ä»¤ã"
@@ -1146,7 +1170,7 @@
msgid "Select visited node: "
msgstr "éæ©å·²è®¿é®çèç¹ï¼"
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "å¼ç¨æ¶å¤±äºï¼(%s)ã"
@@ -1156,7 +1180,7 @@
msgid "regexp error: %s"
msgstr "æ£å表达å¼é误: %s"
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1165,497 +1189,509 @@
"欢è¿ä½¿ç¨ Info %s çãè¾å
¥ \\[get-help-window]
以è·å¾å¸®å©ï¼\\[menu-item] å°å¾"
"å°èåã"
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "åä¸ç§»å¨å°ä¸ä¸è¡"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "åä¸ç§»å¨å°ä¸ä¸è¡"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "移å¨å°è¡çæ«å°¾"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "移å¨å°è¡çå¼å¤´"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "ä¸ä¸ä¸ª"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "æ¬ææ¡£ä¸æ²¡ææ´å¤çèç¹ã"
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "æ¬èç¹æ²¡æâä¸ä¸ä¸ªâã"
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr
"å¨æ¬ææ¡£ä¸æ²¡ææ¬èç¹çâä¸ä¸ä¸ªâæâä¸å±âèç¹ã"
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "å¨èç¹ç»æä¸ååæåä¸å±ç§»å¨"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "å¨èç¹ç»æä¸ååæåä¸å±ç§»å¨"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "å¨æ¬çªå£ä¸ååæ»å¨"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "å¨æ¬çªå£ä¸ååæ»å¨å¹¶è®¾ç½®ä¸ºé»è®¤çªå£å¤§å°"
-#: info/session.c:1545
+#: info/session.c:1534
msgid "Scroll forward in this window staying within node"
msgstr "å¨æ¬çªå£ä¸ååæ»å¨(ä¸ç©¿è¶èç¹)"
-#: info/session.c:1553
+#: info/session.c:1542
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr
"å¨æ¬çªå£ä¸ååæ»å¨(ä¸ç©¿è¶èç¹)并设置é»è®¤çªå£å¤§å°"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "å¨æ¬çªå£ä¸ååæ»å¨"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "å¨æ¬çªå£ä¸ååæ»å¨å¹¶è®¾ç½®ä¸ºé»è®¤çªå£å¤§å°"
-#: info/session.c:1578
+#: info/session.c:1567
msgid "Scroll backward in this window staying within node"
msgstr "å¨æ¬çªå£ä¸ååæ»å¨(ä¸ç©¿è¶èç¹)"
-#: info/session.c:1586
+#: info/session.c:1575
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
msgstr
"å¨æ¬çªå£ä¸ååæ»å¨(ä¸ç©¿è¶èç¹)并设置为é»è®¤çªå£å¤§å°"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "移å¨å°æ¬èç¹çå¼å¤´"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "移å¨å°æ¬èç¹çæ«å°¾"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "æè¡åä¸æ»å¨"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "æè¡åä¸æ»å¨"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "åä¸æ»å¨å个å±å¹"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "åä¸æ»å¨å个å±å¹"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "éæ©ä¸ä¸ä¸ªçªå£"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "éæ©ä¸ä¸ä¸ªçªå£"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "æåå½åçªå£"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "å é¤å½åçªå£"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "æ æ³å é¤æ°¸ä¹
çªå£"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "å é¤ææå
¶å®çªå£"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "æ»å¨å
¶å®çªå£"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "ååæ»å¨å
¶å®çªå£"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "æ©å¤§(æ缩å°)æ¬çªå£"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "å¨å¯è§ççªå£é´åé
å¯ç¨çå±å¹ç©ºé´"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "å¨å½åçªå£ä¸åæ¢è¡å·ç»ç¶æ"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr "åæ¢æ¥å¯»æ¶æ£å表达å¼çç¨æ³"
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr "使ç¨æ£å表达å¼æ¥æ¥å¯»"
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr "使ç¨æ®éå符串æ¥æ¥å¯»"
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "éæ©ä¸ä¸ä¸ªèç¹"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "éæ©ä¸ä¸ä¸ªèç¹"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "éæ©ä¸å±èç¹"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "éæ©æ¬æ件çæåä¸ä¸ªèç¹"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "该çªå£æ²¡æéå èç¹"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "éæ©æ¬æ件ç第ä¸ä¸ªèç¹"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "éæ©æ¬èç¹èåä¸çæåä¸é¡¹"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "éæ©æ¬èå项ç®"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "æ¬èåä¸æ²¡æ第 %d 个项ç®ã"
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "èå项 (%s)ï¼"
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "èå项ï¼"
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "è·é交åå¼ç¨ (%s)ï¼"
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "è·é交åå¼ç¨ï¼"
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "读åèå项并éæ©å®çèç¹"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "读åè注æ交åå¼ç¨å¹¶éæ©å®çèç¹"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "移å¨å°æ¬èç¹èåçå¼å¤´"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "ç«å»è®¿é®å°½å¯è½å¤çèå项"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "读åèç¹å并éæ©å®"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "转å°èç¹ï¼"
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "èç¹â%sâä¸æ²¡æèåã"
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "èç¹â%2$sâä¸æ²¡æèå项â%1$sâã"
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "æ æ³å¨â%2$sâä¸æ¾å°ç±â%1$sâå¼ç¨çèç¹ã"
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "读åèª dir å¼å§çèåçå表并è·éå®ä»¬"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "è·éèåï¼"
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "寻æ¾è¯´æç¨åºè°ç¨çèç¹"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "å¯»æ¾ [%s] çè°ç¨èç¹ï¼"
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "读åä¸ä¸ª man æåçå¼ç¨å¹¶éæ©å®"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "è·å man æåï¼"
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "éæ©æ¬æ件ä¸çâ顶âèç¹"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "éæ©èç¹â(dir)â"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "å é¤èç¹ (%s)ï¼"
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "æ æ³å é¤èç¹â%sâ"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "æ æ³å é¤æåçèç¹"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "éæ©æè¿éæ©çèç¹"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "å é¤æ¬èç¹"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "读åæ件å并éæ©å®"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "寻æ¾æ件ï¼"
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "æ æ³å¯»æ¾â%sâã"
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "æ æ³å建è¾åºæ件â%sâã"
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "å®æã"
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "æ£å¨åå
¥èç¹ %s..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "éè¿ç®¡éå°æ¬èç¹çå
容è¾åºå° INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "æ æ³æå¼å°â%sâç管éã"
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "æ£å¨æå°èç¹ %s..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr "ä»ææ¡£åºé¨ç»§ç»æ¥å¯»ã"
-#: info/session.c:3967
+#: info/session.c:3959
msgid "Search continued from the beginning of the document."
msgstr "ä»æ¤ææ¡£çå¼å¤´ç»§ç»æ¥æ¾ã"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "æ£å¨æç´¢åæ件 %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "读åä¸ä¸ªå符串并以大å°åææçæ¹å¼æç´¢å®"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "读åä¸ä¸ªå符串并æç´¢å®"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "读åä¸ä¸ªå符串并ååæç´¢å®"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr "æ£å表达å¼æ¥æ¾"
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
msgid " case-sensitively"
msgstr "大å°åææ"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
msgid " backward"
msgstr "ååæç´¢"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "æç´¢"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "æ索失败ã"
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "以ç¸åçæ¹åéå¤æåçæç´¢"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "没æä¸æ¬¡æç´¢å符串"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "以ç¸åçæ¹åéå¤æåçæç´¢"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "å¨ä½ è¾å
¥çåæ¶äº¤äºå¼å°æç´¢å符串"
-#: info/session.c:4275
+#: info/session.c:4267
msgid "Regexp I-search backward: "
msgstr "ååå¢éæç´¢æ£å表达å¼: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "ååå¢éæç´¢ï¼"
-#: info/session.c:4278
+#: info/session.c:4270
msgid "Regexp I-search: "
msgstr "å¢éæç´¢æ£å表达å¼: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "å¢éæç´¢ï¼"
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "失败 "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "移å¨å°ä¸ä¸ä¸ªäº¤åå¼ç¨"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "移å¨å°ä¸ä¸ä¸ªäº¤åå¼ç¨"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "éæ©åºç°å¨æ¬è¡ä¸çå¼ç¨æèå项"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "åæ¶å½åæä½"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "éåº"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "å°å
æ 移å¨å°çªå£çæå®è¡"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "éç»æ¾ç¤º"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "éåº Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr "è¿è¡å°ç»å®å°æ¬æé®çå°åçæ¬çå½ä»¤"
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "æªç¥çå½ä»¤ (%s)ã"
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "â%sâ为éæ³"
-#: info/session.c:4973
+#: info/session.c:4965
#, c-format
msgid "`%s' is invalid"
msgstr "â%sâæ¯æ æç"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "å°æ¬æ°åæ·»å å°å½åæ°å¼åæ°ä¸"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "å¼å¯(æä¹ä»¥ 4)å½åæ°å¼åæ°"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "ç± \\[universal-argument] å
é¨ä½¿ç¨"
@@ -1762,31 +1798,26 @@
msgid " Subfile: %s"
msgstr " åæ件ï¼%s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%sï¼è¦åï¼"
-
-#: install-info/install-info.c:270
-#, c-format
-msgid " for %s"
+#: install-info/install-info.c:285
+#, fuzzy, c-format
+msgid "%s for %s"
msgstr " %s"
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\tè¯ç¨â%s --helpâ以è·å¾é项çå®æ´å表ã\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "ç¨æ³: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr "ä» Info ç®å½ DIR-FILE ç INFO-FILE æ件ä¸æ·»å
æ移é¤æ¡ç®ã"
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1810,7 +1841,7 @@
" çåäºä½¿ç¨ DIR-FILE åæ°ã\n"
" --dry-run çåäº --testã"
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1836,7 +1867,7 @@
" 并ä¸è¿æ¾ä¸å° Info æ件çç®å½åï¼\n"
"\t\t\té£ TEXT æä¼ä½ä¸ºæåçå é¤æ段ã"
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1862,7 +1893,7 @@
" --no-indent ä¸è¦å¨ DIR æ件ä¸æ ¼å¼åæ°çæ¡ç®ã\n"
" --quiet ä¸è¦è¾åºè¦åã"
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1889,7 +1920,7 @@
" èªèº«çä¿¡æ¯æ¥å³å®ã\n"
" --section R SEC çåäº --regex=R --section=SEC --add-onceã"
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
@@ -1899,7 +1930,7 @@
" --test ä¸æ´æ° DIR-FILEã\n"
" --version æ¾ç¤ºçæ¬ä¿¡æ¯å¹¶éåºã"
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
msgid ""
"Email bug reports to address@hidden,\n"
"general questions and discussion to address@hidden"
@@ -1909,7 +1940,7 @@
"ä¸è¬çé®é¢å讨论请åéå° address@hidden"
"Texinfo 主页ï¼http://www.gnu.org/software/texinfo/";
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1944,63 +1975,67 @@
"\n"
"%s\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%sï¼å³æ æ³è¯»å
¥ (%s) ä¹æ æ³å建 (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%sï¼ç©ºæ件"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "START-INFO-DIR-ENTRY 没æå¹é
ç END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "END-INFO-DIR-ENTRY 没æå¹é
ç START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr "%s: å·²ç»åå¨äº dir æ件: %s\n"
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%sï¼Info æ件åªåºè¯¥æå®ä¸æ¬¡ã\n"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr "æå®äºé¢å¤çæ£å表达å¼ï¼å¿½ç¥ â%sâ"
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr "æ£å表达å¼â%sâä¸åå¨é误: %s"
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "å¤ä½çå½ä»¤è¡åæ°â%sâ"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "没ææå®è¾åºæ件ï¼è¯ç¨ --help 以è·å¾æ´å¤ä¿¡æ¯ã"
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "没ææå®ç®å½æ件ï¼è¯ç¨ --help 以è·å¾æ´å¤ä¿¡æ¯ã"
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "â%sâä¸æ²¡æ info ç®å½æ¡ç®"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "æ¾ä¸å°å
³äºâ%sâçæ¡ç®ï¼æªå é¤"
@@ -2072,6 +2107,7 @@
msgstr "@var ä¸ä¸å¯é çå符 %c"
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@sc çåæ°å
¨é¨ä¸ºå¤§åï¼å æ¤æ æ"
@@ -2081,6 +2117,7 @@
msgstr "åºä¸ºâ{âï¼ä½çå°äºâ%câ"
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr "æ件å¨åæåä¸ç»æ"
@@ -2089,7 +2126,9 @@
msgid "`}' expected, but saw `%c'"
msgstr "åºä¸ºâ}âï¼ä½çå°äºâ%câ"
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2100,7 +2139,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s å·²è¿æ¶"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp éè¦æ£æ°åæ°ï¼èä¸æ¯â%sâ"
@@ -2110,17 +2149,17 @@
msgid "Bad argument to %c%s"
msgstr "%c%s çé误åæ°"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr "asis"
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr "none"
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "@%s çåæ°é误"
@@ -2129,32 +2168,33 @@
msgid "insert"
msgstr "æå
¥"
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "@%s çé误åæ°: %s"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr "åºå½ @%s å¼å¯æå
³éï¼èä¸æ¯â%sâ"
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr "ä»
æ¯æ @%s 10 æ 11ï¼èä¸æ¯â%sâ"
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "@def çåæ°éæ¼äºâ}â"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr "address@hidden@%sâ"
@@ -2175,10 +2215,11 @@
msgstr "åå
¥æ åè¾åºåéæ¼äºâ%sâ"
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr "è¾åºç¼å²åºé空ã"
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr "æè¦çæµ®ç¹ç±»åâ%sâä¸æ¯ä¸æ¬¡æç¨ç"
@@ -2198,11 +2239,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "è注â%sâ没æéåè±æ¬å·"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "å®ä¹çè注没æç¶èç¹"
#: makeinfo/footnote.c:209
+#, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "è注å
çè注æ¯ä¸å
许ç"
@@ -2215,21 +2258,22 @@
msgid "%s: could not open --css-file: %s"
msgstr "%s: æ æ³æå¼ --css-file: %s"
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr "%s:%d: --css-file 以注éç»å°¾"
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr "[æªé¢æå°ç] æ html æ è®°å¼¹åº "
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "[æªé¢æå°ç] æ æçèç¹å称: â%sâ"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "æªç¥çç´¢å¼â%sâ"
@@ -2258,14 +2302,14 @@
msgid "(line %*d)"
msgstr "(è¡ %*d)"
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "@printindex ä¸çæªç¥ç´¢å¼â%sâ"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "å
³äºç´¢å¼â%sâçæ¡ç®è¶
åºäºææèç¹"
@@ -2275,7 +2319,7 @@
msgstr "(è¶
åºä»»ä½èç¹)"
#: makeinfo/insertion.c:162
-#, fuzzy
+#, fuzzy, c-format
msgid "@item not allowed in argument to @itemize"
msgstr "åæ°ä¸ä¸å
许 @item æ¹ä¸º @itemize"
@@ -2284,6 +2328,7 @@
msgstr "insertion_type_pname ä¸çé误类å"
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr "æ举æ 溢åº"
@@ -2292,7 +2337,7 @@
msgid "lettering overflow, restarting at %c"
msgstr "å符ç¼å·æº¢åºï¼ä» %c éæ°å¼å§"
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2303,14 +2348,14 @@
msgid "%cfloat environments cannot be nested"
msgstr "%cfloat ç¯å¢åéä¸è½åµå¥"
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr "address@hidden"
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2322,30 +2367,34 @@
msgstr "%s éè¦åæ¯ææ°å"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr "æ件å¨åæåä¸ç»æ"
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "address@hidden @%s æ¯æ²¡ææä¹ç"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "å¨ç¬¬ä¸ä¸ªèç¹ä¹åéå° @menuï¼æ£å¨å建â顶âèç¹"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "æ¨ç @top èç¹å¯è½åºè¯¥å
å«å¨ @ifnottex èä¸æ¯ @ifinfo
ä¸ï¼"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "å¨ç¬¬ä¸ä¸ªèç¹ä¹åéå°
@detailmenuï¼æ£å¨å建â顶âèç¹"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr "address@hidden@quotationâç¯å¢åéå¤ @%s æ æä¹"
@@ -2355,9 +2404,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "address@hidden @%s æ¯æ²¡ææä¹ç"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2368,14 +2417,14 @@
msgid "`%c%s' needs something after it"
msgstr "â%c%sâä¹åéè¦æäºä»ä¹"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "address@hidden"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "address@hidden@%1$sâæ¯æ²¡ææä¹ç"
@@ -2420,17 +2469,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s çåæ°åºä¸ºâiâæâjâï¼èä¸æ¯â%câ"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s éè¦ä»¥å个å符âiâæâjâ为åæ°"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "å®â%sâå·²å¨åé¢å®ä¹"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "è¿éæ¯â%sâåé¢çå®ä¹"
@@ -2445,53 +2494,55 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "å¨ç¬¬ %2$d è¡ä¸ä»¥è¿å¤çåæ°è°ç¨å®â%1$sâ"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr "æ¾ä¸å°å® %cend"
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr "ä¸èµæä½¿ç¨ @allow-recursionï¼è¯·ä½¿ç¨ @rmacro ä»£æ¿ "
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr "ä¸èµæä½¿ç¨ @quote-argï¼åæ°æ¯é»è®¤å¼ç¨ç"
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@end %s å @%s ä¸å¹é
"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "è¿å¤çé误ï¼æ¾å¼ã\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%sï¼%dï¼è¦åï¼"
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "é误æ¾ç½®ç %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "è¯ç¨â%s --helpâ以è·åæ´å¤ä¿¡æ¯ã\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "ç¨æ³ï¼%s [é项]... TEXINFO-æ件...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
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"
@@ -2499,7 +2550,7 @@
"å° Texinfo æºæ件转æ¢ä¸ºå
¶å®åç§æ ¼å¼ï¼é»è®¤è½¬æ¢ä¸ºéäº\n"
"ç± Emacs æç¬ç« GNU Info å¨çº¿æµè§ç Info æ件ã\n"
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2524,7 +2575,7 @@
" -v, --verbose 解éé½åäºäºä»ä¹ã\n"
" --version æ¾ç¤ºçæ¬ä¿¡æ¯å¹¶éåºã\n"
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2539,7 +2590,7 @@
" --xml è¾åº XML (TexinfoML) èä¸æ¯ Infoã\n"
" --plaintext è¾åºæ®éææ¬èä¸æ¯ Infoã\n"
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2569,7 +2620,7 @@
" --number-sections è¾åºç« èç¼å·ã\n"
" -o, --output=FILE è¾åºå°æ件 FILE (å¦ææ¯åå²ç HTML
å为ç®å½)ã\n"
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2603,7 +2654,7 @@
" âasisâï¼ä¿çç°æç对é½ã\n"
" --split-size=NUM å¨å¤§å° NUM çæ¶åæå Info æ件
(é»è®¤ä¸º %d)ã\n"
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2621,7 +2672,7 @@
" --transliterate-file-names\n"
" 以 ASCII åä¹çææ件åã\n"
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2634,7 +2685,7 @@
" --output-indent=VAL ç¨ VAL ä¸ªç©ºæ ¼ç¼©è¿ XML å
ç´ (é»è®¤
%d)ã\n"
" å¦æ VAL 为 0ï¼å°ä¸¢å¼å¯å¿½ç¥ç空æ
¼ã\n"
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2650,7 +2701,7 @@
" -P DIR å° DIR 追å å° @include
æ索路å¾ä¹åã\n"
" -U VAR åæ¶åé VAR çå®ä¹ï¼å°±è±¡
@clearã\n"
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2681,7 +2732,7 @@
" --no-ifplaintext ä¸è¦å¤ç @ifplaintext ææ¬ã\n"
" --no-iftex ä¸è¦å¤ç @iftex å @tex ææ¬ã\n"
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2695,7 +2746,7 @@
" å¦æçææ®éææ¬ï¼å --ifplaintext é»è®¤å¼å¯èå
¶å®é»è®¤å
³éï¼\n"
" å¦æçæ XMLï¼å --ifxml é»è®¤å¼å¯èå
¶å®é»è®¤å
³éã\n"
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
msgid ""
"Examples:\n"
" makeinfo foo.texi write Info to foo's @setfilename\n"
@@ -2721,190 +2772,193 @@
" makeinfo --number-sections foo.texi è¾åºå¸¦æç¼å·çèç Info\n"
" makeinfo --no-split foo.texi è¾åºå个 Info
æ件èä¸è®ºå¤§å°\n"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr "%s: 忽ç¥ä¸å¯è¾¨è®¤ç TEXINFO_OUTPUT_FORMAT å¼â%sâã\n"
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%sï¼%s åæ°å¿
须为æ°å¼ï¼èä¸æ¯â%sâã\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "%s: æ æ³æå¼å®æ©å±è¾åºâ%sâ"
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr "%s: æ æ³æå¼å®æ©å±è¾åºâ%sâ\n"
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "%s: æ æ³æå¼å®æ©å±è¾åºâ%sâ"
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr "%s: 忽ç¥äºæ¬¡å
é¨è¿æ¥è¾åºâ%sâã\n"
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr "%sï¼--paragraph-indent çåæ°å¿
须为æ°å¼/ânoneâ/âasisâï¼èä¸æ¯â%sâã\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-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:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%sï¼éæ¼æ件åæ°ã\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr "使ç¨äºä¸åéçå¤è¡å½ä»¤ %c%s"
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "åºä¸ºâ%sâ"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr "æ æ³å建ç®å½â%sâï¼%s"
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "å¨â%2$sâä¸æ¾ä¸å°â%1$sâ"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr "%s: è·³è¿å±å¼è³æ åè¾åºçå®ï¼ç±äº Info
çè¾åºè¦ä½¿ç¨æ åè¾åºã\n"
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr "ä»â%3$sâå建 %1$s æ件â%2$sâã\n"
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
msgstr "%sï¼ç±äºé误å é¤å®è¾åºæ件â%sâï¼ç¨ --force
ä¿çå®è¾åºã\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr "%sï¼ç±äºé误å é¤å®è¾åºæ件â%sâï¼ç¨ --force
ä¿çå®è¾åºã\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
"preserve.\n"
msgstr "%sï¼ç±äºé误å é¤å
é¨è¿æ¥è¾åºæ件â%sâï¼ç¨ --force
ä¿çã\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "æªç¥çå½ä»¤â%sâ"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "使ç¨è±æ¬å·å°ä¸ä¸ªå½ä»¤ç¨ä½ @%s çåæ°"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s éè¦è±æ¬å·"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "ä¸å¹é
ç }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "æ ååï¼"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s éæ¼éåè±æ¬å·"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image æ件â%sâ(对 HTML)ä¸å¯è¯»ï¼%s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, c-format
msgid "No such file `%s'"
msgstr "没æé£æ ·çæ件â%sâ"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image æ件â%sâ(对ææ¬)ä¸å¯è¯»ï¼%s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image éæ¼æ件ååæ°"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr "æªå®ä¹çæ è¯: %s"
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr "{没æâ%sâçå¼}"
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s éè¦ä¸ä¸ªåå"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "æ件å¨éå°å¹é
ç @end %s åå°±ç»æäº"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr "â%.40s...âæ©å±èµ·æ¥å¤ªé¿ï¼æªæ©å±"
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "@multitable 模æ¿ä¸éæ¼äº }"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr "å¿½ç¥ @multitable ä¹åçè¿å©ææ¬â%sâ"
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "å¨å¤åè¡¨æ ¼é¡¹ç®ä¸å«æ太å¤çå (æ大为 %d)"
@@ -2914,7 +2968,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "[æªé¢æå°çé误] æ æ³å¨å¤åè¡¨æ ¼ä¸éæ©ç¬¬ #%d å"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "忽ç¥å¤åè¡¨æ ¼å¤ç @tab"
@@ -2954,10 +3009,12 @@
msgstr "Anchorâ%sâåèç¹â%sâæ å°å°åä¸ä¸ªæ件å"
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr "忽ç¥è¯¥ @anchor å½ä»¤ï¼å¯¹å®çå¼ç¨å°æ æ³å·¥ä½"
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr "éå½å anchor æ使ç¨â--no-splitâé项"
@@ -2972,6 +3029,7 @@
msgstr "Anchorâ%sâåâ%sâæ å°å°åä¸ä¸ªæ件å"
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr "å¿½ç¥ @anchor å½ä»¤ï¼å¯¹å®çå¼ç¨å°ä¸è½å·¥ä½"
@@ -3005,14 +3063,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr "â%sâæ Up å段(ä¹è®¸å段ä¸æ£ç¡®ï¼)"
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr "尽管èç¹â%sâæ¯â%sâçä¸å±èç¹ï¼ä½ç¼ºå°ç¸å
³çèå项"
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "æªå¼ç¨çèç¹â%sâ"
@@ -3057,27 +3115,31 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr "%ctop å¨ %cnode ä¹å使ç¨ï¼é»è®¤ä¸º %s"
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image æ件â%sâä¸å¯è¯»ï¼%s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr "ä½ä¸º @multitable address@hidden çææ æç Docbook ææ¡£"
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
#, fuzzy
msgid "of"
msgstr "ç"
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
#, fuzzy
msgid "on"
msgstr "å
³äº"
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr "交åå¼ç¨ç第ä¸ä¸ªåæ°ä¸è½ä¸ºç©º"
@@ -3087,6 +3149,7 @@
msgstr "为â%sâä¸ç HTML 交åå¼ç¨æ¸
空æ件å"
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr "æ¥æ¾âãâæâï¼âæ¶éå°äºæ件ç»å°¾"
@@ -3096,10 +3159,12 @@
msgstr "â.âæâ,âä¹åå¿
须为 @%sï¼èä¸æ¯â%câ"
#: makeinfo/xref.c:392
+#, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "è¦ä½¿ç¨æ¬å·ä¸ç交åå¼ç¨ï¼è¯·ä½¿ç¨ @pxref"
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr "@inforef ç第ä¸ä¸ªåæ°ä¸è½ä¸ºç©º"
@@ -3169,13 +3234,13 @@
msgid "%s is not a valid region code"
msgstr "%s å¨ ISO 639 è¯è¨ç¼ç ä¸æ¯æ æç"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "%sï¼--footnote-style çåæ°å¿
须为âseparateâæâendâï¼èä¸æ¯â%sâã\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "%sï¼--paragraph-indent çåæ°å¿
须为æ°å¼/ânoneâ/âasisâï¼èä¸æ¯â%sâã\n"
@@ -3305,658 +3370,647 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%sï¼ä¸è½è¯å«çé项â--%sâ\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "æ æ³å建è¾åºæ件â%sâ"
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "æ æ³å建ç®å½â%sâï¼%s"
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%sï¼ç©ºæ件"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "寻æ¾æ件ï¼"
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "èç¹â%sâå¨åé¢ç(第 %d è¡)å®ä¹"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s éè¦ä¸ä¸ªåå"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "åºä¸ºâ%sâ"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "使ç¨è±æ¬å·å°ä¸ä¸ªå½ä»¤ç¨ä½ @%s çåæ°"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "%sï¼--paragraph-indent çåæ°å¿
须为æ°å¼/ânoneâ/âasisâï¼èä¸æ¯â%sâã\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "%sï¼--paragraph-indent çåæ°å¿
须为æ°å¼/ânoneâ/âasisâï¼èä¸æ¯â%sâã\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "%sï¼--footnote-style çåæ°å¿
须为âseparateâæâendâï¼èä¸æ¯â%sâã\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "æªç¥çç´¢å¼â%sâ"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "æªç¥çç´¢å¼â%sâ"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%sï¼%s åæ°å¿
须为æ°å¼ï¼èä¸æ¯â%sâã\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%sï¼%s åæ°å¿
须为æ°å¼ï¼èä¸æ¯â%sâã\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "æ æ³å建ç®å½â%sâï¼%s"
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "æ æ³å¯»æ¾â%sâã"
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "æªå¼ç¨çèç¹â%sâ"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "æªå¼ç¨çèç¹â%sâ"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "ç´¢å¼â%sâå·²ç»åå¨"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr "%sï¼ç±äºé误å é¤å®è¾åºæ件â%sâï¼ç¨ --force
ä¿çå®è¾åºã\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%sï¼%dï¼è¦åï¼"
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%sï¼%dï¼è¦åï¼"
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, fuzzy, perl-format
msgid "(in %s l. %d)"
msgstr "(è¡ %*d)"
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, fuzzy, perl-format
msgid "(l. %d)"
msgstr "(è¡ %*d)"
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "@def çåæ°éæ¼äºâ}â"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, fuzzy, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr "Anchorâ%sâåèç¹â%sâæ å°å°åä¸ä¸ªæ件å"
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "è注å
çè注æ¯ä¸å
许ç"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "æªç¥çå½ä»¤â%sâ"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "@%s çåæ°é误"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%sï¼ç©ºæ件"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "æªå¼ç¨çèç¹â%sâ"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "@inforef ç第ä¸ä¸ªåæ°ä¸è½ä¸ºç©º"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s å¼ç¨å°ä¸åå¨çèç¹â%sâ(ä¹è®¸å段ä¸æ£ç¡®ï¼)"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image æ件â%sâä¸å¯è¯»ï¼%s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "å¨ç¬¬ %2$d è¡ä¸ä»¥è¿å¤çåæ°è°ç¨å®â%1$sâ"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, fuzzy, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr "\\ 以带æâ%sâçå®å±å¼å¼ä»£æ¿åæ°å称"
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "æ¾ä¸å°å«æâ%sâçç´¢å¼\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "åæ°ä¸ä¸å
许 @item æ¹ä¸º @itemize"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "ç´¢å¼â%sâå·²ç»åå¨"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "å®â%sâå·²å¨åé¢å®ä¹"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "è注â%sâ没æéåè±æ¬å·"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s å·²è¿æ¶"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s å·²è¿æ¶"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "å¨ç¬¬ä¸ä¸ªèç¹ä¹åéå° @menuï¼æ£å¨å建â顶âèç¹"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "å®â%sâå·²å¨åé¢å®ä¹"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s éè¦è±æ¬å·"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%sï¼ç©ºæ件"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "忽ç¥å¤åè¡¨æ ¼å¤ç @tab"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s çåæ°åºä¸ºâiâæâjâï¼èä¸æ¯â%câ"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "æªç¥çå½ä»¤â%sâ"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "æªå®ä¹çå½ä»¤: %s"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s éæ¼éåè±æ¬å·"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s éæ¼éåè±æ¬å·"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "%s: æ æ³æå¼ --css-file: %s"
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "æ¾ä¸å°å«æâ%sâçç´¢å¼\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "%s: æ æ³æå¼ --css-file: %s"
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image æ件â%sâä¸å¯è¯»ï¼%s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+#, fuzzy
+msgid "arguments are quoted by default"
+msgstr "ä¸èµæä½¿ç¨ @quote-argï¼åæ°æ¯é»è®¤å¼ç¨ç"
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "æ æ³æ¾å°èç¹â%sâã"
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image æ件â%sâ(对 HTML)ä¸å¯è¯»ï¼%s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-#, fuzzy
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr "@strong{Note...} å¨ Info
ä¸å½¢æäºä¸ä¸ªåç交åå¼ç¨ï¼å¯éè¿éåé¿å
æ¤äº"
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "â.âæâ,âä¹åå¿
须为 @%sï¼èä¸æ¯â%câ"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "â.âæâ,âä¹åå¿
须为 @%sï¼èä¸æ¯â%câ"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "å¨ç¬¬ä¸ä¸ªèç¹ä¹åéå° @menuï¼æ£å¨å建â顶âèç¹"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "å¨ç¬¬ä¸ä¸ªèç¹ä¹åéå° @menuï¼æ£å¨å建â顶âèç¹"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "å¨ç¬¬ä¸ä¸ªèç¹ä¹åéå° @menuï¼æ£å¨å建â顶âèç¹"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image æ件â%sâä¸å¯è¯»ï¼%s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, fuzzy, perl-format
msgid "error loading %s: %s\n"
msgstr "åå
¥â%sâæ¶åºé"
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "æªç¥çå½ä»¤â%sâ"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "æªç¥çå½ä»¤â%sâ"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "æ æ³æå¼è¾å
¥æ件â%sâ"
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "%s: æ æ³æå¼ --css-file: %s"
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-#, fuzzy
-msgid "arguments are quoted by default"
-msgstr "ä¸èµæä½¿ç¨ @quote-argï¼åæ°æ¯é»è®¤å¼ç¨ç"
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -4007,7 +4061,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "@%s çé误åæ°: %s"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "@%s çåæ°é误"
@@ -4023,7 +4077,7 @@
msgstr "åæ°ä¸ä¸å
许 @item æ¹ä¸º @itemize"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%sï¼éæ¼æ件åæ°ã\n"
@@ -4096,156 +4150,167 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "address@hidden@%1$sâæ¯æ²¡ææä¹ç"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "%s: æ æ³æå¼ --css-file: %s"
+
+#: tp/Texinfo/Parser.pm:3490
#, fuzzy, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr "address@hidden@%sâ"
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "å¨ç¬¬ä¸ä¸ªèç¹ä¹åéå° @menuï¼æ£å¨å建â顶âèç¹"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "å¨ç¬¬ä¸ä¸ªèç¹ä¹åéå° @menuï¼æ£å¨å建â顶âèç¹"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "%s: æ æ³æå¼ --css-file: %s"
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "åºä¸ºâ%sâ"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "address@hidden @%s æ¯æ²¡ææä¹ç"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%sï¼éæ¼æ件åæ°ã\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "@%s çé误åæ°: %s"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%sï¼%s åæ°å¿
须为æ°å¼ï¼èä¸æ¯â%sâã\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "%sï¼--footnote-style çåæ°å¿
须为âseparateâæâendâï¼èä¸æ¯â%sâã\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "ç´¢å¼â%sâå·²ç»åå¨"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
-#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
-msgstr "æ æ³å建ç®å½â%sâï¼%s"
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s"
msgstr "%s: æ æ³æå¼ --css-file: %s"
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:75
+#, fuzzy, perl-format
+msgid "Can't create directories `%s': %s"
+msgstr "æ æ³å建ç®å½â%sâï¼%s"
+
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "该èç¹ä¸æ²¡æèåã"
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(è¶
åºä»»ä½èç¹)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "æ æ³æ¾å°èç¹â%sâã"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "â.âæâ,âä¹åå¿
须为 @%sï¼èä¸æ¯â%câ"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "â.âæâ,âä¹åå¿
须为 @%sï¼èä¸æ¯â%câ"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image æ件â%sâä¸å¯è¯»ï¼%s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "æ æ³æ¾å°èç¹â%sâã"
+
+#, fuzzy
+#~ msgid ""
+#~ "address@hidden produces a spurious cross-reference in Info; reword to "
+#~ "avoid that"
+#~ msgstr ""
+#~ "@strong{Note...} å¨ Info
ä¸å½¢æäºä¸ä¸ªåç交åå¼ç¨ï¼å¯éè¿éåé¿å
æ¤äº"
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "â.âæâ,âä¹åå¿
须为 @%sï¼èä¸æ¯â%câ"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%sï¼è¦åï¼"
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "ç´¢å¼â%sâå·²ç»åå¨"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%sï¼éæ³é项 -- %c\n"
Index: po/zh_TW.po
===================================================================
RCS file: /sources/texinfo/texinfo/po/zh_TW.po,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -b -r1.63 -r1.64
--- po/zh_TW.po 20 Mar 2011 21:20:30 -0000 1.63
+++ po/zh_TW.po 9 Apr 2011 00:10:42 -0000 1.64
@@ -6,7 +6,7 @@
msgstr ""
"Project-Id-Version: texinfo 4.1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-03-20 21:43+0100\n"
+"POT-Creation-Date: 2011-04-09 01:25+0200\n"
"PO-Revision-Date: 2002-03-08 04:56+0800\n"
"Last-Translator: Abel Cheung <address@hidden>\n"
"Language-Team: Chinese (traditional) <address@hidden>\n"
@@ -80,11 +80,11 @@
msgid "memory exhausted"
msgstr "µêÀÀ°O¾ÐÅé¯ÓºÉ"
-#: info/echo-area.c:283 info/session.c:987
+#: info/echo-area.c:283 info/session.c:976
msgid "Move forward a character"
msgstr "address@hidden"
-#: info/echo-area.c:295 info/session.c:1014
+#: info/echo-area.c:295 info/session.c:1003
msgid "Move backward a character"
msgstr "address@hidden"
@@ -96,11 +96,11 @@
msgid "Move to the end of this line"
msgstr "²¾¦Ü¥»¦æµ²§À"
-#: info/echo-area.c:320 info/session.c:1046
+#: info/echo-area.c:320 info/session.c:1035
msgid "Move forward a word"
msgstr "address@hidden"
-#: info/echo-area.c:360 info/session.c:1070
+#: info/echo-area.c:360 info/session.c:1059
msgid "Move backward a word"
msgstr "address@hidden"
@@ -181,6 +181,7 @@
msgstr "address@hidden"
#: info/echo-area.c:941
+#, c-format
msgid "One completion:\n"
msgstr "address@hidden:\n"
@@ -194,6 +195,7 @@
msgstr "´¡¤J§¹¦¨¥y"
#: info/echo-area.c:1224
+#, c-format
msgid "Building completions..."
msgstr "«Ø¥ß§¹¦¨¥y¤¤..."
@@ -219,10 +221,12 @@
msgstr "¦b¥»Àɮתº¯Á¤Þ¤º¬d¸ß¦r¦ê"
#: info/indices.c:201
+#, c-format
msgid "Finding index entries..."
msgstr "§ä´M¯Á¤Þ¶µ¥Ø..."
#: info/indices.c:209
+#, c-format
msgid "No indices found."
msgstr "§ä¤£¨ì¯Á¤Þ"
@@ -236,10 +240,12 @@
msgstr "address@hidden@¦¸ªº `\\[index-search] ©R¥Oªº·j´M¶µ¥Ø"
#: info/indices.c:367
+#, c-format
msgid "No previous index search string."
msgstr "address@hidden"
#: info/indices.c:374
+#, c-format
msgid "No index entries."
msgstr "¨S¦³¯Á¤Þ¶µ¥Ø."
@@ -288,13 +294,13 @@
"\n"
"* Menu: ¨ä¯Á¤Þ¤¤¥]§t \"%s\" ªº¸`ÂI:\n"
-#: info/info.c:279 info/infokey.c:899
+#: info/info.c:279 info/infokey.c:892
#, c-format
msgid "Try --help for more information.\n"
msgstr "¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T.\n"
-#: info/info.c:298 info/infokey.c:145 install-info/install-info.c:2122
-#: makeinfo/makeinfo.c:802 util/texindex.c:295 texi2html/texi2html.pl:4026
+#: info/info.c:298 info/infokey.c:144 install-info/install-info.c:2133
+#: makeinfo/makeinfo.c:752 util/texindex.c:295 texi2html/texi2html.pl:4026
#, c-format, perl-format
msgid ""
"Copyright (C) %s Free Software Foundation, Inc.\n"
@@ -304,12 +310,12 @@
"There is NO WARRANTY, to the extent permitted by law.\n"
msgstr ""
-#: info/info.c:510
+#: info/info.c:511
#, c-format
msgid "no index entries found for `%s'\n"
msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
-#: info/info.c:604
+#: info/info.c:624
#, c-format
msgid ""
"Usage: %s [OPTION]... [MENU-ITEM...]\n"
@@ -317,7 +323,7 @@
"Read documentation in Info format.\n"
msgstr ""
-#: info/info.c:610
+#: info/info.c:630
msgid ""
"Options:\n"
" -k, --apropos=STRING look up STRING in all indices of all "
@@ -327,7 +333,7 @@
" -f, --file=FILENAME specify Info file to visit."
msgstr ""
-#: info/info.c:617
+#: info/info.c:637
msgid ""
" -h, --help display this help and exit.\n"
" --index-search=STRING go to node pointed by index entry STRING.\n"
@@ -335,7 +341,7 @@
" -o, --output=FILENAME output selected nodes to FILENAME."
msgstr ""
-#: info/info.c:623
+#: info/info.c:643
msgid ""
" -R, --raw-escapes output \"raw\" ANSI escapes (default).\n"
" --no-raw-escapes output escapes as literal text.\n"
@@ -343,11 +349,11 @@
" -O, --show-options, --usage go to command-line options node."
msgstr ""
-#: info/info.c:630
+#: info/info.c:650
msgid " -b, --speech-friendly be friendly to speech synthesizers."
msgstr ""
-#: info/info.c:634
+#: info/info.c:654
msgid ""
" --strict-node-location (for debugging) use Info file pointers as-"
"is.\n"
@@ -357,7 +363,7 @@
" -w, --where, --location print physical location of Info file."
msgstr ""
-#: info/info.c:641
+#: info/info.c:661
msgid ""
"\n"
"The first non-option argument, if present, is the menu entry to start from;\n"
@@ -367,13 +373,13 @@
"items relative to the initial node visited."
msgstr ""
-#: info/info.c:648
+#: info/info.c:668
msgid ""
"\n"
"For a summary of key bindings, type h within Info."
msgstr ""
-#: info/info.c:651
+#: info/info.c:671
msgid ""
"\n"
"Examples:\n"
@@ -387,7 +393,7 @@
" info -f ./foo.info show file ./foo.info, not searching dir"
msgstr ""
-#: info/info.c:662 info/infokey.c:918 makeinfo/makeinfo.c:475
+#: info/info.c:682 info/infokey.c:911 makeinfo/makeinfo.c:425
#: util/texindex.c:259
#, fuzzy
msgid ""
@@ -400,72 +406,72 @@
"µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (^¤å) ¦^³ø¦Ü address@hidden,\n"
"address@hidden, ½Ð¥H¹q¤l¶l¥ó (^¤å) ±H¨ì address@hidden"
-#: info/info.c:696
+#: info/info.c:716
#, c-format
msgid "Cannot find node `%s'."
msgstr "§ä¤£¨ì `%s' ¸`ÂI."
-#: info/info.c:697
+#: info/info.c:717
#, c-format
msgid "Cannot find node `(%s)%s'."
msgstr "§ä¤£¨ì `(%s)%s' ¸`ÂI."
-#: info/info.c:698
+#: info/info.c:718
msgid "Cannot find a window!"
msgstr "§ä¤£¨ì¤À¹jµøµ¡!"
-#: info/info.c:699
+#: info/info.c:719
msgid "Point doesn't appear within this window's node!"
msgstr "´å¼Ð¦ì¸m¤£¦b¥»¤À¹jµøµ¡ªº¸`ÂI¤º!"
-#: info/info.c:700
+#: info/info.c:720
msgid "Cannot delete the last window."
msgstr "address@hidden"
-#: info/info.c:701
+#: info/info.c:721
msgid "No menu in this node."
msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
-#: info/info.c:702
+#: info/info.c:722
msgid "No footnotes in this node."
msgstr "¥»¸`ÂI¨S¦³µù¸}."
-#: info/info.c:703
+#: info/info.c:723
msgid "No cross references in this node."
msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
-#: info/info.c:704
+#: info/info.c:724
#, c-format
msgid "No `%s' pointer for this node."
msgstr "¥»¸`ÂI¨S¦³ `%s' pointer."
-#: info/info.c:705
+#: info/info.c:725
#, c-format
msgid "Unknown Info command `%c'; try `?' for help."
msgstr "¥¼ª¾ªº Info ©R¥O `%c'; ¸Õ¸Õ `?' ¥H¨ú±o¨D§U¸ê°T."
-#: info/info.c:706
+#: info/info.c:726
#, c-format
msgid "Terminal type `%s' is not smart enough to run Info."
msgstr "²×ºÝ¾÷Ãþ«¬ `%s' µLªk¤ä´©°õ¦æ Info ©Ò»Ýªº»Ý¨D."
-#: info/info.c:707
+#: info/info.c:727
msgid "You are already at the last page of this node."
msgstr "address@hidden"
-#: info/info.c:708
+#: info/info.c:728
msgid "You are already at the first page of this node."
msgstr "address@hidden"
-#: info/info.c:709
+#: info/info.c:729
msgid "Only one window."
msgstr "address@hidden"
-#: info/info.c:710
+#: info/info.c:730
msgid "Resulting window would be too small."
msgstr "²£¥Íªº¤À¹jµøµ¡·|¤Ó¤p."
-#: info/info.c:711
+#: info/info.c:731
msgid "Not enough room for a help window, please delete a window."
msgstr "³Ñ¤UªºªÅ¶¡¤Ó¤p, µLªk®e¯Ç¨D§U¤À¹jµøµ¡, address@hidden"
@@ -780,10 +786,12 @@
msgstr " address@hidden"
#: info/infodoc.c:312
+#, c-format
msgid "The current search path is:\n"
msgstr "¥Ø«eªº·j´M¸ô®|¬°:\n"
#: info/infodoc.c:316
+#, c-format
msgid ""
"Commands available in Info windows:\n"
"\n"
@@ -792,6 +800,7 @@
"\n"
#: info/infodoc.c:320
+#, c-format
msgid ""
"Commands available in the echo area:\n"
"\n"
@@ -809,7 +818,7 @@
"\n"
#: info/infodoc.c:347
-#, fuzzy
+#, fuzzy, c-format
msgid ""
"The following commands cannot be invoked at all:\n"
"\n"
@@ -817,62 +826,62 @@
"¥H¤Uªº«ü¥O, ¥u¥i¸g¥Ñ M-x °õ¦æ:\n"
"\n"
-#: info/infodoc.c:477
+#: info/infodoc.c:474
msgid "Display help message"
msgstr "Åã¥Ü¨D§U°T®§"
-#: info/infodoc.c:495
+#: info/infodoc.c:492
msgid "Visit Info node `(info)Help'"
msgstr "«ô³X Info ¸`ÂI `(info)Help'"
-#: info/infodoc.c:633
+#: info/infodoc.c:630
msgid "Print documentation for KEY"
msgstr "¦C¥X KEY ªº¤å¥ó"
-#: info/infodoc.c:645
+#: info/infodoc.c:642
#, c-format
msgid "Describe key: %s"
msgstr "´yz«öÁä«ü¥O: %s"
-#: info/infodoc.c:656
+#: info/infodoc.c:653
#, c-format
msgid "ESC %s is undefined."
msgstr "ESC %s ¥¼©w¸q."
-#: info/infodoc.c:672 info/infodoc.c:701
+#: info/infodoc.c:669 info/infodoc.c:698
#, c-format
msgid "%s is undefined."
msgstr "%s ¥¼©w¸q."
-#: info/infodoc.c:722
+#: info/infodoc.c:719
#, c-format
msgid "%s is defined to %s."
msgstr "%s ©w¸q¦¨ %s."
-#: info/infodoc.c:1146
+#: info/infodoc.c:1143
msgid "Show what to type to execute a given command"
msgstr "Åã¥Ü°õ¦æ¬Y©R¥O©Ò»ÝÁä¤Jªº«öÁä"
-#: info/infodoc.c:1150
+#: info/infodoc.c:1147
msgid "Where is command: "
msgstr ""
-#: info/infodoc.c:1172
+#: info/infodoc.c:1169
#, c-format
msgid "`%s' is not on any keys"
msgstr "`%s' ¥¼Ãìµ²¨ì¥ô¦ó«öÁä"
-#: info/infodoc.c:1179
+#: info/infodoc.c:1176
#, c-format
msgid "%s can only be invoked via %s."
msgstr "%s ¥u¯à¸g¥Ñ %s °õ¦æ."
-#: info/infodoc.c:1183
+#: info/infodoc.c:1180
#, c-format
msgid "%s can be invoked via %s."
msgstr "%s ¥i¸g¥Ñ %s °õ¦æ."
-#: info/infodoc.c:1188
+#: info/infodoc.c:1185
#, c-format
msgid "There is no function named `%s'"
msgstr "¨S¦³¦W¬° `%s' ªº¨ç¦¡"
@@ -884,93 +893,102 @@
"----------------------\n"
msgstr "----------------------\n"
-#: info/infokey.c:170
+#: info/infokey.c:169
+#, c-format
msgid "incorrect number of arguments"
msgstr ""
-#: info/infokey.c:201
+#: info/infokey.c:199
#, fuzzy, c-format
msgid "cannot open input file `%s'"
msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
-#: info/infokey.c:215
+#: info/infokey.c:213
#, fuzzy, c-format
msgid "cannot create output file `%s'"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: info/infokey.c:226
+#: info/infokey.c:224
#, c-format
msgid "error writing to `%s'"
msgstr ""
-#: info/infokey.c:232
+#: info/infokey.c:230
#, fuzzy, c-format
msgid "error closing output file `%s'"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: info/infokey.c:450
+#: info/infokey.c:449
+#, c-format
msgid "key sequence too long"
msgstr ""
-#: info/infokey.c:529
+#: info/infokey.c:527
+#, c-format
msgid "missing key sequence"
msgstr ""
-#: info/infokey.c:610
+#: info/infokey.c:607
+#, c-format
msgid "NUL character (\\000) not permitted"
msgstr ""
-#: info/infokey.c:641
+#: info/infokey.c:637
#, c-format
msgid "NUL character (^%c) not permitted"
msgstr ""
-#: info/infokey.c:665
-#, fuzzy
+#: info/infokey.c:660
+#, fuzzy, c-format
msgid "missing action name"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
-#: info/infokey.c:681 info/infokey.c:756
+#: info/infokey.c:675 info/infokey.c:745
+#, c-format
msgid "section too long"
msgstr ""
-#: info/infokey.c:688
+#: info/infokey.c:681
#, fuzzy, c-format
msgid "unknown action `%s'"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: info/infokey.c:698
+#: info/infokey.c:691
+#, c-format
msgid "action name too long"
msgstr ""
-#: info/infokey.c:712
+#: info/infokey.c:704
#, c-format
msgid "extra characters following action `%s'"
msgstr ""
-#: info/infokey.c:723
-#, fuzzy
+#: info/infokey.c:715
+#, fuzzy, c-format
msgid "missing variable name"
msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
-#: info/infokey.c:733
+#: info/infokey.c:724
+#, c-format
msgid "missing `=' immediately after variable name"
msgstr ""
-#: info/infokey.c:741
+#: info/infokey.c:731
+#, c-format
msgid "variable name too long"
msgstr ""
-#: info/infokey.c:765
+#: info/infokey.c:753
+#, c-format
msgid "value too long"
msgstr ""
-#: info/infokey.c:890
+#: info/infokey.c:881
#, c-format
msgid "\"%s\", line %u: "
msgstr ""
-#: info/infokey.c:906
+#: info/infokey.c:899
#, c-format
msgid ""
"Usage: %s [OPTION]... [INPUT-FILE]\n"
@@ -1023,10 +1041,12 @@
msgstr ""
#: info/infomap.c:1171
+#, c-format
msgid "Bad data in infokey file -- some key bindings ignored"
msgstr ""
#: info/infomap.c:1221
+#, c-format
msgid "Bad data in infokey file -- some var settings ignored"
msgstr ""
@@ -1043,6 +1063,7 @@
msgstr "¦b¦^À³°Ï¤¤Åª¨ú©R¥O¦WºÙ, ¨Ã¥B°õ¦æ¥¦"
#: info/m-x.c:139
+#, c-format
msgid "Cannot execute an `echo-area' command here."
msgstr "µLªk¦b³o¸Ì°õ¦æ `echo-area' ©R¥O."
@@ -1104,7 +1125,7 @@
msgid "Select visited node: "
msgstr "¿ï¨ú«ô³X¹Lªº¸`ÂI: "
-#: info/nodemenu.c:336 info/session.c:2599
+#: info/nodemenu.c:336 info/session.c:2588
#, c-format
msgid "The reference disappeared! (%s)."
msgstr "¥æ¤¬°Ñ·Ó¤£¨£¤F! (%s)."
@@ -1114,7 +1135,7 @@
msgid "regexp error: %s"
msgstr ""
-#: info/session.c:164
+#: info/session.c:153
#, c-format
msgid ""
"Welcome to Info version %s. Type \\[get-help-window] for help, \\[menu-item] "
@@ -1123,506 +1144,518 @@
"Åwªï¨Ï¥Î Info ª©¥» %s. Áä¤J \\[get-help-window] ¥H¨ú±o¨D§U¸ê°T, \\[menu-"
"item] ¥H¨ú±o¿ï³æ¶µ¥Ø."
-#: info/session.c:630
+#: info/session.c:619
msgid "Move down to the next line"
msgstr "address@hidden"
-#: info/session.c:682
+#: info/session.c:671
msgid "Move up to the previous line"
msgstr "address@hidden"
-#: info/session.c:952
+#: info/session.c:941
msgid "Move to the end of the line"
msgstr "²¾¦Ü¥»¦æµ²§À"
-#: info/session.c:963
+#: info/session.c:952
msgid "Move to the start of the line"
msgstr "²¾¦Ü¥»¦æ¶}ÀY"
-#: info/session.c:1163
+#: info/session.c:1152
msgid "Next"
msgstr "address@hidden"
-#: info/session.c:1179 info/session.c:1304
+#: info/session.c:1168 info/session.c:1293
+#, c-format
msgid "No more nodes within this document."
msgstr "¥»¤å¥ó¤¤¨S¦³§ó¦hªº¸`ÂI¤F."
-#: info/session.c:1330
+#: info/session.c:1319
+#, c-format
msgid "No `Prev' for this node."
msgstr "¥»¸`ÂI¨S¦³ address@hidden (Prev)' ¸`ÂI."
-#: info/session.c:1350
+#: info/session.c:1339
+#, c-format
msgid "No `Prev' or `Up' for this node within this document."
msgstr "¦b¥»¤å¥ó¤¤, ¥»¸`ÂI¨S¦³ address@hidden (Prev)' ¸`ÂI©Î address@hidden
(Up)' ¸`ÂI."
-#: info/session.c:1412
+#: info/session.c:1401
msgid "Move forwards or down through node structure"
msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«e©Î©¹¤U²¾°Ê"
-#: info/session.c:1428
+#: info/session.c:1417
msgid "Move backwards or up through node structure"
msgstr "¦b¸`ÂIµ²ºc¤¤, ©¹«á©Î©¹¤U²¾°Ê"
-#: info/session.c:1529
+#: info/session.c:1518
msgid "Scroll forward in this window"
msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê"
-#: info/session.c:1537
+#: info/session.c:1526
msgid "Scroll forward in this window and set default window size"
msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
-#: info/session.c:1545
+#: info/session.c:1534
#, fuzzy
msgid "Scroll forward in this window staying within node"
msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê"
-#: info/session.c:1553
+#: info/session.c:1542
#, fuzzy
msgid ""
"Scroll forward in this window staying within node and set default window size"
msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«e±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
-#: info/session.c:1561
+#: info/session.c:1550
msgid "Scroll backward in this window"
msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê"
-#: info/session.c:1569
+#: info/session.c:1558
msgid "Scroll backward in this window and set default window size"
msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
-#: info/session.c:1578
+#: info/session.c:1567
#, fuzzy
msgid "Scroll backward in this window staying within node"
msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê"
-#: info/session.c:1586
+#: info/session.c:1575
#, fuzzy
msgid ""
"Scroll backward in this window staying within node and set default window "
"size"
msgstr "¦b¥»¤À¹jµøµ¡¤¤¦V«á±²°Ê, ¨Ã¥B³]©w¦¨¹w³]ªº¤À¹jµøµ¡¤Ø¤o"
-#: info/session.c:1594
+#: info/session.c:1583
msgid "Move to the start of this node"
msgstr "²¾¦Ü¥»¸`ÂIªº°_ÂI"
-#: info/session.c:1601
+#: info/session.c:1590
msgid "Move to the end of this node"
msgstr "²¾¦Ü¥»¸`ÂIªºµ²§À"
-#: info/session.c:1608
+#: info/session.c:1597
msgid "Scroll down by lines"
msgstr "address@hidden"
-#: info/session.c:1625
+#: info/session.c:1614
msgid "Scroll up by lines"
msgstr "address@hidden"
-#: info/session.c:1643
+#: info/session.c:1632
msgid "Scroll down by half screen size"
msgstr "¦V¤U±²°Ê¥bӿùõªº¤j¤p"
-#: info/session.c:1669
+#: info/session.c:1658
msgid "Scroll up by half screen size"
msgstr "¦V¤W±²°Ê¥bӿùõªº¤j¤p"
-#: info/session.c:1698
+#: info/session.c:1687
msgid "Select the next window"
msgstr "address@hidden"
-#: info/session.c:1737
+#: info/session.c:1726
msgid "Select the previous window"
msgstr "address@hidden"
-#: info/session.c:1788
+#: info/session.c:1777
msgid "Split the current window"
msgstr "¤À¹j¥Ø«eªº¤À¹jµøµ¡"
-#: info/session.c:1869
+#: info/session.c:1858
msgid "Delete the current window"
msgstr "§R°£¥Ø«eªº¤À¹jµøµ¡"
-#: info/session.c:1877
+#: info/session.c:1866
+#, c-format
msgid "Cannot delete a permanent window"
msgstr "µLªk§R°£©T©wªº¤À¹jµøµ¡"
-#: info/session.c:1909
+#: info/session.c:1898
msgid "Delete all other windows"
msgstr "§R°£©Ò¦³¨ä¥¦ªº¤À¹jµøµ¡"
-#: info/session.c:1955
+#: info/session.c:1944
msgid "Scroll the other window"
msgstr "address@hidden"
-#: info/session.c:1976
+#: info/session.c:1965
msgid "Scroll the other window backward"
msgstr "address@hidden"
-#: info/session.c:1982
+#: info/session.c:1971
msgid "Grow (or shrink) this window"
msgstr "ÂX¤j (©ÎÁY¤p) ³oÓ¤À¹jµøµ¡"
-#: info/session.c:1993
+#: info/session.c:1982
msgid "Divide the available screen space among the visible windows"
msgstr "¦b¥i¥Îªº¿Ã¹õªÅ¶¡¤¤, ¥§¡¤À³Î©Ò¦³ªº¥i¨£¤À¹jµøµ¡"
-#: info/session.c:2000
+#: info/session.c:1989
msgid "Toggle the state of line wrapping in the current window"
msgstr "¤Á´«¥Ø«e¤À¹jµøµ¡ªº¦Û°Ê´«¦æª¬ºA"
-#: info/session.c:2007
+#: info/session.c:1996
msgid "Toggle the usage of regular expressions in searches"
msgstr ""
-#: info/session.c:2011
+#: info/session.c:2000
+#, c-format
msgid "Using regular expressions for searches."
msgstr ""
-#: info/session.c:2012
+#: info/session.c:2001
+#, c-format
msgid "Using literal strings for searches."
msgstr ""
-#: info/session.c:2183
+#: info/session.c:2172
msgid "Select the Next node"
msgstr "¿ï¨ú address@hidden ¸`ÂI"
-#: info/session.c:2191
+#: info/session.c:2180
msgid "Select the Prev node"
msgstr "¿ï¨ú address@hidden ¸`ÂI"
-#: info/session.c:2199
+#: info/session.c:2188
msgid "Select the Up node"
msgstr "¿ï¨ú address@hidden ¸`ÂI"
-#: info/session.c:2206
+#: info/session.c:2195
msgid "Select the last node in this file"
msgstr "address@hidden"
-#: info/session.c:2233 info/session.c:2266
+#: info/session.c:2222 info/session.c:2255
+#, c-format
msgid "This window has no additional nodes"
msgstr "¥»¤À¹jµøµ¡¨S¦³ÃB¥~ªº¸`ÂI"
-#: info/session.c:2239
+#: info/session.c:2228
msgid "Select the first node in this file"
msgstr "address@hidden"
-#: info/session.c:2273
+#: info/session.c:2262
msgid "Select the last item in this node's menu"
msgstr "¿ï¨ú¥»¸`ÂI¿ï³æ¤¤, address@hidden"
-#: info/session.c:2279
+#: info/session.c:2268
msgid "Select this menu item"
msgstr "address@hidden"
-#: info/session.c:2312
+#: info/session.c:2301
#, c-format
msgid "There aren't %d items in this menu."
msgstr "¥»¿ï³æ¤¤¨S¦³ %d Ó¶µ¥Ø"
-#: info/session.c:2506 info/session.c:2507
+#: info/session.c:2495 info/session.c:2496
#, c-format
msgid "Menu item (%s): "
msgstr "¿ï³æ¶µ¥Ø (%s): "
-#: info/session.c:2510
+#: info/session.c:2499
msgid "Menu item: "
msgstr "¿ï³æ¶µ¥Ø: "
-#: info/session.c:2517 info/session.c:2518
+#: info/session.c:2506 info/session.c:2507
#, c-format
msgid "Follow xref (%s): "
msgstr "¸òÀH¥æ¤¬°Ñ·Ó (%s): "
-#: info/session.c:2521
+#: info/session.c:2510
msgid "Follow xref: "
msgstr "¸òÀH¥æ¤¬°Ñ·Ó: "
-#: info/session.c:2650
+#: info/session.c:2639
msgid "Read a menu item and select its node"
msgstr "address@hidden, ¨Ã¥B¿ï¾Ü¥¦ªº¸`ÂI"
-#: info/session.c:2658
+#: info/session.c:2647
msgid "Read a footnote or cross reference and select its node"
msgstr "address@hidden, ¨Ã¥B¿ï¾Ü¥¦ªº¸`ÂI"
-#: info/session.c:2664
+#: info/session.c:2653
msgid "Move to the start of this node's menu"
msgstr "²¾¦Ü¥»¸`ÂIªº¿ï³æ¶}ÀY"
-#: info/session.c:2686
+#: info/session.c:2675
msgid "Visit as many menu items at once as possible"
msgstr "address@hidden"
-#: info/session.c:2714
+#: info/session.c:2703
msgid "Read a node name and select it"
msgstr "Ū¨ú¸`ÂI¦WºÙ, ¨Ã¥B¿ï¾Ü¥¦"
-#: info/session.c:2769 info/session.c:2774
+#: info/session.c:2758 info/session.c:2763
msgid "Goto node: "
msgstr "¸õ¦Ü¸`ÂI: "
-#: info/session.c:2838
+#: info/session.c:2828
#, c-format
msgid "No menu in node `%s'."
msgstr "¸`ÂI `%s' ¤¤¨S¦³¿ï³æ."
-#: info/session.c:2884
+#: info/session.c:2875
#, c-format
msgid "No menu item `%s' in node `%s'."
msgstr "¿ï³æ¶µ¥Ø `%s' ¤£¦b¸`ÂI `%s' ¤¤."
-#: info/session.c:2914
+#: info/session.c:2907
#, c-format
msgid "Unable to find node referenced by `%s' in `%s'."
msgstr "³Q°Ñ·Óªº¸`ÂI `%s' ¦b `%s' ¤¤§ä¤£¨ì."
-#: info/session.c:2964
+#: info/session.c:2957
msgid "Read a list of menus starting from dir and follow them"
msgstr "Ū¨ú¦Û dir ¶}©lªº¸`ÂI±ø¦C, ¨Ã¥B¸òÀH¥¦Ì"
-#: info/session.c:2966
+#: info/session.c:2959
msgid "Follow menus: "
msgstr "¸òÀH¿ï³æ: "
-#: info/session.c:3159
+#: info/session.c:3151
msgid "Find the node describing program invocation"
msgstr "§ä´M´yzµ{¦¡°õ¦æ¤èªkªº¸`ÂI"
-#: info/session.c:3161
+#: info/session.c:3153
#, c-format
msgid "Find Invocation node of [%s]: "
msgstr "§ä´M [%s] ªº°õ¦æ¤èªk¸`ÂI: "
-#: info/session.c:3199
+#: info/session.c:3191
msgid "Read a manpage reference and select it"
msgstr "Ū¨ú½u¤W¤â¥U (manpage) ªº°Ñ·Ó, ¨Ã¥B¿ï¾Ü¥¦"
-#: info/session.c:3203
+#: info/session.c:3195
msgid "Get Manpage: "
msgstr "¨ú±o½u¤W¤â¥U (Manpage): "
-#: info/session.c:3233
+#: info/session.c:3225
msgid "Select the node `Top' in this file"
msgstr "¿ï¨ú¥»Àɮפ¤ªº `Top' ¸`ÂI"
-#: info/session.c:3239
+#: info/session.c:3231
msgid "Select the node `(dir)'"
msgstr "¿ï¨ú¸`ÂI `(dir)'"
-#: info/session.c:3256 info/session.c:3258
+#: info/session.c:3248 info/session.c:3250
#, c-format
msgid "Kill node (%s): "
msgstr "§R°£¸`ÂI (%s): "
-#: info/session.c:3310
+#: info/session.c:3302
#, c-format
msgid "Cannot kill node `%s'"
msgstr "µLªk§R°£¸`ÂI `%s'"
-#: info/session.c:3320
+#: info/session.c:3312
+#, c-format
msgid "Cannot kill the last node"
msgstr "address@hidden"
-#: info/session.c:3406
+#: info/session.c:3398
msgid "Select the most recently selected node"
msgstr "address@hidden"
-#: info/session.c:3412
+#: info/session.c:3404
msgid "Kill this node"
msgstr "§R°£¥»¸`ÂI"
-#: info/session.c:3420
+#: info/session.c:3412
msgid "Read the name of a file and select it"
msgstr "Ū¨úÀɮצWºÙ, µM«á¿ï¨ú¥¦"
-#: info/session.c:3424
+#: info/session.c:3416
msgid "Find file: "
msgstr "§ä´MÀÉ®×: "
-#: info/session.c:3441
+#: info/session.c:3433
#, c-format
msgid "Cannot find `%s'."
msgstr "µLªk§ä¨ì `%s'."
-#: info/session.c:3484 info/session.c:3602
+#: info/session.c:3476 info/session.c:3594
#, c-format
msgid "Could not create output file `%s'."
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: info/session.c:3498 info/session.c:3620 info/session.c:3680
+#: info/session.c:3490 info/session.c:3612 info/session.c:3672
+#, c-format
msgid "Done."
msgstr "§¹¦¨."
-#: info/session.c:3553
+#: info/session.c:3545
#, c-format
msgid "Writing node %s..."
msgstr "¼g¤J¸`ÂI %s ¤¤..."
-#: info/session.c:3629
+#: info/session.c:3621
msgid "Pipe the contents of this node through INFO_PRINT_COMMAND"
msgstr "±N¥»¸`ÂIªº¤º®e, ¸g¥ÑºÞ¹D (pipe) °e¦Ü INFO_PRINT_COMMAND"
-#: info/session.c:3664
+#: info/session.c:3656
#, c-format
msgid "Cannot open pipe to `%s'."
msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
-#: info/session.c:3670
+#: info/session.c:3662
#, c-format
msgid "Printing node %s..."
msgstr "¦C¦L¸`ÂI %s ¤¤..."
-#: info/session.c:3962
+#: info/session.c:3954
msgid "Search continued from the end of the document."
msgstr ""
-#: info/session.c:3967
+#: info/session.c:3959
#, fuzzy
msgid "Search continued from the beginning of the document."
msgstr "§R°£¦Ü¥»¦æ¶}ÀY, ¨Ã¸m¤J°Å¶Kï"
-#: info/session.c:3984
+#: info/session.c:3976
#, c-format
msgid "Searching subfile %s ..."
msgstr "·j´M¤lÀÉ®× %s ..."
-#: info/session.c:4042
+#: info/session.c:4034
msgid "Read a string and search for it case-sensitively"
msgstr "address@hidden, µM«á¥H°Ï¤À¤j¤p¼g¤è¦¡·j´M"
-#: info/session.c:4049
+#: info/session.c:4041
msgid "Read a string and search for it"
msgstr "address@hidden, µM«á·j´M"
-#: info/session.c:4057
+#: info/session.c:4049
msgid "Read a string and search backward for it"
msgstr "address@hidden, µM«á¦V«á·j´M"
-#: info/session.c:4093 info/session.c:4099
+#: info/session.c:4085 info/session.c:4091
#, fuzzy, c-format
msgid "%s%s%s [%s]: "
msgstr "%s%s [%s]: "
-#: info/session.c:4094 info/session.c:4100
+#: info/session.c:4086 info/session.c:4092
msgid "Regexp search"
msgstr ""
-#: info/session.c:4095 info/session.c:4101
+#: info/session.c:4087 info/session.c:4093
#, fuzzy
msgid " case-sensitively"
msgstr ", ¥H°Ï¤À¤j¤p¼gªº¤è¦¡"
-#: info/session.c:4096 info/session.c:4102
+#: info/session.c:4088 info/session.c:4094
#, fuzzy
msgid " backward"
msgstr "¦V«á·j´M¦r¦ê"
-#: info/session.c:4100
+#: info/session.c:4092
msgid "Search"
msgstr "·j´M¦r¦ê"
-#: info/session.c:4142
+#: info/session.c:4134
+#, c-format
msgid "Search failed."
msgstr "·j´M¥¢±Ñ."
-#: info/session.c:4160
+#: info/session.c:4152
msgid "Repeat last search in the same direction"
msgstr "¥H¦P¼Ëªº·j´M¤è¦V«ÂФW¦¸ªº·j´M"
-#: info/session.c:4163 info/session.c:4173
+#: info/session.c:4155 info/session.c:4165
+#, c-format
msgid "No previous search string"
msgstr "address@hidden"
-#: info/session.c:4170
+#: info/session.c:4162
msgid "Repeat last search in the reverse direction"
msgstr "¥H¬Û¤Ïªº·j´M¤è¦V«ÂФW¦¸ªº·j´M"
-#: info/session.c:4189 info/session.c:4195
+#: info/session.c:4181 info/session.c:4187
msgid "Search interactively for a string as you type it"
msgstr "¥H¤¬°Ê¤è¦¡, Ãä¿é¤J¦r¦êÃä·j´M"
-#: info/session.c:4275
+#: info/session.c:4267
#, fuzzy
msgid "Regexp I-search backward: "
msgstr "¤Ï¦V¤¬°Ê·j´M: "
-#: info/session.c:4276
+#: info/session.c:4268
msgid "I-search backward: "
msgstr "¤Ï¦V¤¬°Ê·j´M: "
-#: info/session.c:4278
+#: info/session.c:4270
#, fuzzy
msgid "Regexp I-search: "
msgstr "¤¬°Ê·j´M: "
-#: info/session.c:4279
+#: info/session.c:4271
msgid "I-search: "
msgstr "¤¬°Ê·j´M: "
-#: info/session.c:4304 info/session.c:4306
+#: info/session.c:4296 info/session.c:4298
msgid "Failing "
msgstr "¥¢±Ñ "
-#: info/session.c:4797
+#: info/session.c:4789
msgid "Move to the previous cross reference"
msgstr "address@hidden"
-#: info/session.c:4815
+#: info/session.c:4807
msgid "Move to the next cross reference"
msgstr "address@hidden"
-#: info/session.c:4837
+#: info/session.c:4829
msgid "Select reference or menu item appearing on this line"
msgstr "¿ï¾Ü¥X²{¦b¥»¦æªº°Ñ·Ó©Î¿ï³æ¶µ¥Ø"
-#: info/session.c:4860
+#: info/session.c:4852
msgid "Cancel current operation"
msgstr "address@hidden"
-#: info/session.c:4867
+#: info/session.c:4859
+#, c-format
msgid "Quit"
msgstr "µ²§ô"
-#: info/session.c:4876
+#: info/session.c:4868
msgid "Move the cursor to a specific line of the window"
msgstr "²¾°Ê´å¼Ð¦Ü¤À¹jµøµ¡¤¤ªº«ü©w¦ì¸m"
-#: info/session.c:4908
+#: info/session.c:4900
msgid "Redraw the display"
msgstr "«Ã¸µe±"
-#: info/session.c:4945
+#: info/session.c:4937
msgid "Quit using Info"
msgstr "µ²§ô¨Ï¥Î Info"
-#: info/session.c:4958
+#: info/session.c:4950
msgid "Run command bound to this key's lowercase variant"
msgstr ""
-#: info/session.c:4969
+#: info/session.c:4961
#, c-format
msgid "Unknown command (%s)."
msgstr "¥¼ª¾ªº©R¥O (%s)."
-#: info/session.c:4972
+#: info/session.c:4964
#, c-format
msgid "\"%s\" is invalid"
msgstr "\"%s\" ¤£¦Xªk"
-#: info/session.c:4973
+#: info/session.c:4965
#, fuzzy, c-format
msgid "`%s' is invalid"
msgstr "\"%s\" ¤£¦Xªk"
-#: info/session.c:5188
+#: info/session.c:5180
msgid "Add this digit to the current numeric argument"
msgstr "±N¥»¼Æ¦r¥[¦Ü¥Ø«eªº¼ÆȤ޼Æ"
-#: info/session.c:5197
+#: info/session.c:5189
msgid "Start (or multiply by 4) the current numeric argument"
msgstr "¶}©l¥Ø«eªº¼ÆÈ¤Þ¼Æ (©Î¬O¼¥H 4)"
-#: info/session.c:5212
+#: info/session.c:5204
msgid "Internally used by \\[universal-argument]"
msgstr "¦b¤º³¡³Q \\[universal-argument] ¨Ï¥Î"
@@ -1730,31 +1763,26 @@
msgid " Subfile: %s"
msgstr " ¤lÀÉ®×: %s"
-#: install-info/install-info.c:221
-#, c-format
-msgid "%s: warning: "
-msgstr "%s: ĵ§i: "
-
-#: install-info/install-info.c:270
+#: install-info/install-info.c:285
#, c-format
-msgid " for %s"
+msgid "%s for %s"
msgstr ""
-#: install-info/install-info.c:505
+#: install-info/install-info.c:519
#, c-format
msgid "\tTry `%s --help' for a complete list of options.\n"
msgstr "\t¸Õ¸Õ Try `%s --help' ¥H¨ú±o§¹¾ãªº°Ñ¼Æ¦Cªí.\n"
-#: install-info/install-info.c:513
+#: install-info/install-info.c:527
#, fuzzy, c-format
msgid "Usage: %s [OPTION]... [INFO-FILE [DIR-FILE]]\n"
msgstr "¥Îªk: %s [OPTION]... FILE...\n"
-#: install-info/install-info.c:515
+#: install-info/install-info.c:529
msgid "Add or remove entries in INFO-FILE from the Info directory DIR-FILE."
msgstr ""
-#: install-info/install-info.c:518
+#: install-info/install-info.c:532
msgid ""
"Options:\n"
" --debug report what is being done.\n"
@@ -1768,7 +1796,7 @@
" --dry-run same as --test."
msgstr ""
-#: install-info/install-info.c:530
+#: install-info/install-info.c:544
msgid ""
" --entry=TEXT insert TEXT as an Info directory entry.\n"
" TEXT is written as an Info menu item line followed\n"
@@ -1784,7 +1812,7 @@
" and the basename of the Info file isn't found either."
msgstr ""
-#: install-info/install-info.c:542
+#: install-info/install-info.c:556
msgid ""
" --help display this help and exit.\n"
" --info-dir=DIR same as --dir-file=DIR/dir.\n"
@@ -1799,7 +1827,7 @@
" --quiet suppress warnings."
msgstr ""
-#: install-info/install-info.c:555
+#: install-info/install-info.c:569
msgid ""
" --regex=R put this file's entries in all sections that match the\n"
" regular expression R (ignoring case).\n"
@@ -1815,14 +1843,14 @@
" --section R SEC equivalent to --regex=R --section=SEC --add-once."
msgstr ""
-#: install-info/install-info.c:568
+#: install-info/install-info.c:582
msgid ""
" --silent suppress warnings.\n"
" --test suppress updating of DIR-FILE.\n"
" --version display version information and exit."
msgstr ""
-#: install-info/install-info.c:575 texi2html/texi2html.pl:3946
+#: install-info/install-info.c:589 texi2html/texi2html.pl:3946
#, fuzzy
msgid ""
"Email bug reports to address@hidden,\n"
@@ -1833,7 +1861,7 @@
"µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (^¤å) ¦^³ø¦Ü address@hidden,\n"
"address@hidden, ½Ð¥H¹q¤l¶l¥ó (^¤å) ±H¨ì address@hidden"
-#: install-info/install-info.c:602
+#: install-info/install-info.c:616
#, fuzzy, c-format
msgid ""
"This is the file .../info/dir, which contains the\n"
@@ -1868,63 +1896,67 @@
"\n"
"* Menu:\n"
-#: install-info/install-info.c:627
-#, c-format
-msgid "%s: could not read (%s) and could not create (%s)\n"
+#: install-info/install-info.c:640
+#, fuzzy, c-format
+msgid "%s: could not read (%s) and could not create (%s)"
msgstr "%s: µLªkŪ¨ú (%s), ¦Ó¥BµLªk«Ø¥ß (%s)\n"
-#: install-info/install-info.c:724
+#: install-info/install-info.c:736
#, c-format
msgid "%s: empty file"
msgstr "%s: ªÅÀÉ®×"
-#: install-info/install-info.c:1067 install-info/install-info.c:1107
+#: install-info/install-info.c:1079 install-info/install-info.c:1119
+#, c-format
msgid "START-INFO-DIR-ENTRY without matching END-INFO-DIR-ENTRY"
msgstr "¦³ START-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº END-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1102
+#: install-info/install-info.c:1114
+#, c-format
msgid "END-INFO-DIR-ENTRY without matching START-INFO-DIR-ENTRY"
msgstr "¦³ END-INFO-DIR-ENTRY, ¦ý¬O¨S¦³¬Û¹ïÀ³ªº START-INFO-DIR-ENTRY"
-#: install-info/install-info.c:1967 install-info/install-info.c:1977
+#: install-info/install-info.c:1978 install-info/install-info.c:1988
#, c-format
msgid "%s: already have dir file: %s\n"
msgstr ""
-#: install-info/install-info.c:2057
+#: install-info/install-info.c:2068
#, c-format
msgid "%s: Specify the Info file only once.\n"
msgstr "%s: ¥u¦³«ü©w Info address@hidden"
-#: install-info/install-info.c:2090
+#: install-info/install-info.c:2101
#, c-format
msgid "Extra regular expression specified, ignoring `%s'"
msgstr ""
-#: install-info/install-info.c:2102
+#: install-info/install-info.c:2113
#, c-format
msgid "Error in regular expression `%s': %s"
msgstr ""
-#: install-info/install-info.c:2160
+#: install-info/install-info.c:2171
#, c-format
msgid "excess command line argument `%s'"
msgstr "¦h¾lªº©R¥O¦C¤Þ¼Æ `%s'"
-#: install-info/install-info.c:2164
+#: install-info/install-info.c:2175
+#, c-format
msgid "No input file specified; try --help for more information."
msgstr "¥¼«ü©w¿é¤JÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o§ó¦hªº¸ê°T."
-#: install-info/install-info.c:2167
+#: install-info/install-info.c:2177
+#, c-format
msgid "No dir file specified; try --help for more information."
msgstr "¥¼«ü©w dir ÀÉ®×; ¸Õ¸Õ --help ¥H¨ú±o¨ú¦hªº¸ê°T."
-#: install-info/install-info.c:2309
+#: install-info/install-info.c:2319
#, c-format
msgid "no info dir entry in `%s'"
msgstr "`%s' ¤º¨S¦³ info dir ¶µ¥Ø"
-#: install-info/install-info.c:2557
+#: install-info/install-info.c:2567
#, c-format
msgid "no entries found for `%s'; nothing deleted"
msgstr "§ä¤£¨ì `%s' ªº¶µ¥Ø; ¥¼§R°£¥ô¦ó¶µ¥Ø"
@@ -1996,6 +2028,7 @@
msgstr ""
#: makeinfo/cmds.c:1182
+#, c-format
msgid "@sc argument all uppercase, thus no effect"
msgstr "@sc ªº¤Þ¼Æ¥þ¬O¤j¼g, address@hidden"
@@ -2005,6 +2038,7 @@
msgstr ""
#: makeinfo/cmds.c:1277
+#, c-format
msgid "end of file inside verb block"
msgstr ""
@@ -2013,7 +2047,9 @@
msgid "`}' expected, but saw `%c'"
msgstr ""
-#: makeinfo/cmds.c:1316 tp/Texinfo/Convert/Plaintext.pm:1379
+#: makeinfo/cmds.c:1316 texi2html/formats/info.pm:1188
+#: tp/Texinfo/Convert/Plaintext.pm:1278
+#, c-format
msgid ""
"@strong{Note...} produces a spurious cross-reference in Info; reword to "
"avoid that"
@@ -2024,7 +2060,7 @@
msgid "%c%s is obsolete"
msgstr "%c%s ¤w¼o¤î¤£¥Î"
-#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6375
+#: makeinfo/cmds.c:1620 texi2html/texi2html.pl:6369
#, c-format, perl-format
msgid "@sp requires a positive numeric argument, not `%s'"
msgstr "@sp address@hidden, ¦Ó¤£¬O `%s'"
@@ -2034,17 +2070,17 @@
msgid "Bad argument to %c%s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4317
+#: makeinfo/cmds.c:2041 makeinfo/makeinfo.c:4231
msgid "asis"
msgstr ""
-#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4319
+#: makeinfo/cmds.c:2043 makeinfo/cmds.c:2073 makeinfo/makeinfo.c:4233
msgid "none"
msgstr ""
-#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6009
-#: texi2html/texi2html.pl:6020 tp/Texinfo/Parser.pm:2216
-#: tp/Texinfo/Parser.pm:4181 tp/Texinfo/Parser.pm:4192
+#: makeinfo/cmds.c:2057 texi2html/texi2html.pl:6003
+#: texi2html/texi2html.pl:6014 tp/Texinfo/Parser.pm:2216
+#: tp/Texinfo/Parser.pm:4185 tp/Texinfo/Parser.pm:4196
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
@@ -2053,32 +2089,33 @@
msgid "insert"
msgstr ""
-#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5948
-#: texi2html/texi2html.pl:6166 texi2html/texi2html.pl:6194
-#: texi2html/texi2html.pl:6259 texi2html/texi2html.pl:6423
-#: texi2html/texi2html.pl:13221 texi2html/texi2html.pl:14619
-#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4232
-#: tp/Texinfo/Parser.pm:4265 tp/Texinfo/Parser.pm:4291
-#: tp/Texinfo/Parser.pm:4324 tp/Texinfo/Parser.pm:4384
+#: makeinfo/cmds.c:2087 texi2html/texi2html.pl:5942
+#: texi2html/texi2html.pl:6160 texi2html/texi2html.pl:6188
+#: texi2html/texi2html.pl:6253 texi2html/texi2html.pl:6417
+#: texi2html/texi2html.pl:13215 texi2html/texi2html.pl:14613
+#: tp/Texinfo/Parser.pm:2332 tp/Texinfo/Parser.pm:4236
+#: tp/Texinfo/Parser.pm:4269 tp/Texinfo/Parser.pm:4295
+#: tp/Texinfo/Parser.pm:4328 tp/Texinfo/Parser.pm:4388
#, fuzzy, c-format, perl-format
msgid "Bad argument to @%s: %s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5895 tp/Texinfo/Parser.pm:4358
+#: makeinfo/cmds.c:2170 texi2html/texi2html.pl:5889 tp/Texinfo/Parser.pm:4362
#, c-format, perl-format
msgid "Expected @%s on or off, not `%s'"
msgstr ""
-#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6217 tp/Texinfo/Parser.pm:4305
+#: makeinfo/cmds.c:2190 texi2html/texi2html.pl:6211 tp/Texinfo/Parser.pm:4309
#, c-format, perl-format
msgid "Only @%s 10 or 11 is supported, not `%s'"
msgstr ""
#: makeinfo/defun.c:83
+#, c-format
msgid "Missing `}' in @def arg"
msgstr "@def °Ñ¼Æ¤¤¿òº| `}'"
-#: makeinfo/defun.c:711 texi2html/texi2html.pl:11168
+#: makeinfo/defun.c:711 texi2html/texi2html.pl:11162
#, c-format, perl-format
msgid "Must be in address@hidden' environment to use address@hidden'"
msgstr ""
@@ -2099,10 +2136,11 @@
msgstr ""
#: makeinfo/files.c:693
+#, c-format
msgid "Output buffer not empty."
msgstr ""
-#: makeinfo/float.c:181 texi2html/texi2html.pl:14577
+#: makeinfo/float.c:181 texi2html/texi2html.pl:14571
#, c-format, perl-format
msgid "Requested float type `%s' not previously used"
msgstr ""
@@ -2122,12 +2160,13 @@
msgid "No closing brace for footnote `%s'"
msgstr "µù¸} `%s' ¨S¦³¥k¤j¬A¸¹"
-#: makeinfo/footnote.c:197 texi2html/formats/info.init:3199
+#: makeinfo/footnote.c:197 texi2html/formats/info.pm:3199
+#, c-format
msgid "Footnote defined without parent node"
msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
#: makeinfo/footnote.c:209
-#, fuzzy
+#, fuzzy, c-format
msgid "Footnotes inside footnotes are not allowed"
msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
@@ -2140,21 +2179,22 @@
msgid "%s: could not open --css-file: %s"
msgstr ""
-#: makeinfo/html.c:180 texi2html/texi2html.pl:16859
+#: makeinfo/html.c:180 texi2html/texi2html.pl:16853
#, c-format, perl-format
msgid "%s:%d: --css-file ended in comment"
msgstr ""
#: makeinfo/html.c:426
+#, c-format
msgid "[unexpected] no html tag to pop"
msgstr ""
-#: makeinfo/html.c:800
+#: makeinfo/html.c:786
#, fuzzy, c-format
msgid "[unexpected] invalid node name: `%s'"
msgstr "%s: ¥¼ª¾ªº¿ï¶µ `%c%s'\n"
-#: makeinfo/index.c:167 texi2html/texi2html.pl:8458
+#: makeinfo/index.c:167 texi2html/texi2html.pl:8452
#, c-format, perl-format
msgid "Unknown index `%s'"
msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
@@ -2183,14 +2223,14 @@
msgid "(line %*d)"
msgstr ""
-#: makeinfo/index.c:765 texi2html/texi2html.pl:13626 tp/Texinfo/Parser.pm:4272
+#: makeinfo/index.c:765 texi2html/texi2html.pl:13620 tp/Texinfo/Parser.pm:4276
#, c-format, perl-format
msgid "Unknown index `%s' in @printindex"
msgstr "@printindex ¤¤¦³¥¼ª¾ªº¯Á¤Þ `%s'"
-#: makeinfo/index.c:834 texi2html/texi2html.pl:8463
-#: texi2html/formats/info.init:3075 tp/Texinfo/Parser.pm:1869
-#: tp/Texinfo/Convert/Info.pm:456
+#: makeinfo/index.c:834 texi2html/texi2html.pl:8457
+#: texi2html/formats/info.pm:3075 tp/Texinfo/Parser.pm:1869
+#: tp/Texinfo/Convert/Info.pm:410
#, c-format, perl-format
msgid "Entry for index `%s' outside of any node"
msgstr "¯Á¤Þ `%s' ªº¶µ¥Ø¤£¦b¥ô¦óªº¸`ÂI¤º"
@@ -2200,6 +2240,7 @@
msgstr "(¤£¦b¥ô¦óªº¸`ÂI¤º)"
#: makeinfo/insertion.c:162
+#, c-format
msgid "@item not allowed in argument to @itemize"
msgstr ""
@@ -2208,6 +2249,7 @@
msgstr ""
#: makeinfo/insertion.c:339
+#, c-format
msgid "Enumeration stack overflow"
msgstr ""
@@ -2216,7 +2258,7 @@
msgid "lettering overflow, restarting at %c"
msgstr ""
-#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11308
+#: makeinfo/insertion.c:640 texi2html/texi2html.pl:11302
#: tp/Texinfo/Parser.pm:2225
#, c-format, perl-format
msgid "%s requires an argument: the formatter for %citem"
@@ -2227,14 +2269,14 @@
msgid "%cfloat environments cannot be nested"
msgstr ""
-#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10846
-#: texi2html/texi2html.pl:10873 texi2html/texi2html.pl:14482
+#: makeinfo/insertion.c:1006 texi2html/texi2html.pl:10840
+#: texi2html/texi2html.pl:10867 texi2html/texi2html.pl:14476
#: tp/Texinfo/Parser.pm:1214
#, c-format, perl-format
msgid "address@hidden' expected `%s', but saw `%s'"
msgstr ""
-#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:16002
+#: makeinfo/insertion.c:1382 texi2html/texi2html.pl:15996
#: tp/Texinfo/Parser.pm:1217
#, c-format, perl-format
msgid "No matching `%cend %s'"
@@ -2246,30 +2288,34 @@
msgstr "%s ¥²¶·n¦³¦r¤¸©Î¬O¼Æ¦r"
#: makeinfo/insertion.c:1751
+#, c-format
msgid "end of file inside verbatim block"
msgstr ""
-#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11892
+#: makeinfo/insertion.c:1975 texi2html/texi2html.pl:11886
#, fuzzy, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s ¦b address@hidden' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
#: makeinfo/insertion.c:2011
+#, c-format
msgid "@menu seen before first @node, creating `Top' node"
msgstr "@menu address@hidden @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
-#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13724
-#: tp/Texinfo/Parser.pm:3691
+#: makeinfo/insertion.c:2012 texi2html/texi2html.pl:13718
+#: tp/Texinfo/Parser.pm:3695
+#, c-format
msgid ""
"perhaps your @top node should be wrapped in @ifnottex rather than @ifinfo?"
msgstr "¤]³\±zÀ³¸Ó§â @top ¸`ÂI¥]§t¦b @ifnottex, ¦Ó¤£¬O @ifinfo?"
#: makeinfo/insertion.c:2024
+#, c-format
msgid "@detailmenu seen before first node, creating `Top' node"
msgstr "address@hidden @detailmenu, ±N«Ø¥ß `Top' ¸`ÂI"
-#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6307
-#: tp/Texinfo/Parser.pm:3529
+#: makeinfo/insertion.c:2099 texi2html/texi2html.pl:6301
+#: tp/Texinfo/Parser.pm:3533
#, c-format, perl-format
msgid "@%s not meaningful outside address@hidden' and address@hidden'
environments"
msgstr ""
@@ -2279,9 +2325,9 @@
msgid "@%s not meaningful outside address@hidden' environment"
msgstr "@%s ¦b address@hidden' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
-#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12846
-#: texi2html/texi2html.pl:13378 texi2html/texi2html.pl:14409
-#: texi2html/texi2html.pl:14429 texi2html/texi2html.pl:14471
+#: makeinfo/insertion.c:2144 texi2html/texi2html.pl:12840
+#: texi2html/texi2html.pl:13372 texi2html/texi2html.pl:14403
+#: texi2html/texi2html.pl:14423 texi2html/texi2html.pl:14465
#: tp/Texinfo/Parser.pm:1296 tp/Texinfo/Parser.pm:2320
#, c-format, perl-format
msgid "Unmatched `%c%s'"
@@ -2292,14 +2338,14 @@
msgid "`%c%s' needs something after it"
msgstr "¦b `%c%s' ¤§«á¥²¶·n¦³ªF¦è"
-#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13963
+#: makeinfo/insertion.c:2155 texi2html/texi2html.pl:13957
#, fuzzy, c-format, perl-format
msgid "Bad argument `%s' to address@hidden', using `%s'"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14910
-#: texi2html/texi2html.pl:14923 tp/Texinfo/Parser.pm:3386
-#: tp/Texinfo/Parser.pm:3397 tp/Texinfo/Parser.pm:3441
+#: makeinfo/insertion.c:2252 texi2html/texi2html.pl:14904
+#: texi2html/texi2html.pl:14917 tp/Texinfo/Parser.pm:3390
+#: tp/Texinfo/Parser.pm:3401 tp/Texinfo/Parser.pm:3445
#, c-format, perl-format
msgid "@%s not meaningful inside address@hidden' block"
msgstr "@%s ¦b address@hidden' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
@@ -2344,17 +2390,17 @@
msgid "%c%s expects `i' or `j' as argument, not `%c'"
msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' address@hidden, ¦Ó¤£¬O `%c'"
-#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15647
+#: makeinfo/lang.c:1804 texi2html/texi2html.pl:15641
#, c-format, perl-format
msgid "%c%s expects a single character `i' or `j' as argument"
msgstr "%c%s address@hidden `i' ©Î `j' address@hidden"
-#: makeinfo/macro.c:128 texi2html/texi2html.pl:12934 tp/Texinfo/Parser.pm:2812
+#: makeinfo/macro.c:128 texi2html/texi2html.pl:12928 tp/Texinfo/Parser.pm:2812
#, c-format, perl-format
msgid "macro `%s' previously defined"
msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
-#: makeinfo/macro.c:132 texi2html/texi2html.pl:12935 tp/Texinfo/Parser.pm:2814
+#: makeinfo/macro.c:132 texi2html/texi2html.pl:12929 tp/Texinfo/Parser.pm:2814
#, c-format, perl-format
msgid "here is the previous definition of `%s'"
msgstr "³o¸Ì¬O `%s' ¤§«eªº©w¸q"
@@ -2369,59 +2415,61 @@
msgid "Macro `%s' called on line %d with too many args"
msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
-#: makeinfo/macro.c:580 texi2html/texi2html.pl:15833
+#: makeinfo/macro.c:580 texi2html/texi2html.pl:15827
#, c-format, perl-format
msgid "%cend macro not found"
msgstr ""
#: makeinfo/macro.c:591
+#, c-format
msgid "@allow-recursion is deprecated; please use @rmacro instead"
msgstr ""
#: makeinfo/macro.c:606
+#, c-format
msgid "@quote-arg is deprecated; arguments are quoted by default"
msgstr ""
-#: makeinfo/macro.c:649 texi2html/texi2html.pl:11035
+#: makeinfo/macro.c:649 texi2html/texi2html.pl:11029
#, c-format, perl-format
msgid "mismatched @end %s with @%s"
msgstr "@end %s »P @%s ¤£²Å¦X"
-#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9649
+#: makeinfo/makeinfo.c:188 texi2html/texi2html.pl:9643
#, c-format
msgid "Too many errors! Gave up.\n"
msgstr "¿ù»~¹L¦h! ©ñ±ó.\n"
-#: makeinfo/makeinfo.c:306
+#: makeinfo/makeinfo.c:260
#, c-format
msgid "%s:%d: warning: "
msgstr "%s:%d: ĵ§i: "
-#: makeinfo/makeinfo.c:325 makeinfo/makeinfo.c:2340
-#: texi2html/texi2html.pl:15074 texi2html/texi2html.pl:15094
-#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3847
-#: tp/Texinfo/Parser.pm:3971
+#: makeinfo/makeinfo.c:275 makeinfo/makeinfo.c:2290
+#: texi2html/texi2html.pl:15068 texi2html/texi2html.pl:15088
+#: tp/Texinfo/Parser.pm:1235 tp/Texinfo/Parser.pm:3851
+#: tp/Texinfo/Parser.pm:3975
#, c-format, perl-format
msgid "Misplaced %c"
msgstr "»~¸mªº %c"
-#: makeinfo/makeinfo.c:344 texi2html/texi2html.pl:2392 tp/texi2any.pl:594
+#: makeinfo/makeinfo.c:294 texi2html/texi2html.pl:2392 tp/texi2any.pl:551
#, c-format, perl-format
msgid "Try `%s --help' for more information.\n"
msgstr "¸Õ¸Õ `%s --help' ¥H¨ú±o§ó¦hªº¸ê°T.\n"
-#: makeinfo/makeinfo.c:347 texi2html/texi2html.pl:3828
+#: makeinfo/makeinfo.c:297 texi2html/texi2html.pl:3828
#, fuzzy, c-format, perl-format
msgid "Usage: %s [OPTION]... TEXINFO-FILE...\n"
msgstr "¥Îªk: %s [OPTION]... FILE...\n"
-#: makeinfo/makeinfo.c:350 texi2html/texi2html.pl:3830
+#: makeinfo/makeinfo.c:300 texi2html/texi2html.pl:3830
msgid ""
"Translate Texinfo source documentation to various other formats, by default\n"
"Info files suitable for reading online with Emacs or standalone GNU Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:354
+#: makeinfo/makeinfo.c:304
#, c-format
msgid ""
"General options:\n"
@@ -2436,7 +2484,7 @@
" --version display version information and exit.\n"
msgstr ""
-#: makeinfo/makeinfo.c:369 texi2html/texi2html.pl:3847
+#: makeinfo/makeinfo.c:319 texi2html/texi2html.pl:3847
#, no-wrap
msgid ""
"Output format selection (default is to produce Info):\n"
@@ -2446,7 +2494,7 @@
" --plaintext output plain text rather than Info.\n"
msgstr ""
-#: makeinfo/makeinfo.c:377
+#: makeinfo/makeinfo.c:327
msgid ""
"General output options:\n"
" -E, --macro-expand=FILE output macro-expanded source to FILE,\n"
@@ -2465,7 +2513,7 @@
" -o, --output=FILE output to FILE (or directory if split HTML).\n"
msgstr ""
-#: makeinfo/makeinfo.c:391 texi2html/texi2html.pl:3870
+#: makeinfo/makeinfo.c:341 texi2html/texi2html.pl:3870
#, c-format, perl-format
msgid ""
"Options for Info and plain text:\n"
@@ -2487,7 +2535,7 @@
" --split-size=NUM split Info files at size NUM (default %d).\n"
msgstr ""
-#: makeinfo/makeinfo.c:409
+#: makeinfo/makeinfo.c:359
msgid ""
"Options for HTML:\n"
" --css-include=FILE include FILE in HTML <style> output;\n"
@@ -2498,7 +2546,7 @@
" produce file names in ASCII transliteration.\n"
msgstr ""
-#: makeinfo/makeinfo.c:419
+#: makeinfo/makeinfo.c:369
#, c-format
msgid ""
"Options for XML and Docbook:\n"
@@ -2508,7 +2556,7 @@
"dropped.\n"
msgstr ""
-#: makeinfo/makeinfo.c:426
+#: makeinfo/makeinfo.c:376
msgid ""
"Input file options:\n"
" --commands-in-node-names allow @ commands in node names.\n"
@@ -2518,7 +2566,7 @@
" -U VAR undefine the variable VAR, as with @clear.\n"
msgstr ""
-#: makeinfo/makeinfo.c:435 texi2html/texi2html.pl:3912
+#: makeinfo/makeinfo.c:385 texi2html/texi2html.pl:3912
msgid ""
"Conditional processing in input:\n"
" --ifdocbook process @ifdocbook and @docbook even if\n"
@@ -2538,7 +2586,7 @@
" Also, for the --no-ifFORMAT options, do process @ifnotFORMAT text.\n"
msgstr ""
-#: makeinfo/makeinfo.c:454 texi2html/texi2html.pl:3929
+#: makeinfo/makeinfo.c:404 texi2html/texi2html.pl:3929
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"
@@ -2547,7 +2595,7 @@
" if generating XML, --ifxml is on and the others are off.\n"
msgstr ""
-#: makeinfo/makeinfo.c:462 texi2html/texi2html.pl:3935
+#: makeinfo/makeinfo.c:412 texi2html/texi2html.pl:3935
#, fuzzy
msgid ""
"Examples:\n"
@@ -2578,190 +2626,193 @@
"µ{¦¡¯äÂÎ, ½Ð¥H¹q¤l¶l¥ó (^¤å) ¦^³ø¦Ü address@hidden,\n"
"address@hidden, ½Ð¥H¹q¤l¶l¥ó (^¤å) ±H¨ì address@hidden"
-#: makeinfo/makeinfo.c:622 texi2html/texi2html.pl:4056
+#: makeinfo/makeinfo.c:572 texi2html/texi2html.pl:4056
#, c-format, perl-format
msgid "%s: Ignoring unrecognized TEXINFO_OUTPUT_FORMAT value `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:670 makeinfo/makeinfo.c:696 makeinfo/makeinfo.c:720
-#: makeinfo/makeinfo.c:780
+#: makeinfo/makeinfo.c:620 makeinfo/makeinfo.c:646 makeinfo/makeinfo.c:670
+#: makeinfo/makeinfo.c:730
#, c-format
msgid "%s: %s arg must be numeric, not `%s'.\n"
msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼ÆÈ, ¦Ó¤£¬O `%s'.\n"
-#: makeinfo/makeinfo.c:683
+#: makeinfo/makeinfo.c:633
#, fuzzy, c-format
msgid "%s: could not open macro expansion output `%s'"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: makeinfo/makeinfo.c:688
+#: makeinfo/makeinfo.c:638
#, c-format
msgid "%s: ignoring second macro expansion output `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:733
+#: makeinfo/makeinfo.c:683
#, fuzzy, c-format
msgid "%s: could not open internal links output `%s'"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: makeinfo/makeinfo.c:738
+#: makeinfo/makeinfo.c:688
#, c-format
msgid "%s: ignoring second internal links output `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:751 texi2html/texi2html.pl:2625 tp/texi2any.pl:517
+#: makeinfo/makeinfo.c:701 texi2html/texi2html.pl:2625 tp/texi2any.pl:469
#, c-format, perl-format
msgid "%s: --paragraph-indent arg must be numeric/`none'/`asis', not `%s'.\n"
msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼ÆÈ/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
-#: makeinfo/makeinfo.c:769 texi2html/texi2html.pl:2569 tp/texi2any.pl:440
+#: makeinfo/makeinfo.c:719 texi2html/texi2html.pl:2569 tp/texi2any.pl:392
#, c-format, perl-format
msgid "%s: --footnote-style arg must be `separate' or `end', not `%s'.\n"
msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
-#: makeinfo/makeinfo.c:844 texi2html/texi2html.pl:17005 tp/texi2any.pl:599
+#: makeinfo/makeinfo.c:794 texi2html/texi2html.pl:16999 tp/texi2any.pl:556
#, c-format, perl-format
msgid "%s: missing file argument.\n"
msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
-#: makeinfo/makeinfo.c:1041 makeinfo/makeinfo.c:4166
+#: makeinfo/makeinfo.c:991 makeinfo/makeinfo.c:4080
#, c-format
msgid "Multiline command %c%s used improperly"
msgstr ""
-#: makeinfo/makeinfo.c:1044
+#: makeinfo/makeinfo.c:994
#, c-format
msgid "Expected `%s'"
msgstr "Expected `%s'"
-#: makeinfo/makeinfo.c:1521 texi2html/texi2html.pl:4761
+#: makeinfo/makeinfo.c:1471 texi2html/texi2html.pl:4755
#, c-format, perl-format
msgid "Can't create directory `%s': %s"
msgstr ""
-#: makeinfo/makeinfo.c:1567
+#: makeinfo/makeinfo.c:1517
#, c-format
msgid "No `%s' found in `%s'"
msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
-#: makeinfo/makeinfo.c:1647
+#: makeinfo/makeinfo.c:1597
#, c-format
msgid "%s: Skipping macro expansion to stdout as Info output is going there.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1677
+#: makeinfo/makeinfo.c:1627
#, c-format
msgid "Making %s file `%s' from `%s'.\n"
msgstr ""
-#: makeinfo/makeinfo.c:1744
+#: makeinfo/makeinfo.c:1694
#, c-format
msgid ""
"%s: Removing macro output file `%s' due to errors; use --force to preserve.\n"
msgstr "%s: ¦]¬°¿ù»~, ²¾°£¥¨¶°¿é¥XÀÉ `%s'; Yn«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
-#: makeinfo/makeinfo.c:1799 texi2html/texi2html.pl:9598
+#: makeinfo/makeinfo.c:1749 texi2html/texi2html.pl:9592
#, c-format, perl-format
msgid "%s: Removing output file `%s' due to errors; use --force to preserve.\n"
msgstr "%s: ¦]¬°¿ù»~, ²¾°£¿é¥XÀÉ `%s'; Yn«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
-#: makeinfo/makeinfo.c:1818
+#: makeinfo/makeinfo.c:1768
#, fuzzy, c-format
msgid ""
"%s: Removing internal links output file `%s' due to errors; use --force to "
"preserve.\n"
msgstr "%s: ¦]¬°¿ù»~, ²¾°£¿é¥XÀÉ `%s'; Yn«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
-#: makeinfo/makeinfo.c:2113 texi2html/texi2html.pl:15747
-#: tp/Texinfo/Parser.pm:3758
+#: makeinfo/makeinfo.c:2063 texi2html/texi2html.pl:15741
+#: tp/Texinfo/Parser.pm:3762
#, c-format, perl-format
msgid "Unknown command `%s'"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: makeinfo/makeinfo.c:2135 texi2html/texi2html.pl:14750
+#: makeinfo/makeinfo.c:2085 texi2html/texi2html.pl:14744
#: tp/Texinfo/Parser.pm:3023
#, c-format, perl-format
msgid "Use braces to give a command as an argument to @%s"
msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, address@hidden @%s ªº¤Þ¼Æ"
-#: makeinfo/makeinfo.c:2394 texi2html/texi2html.pl:15739
+#: makeinfo/makeinfo.c:2344 texi2html/texi2html.pl:15733
#, fuzzy, c-format, perl-format
msgid "%c%s expected braces"
msgstr "%c%s ¹wpn¦³ `{...}'"
-#: makeinfo/makeinfo.c:2407
+#: makeinfo/makeinfo.c:2357
+#, c-format
msgid "Unmatched }"
msgstr "¥¼°t¹ïªº }"
-#: makeinfo/makeinfo.c:2455
+#: makeinfo/makeinfo.c:2405
msgid "NO_NAME!"
msgstr "NO_NAME!"
-#: makeinfo/makeinfo.c:2476 texi2html/texi2html.pl:16038
-#: texi2html/texi2html.pl:16066 tp/Texinfo/Parser.pm:1040
+#: makeinfo/makeinfo.c:2426 texi2html/texi2html.pl:16032
+#: texi2html/texi2html.pl:16060 tp/Texinfo/Parser.pm:1040
#, c-format, perl-format
msgid "%c%s missing close brace"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
-#: makeinfo/makeinfo.c:3482
+#: makeinfo/makeinfo.c:3408
#, fuzzy, c-format
msgid "@image file `%s' (for HTML) not readable: %s"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: makeinfo/makeinfo.c:3488
+#: makeinfo/makeinfo.c:3414
#, fuzzy, c-format
msgid "No such file `%s'"
msgstr "`%s' ¥¼¥X²{¦b `%s' ¤º"
-#: makeinfo/makeinfo.c:3624
+#: makeinfo/makeinfo.c:3550
#, fuzzy, c-format
msgid "@image file `%s' (for text) unreadable: %s"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: makeinfo/makeinfo.c:3633 tp/Texinfo/Parser.pm:3927
+#: makeinfo/makeinfo.c:3559 tp/Texinfo/Parser.pm:3931
+#, c-format
msgid "@image missing filename argument"
msgstr "@image ¨S¦³ÀɦW¤Þ¼Æ"
-#: makeinfo/makeinfo.c:3851 texi2html/texi2html.pl:13009
+#: makeinfo/makeinfo.c:3777 texi2html/texi2html.pl:13003
#: tp/Texinfo/Parser.pm:3195
#, c-format, perl-format
msgid "undefined flag: %s"
msgstr ""
-#: makeinfo/makeinfo.c:3852
+#: makeinfo/makeinfo.c:3778
#, c-format
msgid "{No value for `%s'}"
msgstr ""
-#: makeinfo/makeinfo.c:3904 texi2html/texi2html.pl:5808
-#: texi2html/texi2html.pl:5819 texi2html/texi2html.pl:10385
-#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3572
-#: tp/Texinfo/Parser.pm:4064 tp/Texinfo/Parser.pm:4073
-#: tp/Texinfo/Parser.pm:4083
+#: makeinfo/makeinfo.c:3830 texi2html/texi2html.pl:5802
+#: texi2html/texi2html.pl:5813 texi2html/texi2html.pl:10379
+#: tp/Texinfo/Parser.pm:967 tp/Texinfo/Parser.pm:3576
+#: tp/Texinfo/Parser.pm:4068 tp/Texinfo/Parser.pm:4077
+#: tp/Texinfo/Parser.pm:4087
#, c-format, perl-format
msgid "%c%s requires a name"
msgstr "%c%s ¥²¶·n¦³¦WºÙ"
-#: makeinfo/makeinfo.c:4010 texi2html/texi2html.pl:15825
+#: makeinfo/makeinfo.c:3936 texi2html/texi2html.pl:15819
#, c-format, perl-format
msgid "Reached eof before matching @end %s"
msgstr "¦b°t¹ïªº @end %s ¤§«e, ¥ý¨ì¹FÀÉ®×µ²§À"
-#: makeinfo/makeinfo.c:4258
+#: makeinfo/makeinfo.c:4172
#, c-format
msgid "`%.40s...' is too long for expansion; not expanded"
msgstr ""
#: makeinfo/multi.c:116
+#, c-format
msgid "Missing } in @multitable template"
msgstr "¦b @multitable ¼Ëª©¤¤, ¨S¦³ }"
-#: makeinfo/multi.c:260 texi2html/texi2html.pl:10759
+#: makeinfo/multi.c:260 texi2html/texi2html.pl:10753
#, c-format, perl-format
msgid "ignoring stray text `%s' after @multitable"
msgstr ""
-#: makeinfo/multi.c:400 texi2html/texi2html.pl:15003 tp/Texinfo/Parser.pm:3411
+#: makeinfo/multi.c:400 texi2html/texi2html.pl:14997 tp/Texinfo/Parser.pm:3415
#, c-format, perl-format
msgid "Too many columns in multitable item (max %d)"
msgstr "multitable ¶µ¥Ø¤¤¦³¤Ó¦hªºÄæ¦ì (³Ì¤jȬ° %d)"
@@ -2771,7 +2822,8 @@
msgid "[unexpected] cannot select column #%d in multitable"
msgstr "µLªk¿ï¨ú multitable ¤¤ªºÄæ¦ì #%d"
-#: makeinfo/multi.c:592 texi2html/texi2html.pl:14992 tp/Texinfo/Parser.pm:3444
+#: makeinfo/multi.c:592 texi2html/texi2html.pl:14986 tp/Texinfo/Parser.pm:3448
+#, c-format
msgid "ignoring @tab outside of multitable"
msgstr "©¿²¤ multitable ¥~ªº @tab"
@@ -2811,10 +2863,12 @@
msgstr ""
#: makeinfo/node.c:922
+#, c-format
msgid "This @anchor command ignored; references to it will not work"
msgstr ""
#: makeinfo/node.c:924 makeinfo/node.c:1166
+#, c-format
msgid "Rename this anchor or use the `--no-split' option"
msgstr ""
@@ -2829,6 +2883,7 @@
msgstr ""
#: makeinfo/node.c:1165
+#, c-format
msgid "@anchor command ignored; references to it will not work"
msgstr ""
@@ -2862,14 +2917,14 @@
msgid "`%s' has no Up field (perhaps incorrect sectioning?)"
msgstr ""
-#: makeinfo/node.c:1605 texi2html/texi2html.pl:7356
-#: tp/Texinfo/Structuring.pm:514
+#: makeinfo/node.c:1605 texi2html/texi2html.pl:7350
+#: tp/Texinfo/Structuring.pm:516
#, c-format, perl-format
msgid "Node `%s' lacks menu item for `%s' despite being its Up target"
msgstr ""
-#: makeinfo/node.c:1637 texi2html/texi2html.pl:7302
-#: tp/Texinfo/Structuring.pm:422
+#: makeinfo/node.c:1637 texi2html/texi2html.pl:7296
+#: tp/Texinfo/Structuring.pm:424
#, c-format, perl-format
msgid "unreferenced node `%s'"
msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
@@ -2914,25 +2969,29 @@
msgid "%ctop used before %cnode, defaulting to %s"
msgstr ""
-#: makeinfo/xml.c:1669 tp/Texinfo/Convert/Plaintext.pm:1079
+#: makeinfo/xml.c:1655 texi2html/formats/docbook.pm:1021
+#: texi2html/formats/info.pm:2996 texi2html/formats/plaintext.pm:151
+#: tp/Texinfo/Convert/Plaintext.pm:974
#, c-format, perl-format
msgid "@image file `%s' unreadable: %s"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: makeinfo/xml.c:2014
+#: makeinfo/xml.c:2000
+#, c-format
msgid ""
"@headitem as the last item of @multitable produces invalid Docbook documents"
msgstr ""
-#: makeinfo/xml.c:2150
+#: makeinfo/xml.c:2136
msgid "of"
msgstr ""
-#: makeinfo/xml.c:2155
+#: makeinfo/xml.c:2141
msgid "on"
msgstr ""
#: makeinfo/xref.c:127
+#, c-format
msgid "First argument to cross-reference may not be empty"
msgstr ""
@@ -2942,6 +3001,7 @@
msgstr ""
#: makeinfo/xref.c:387
+#, c-format
msgid "End of file reached while looking for `.' or `,'"
msgstr ""
@@ -2951,11 +3011,12 @@
msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
#: makeinfo/xref.c:392
-#, fuzzy
+#, fuzzy, c-format
msgid "for cross-references in parentheses, use @pxref"
msgstr "¥»¸`ÂI¨S¦³¥æ¤¬°Ñ·Ó."
#: makeinfo/xref.c:435
+#, c-format
msgid "First argument to @inforef may not be empty"
msgstr ""
@@ -3025,13 +3086,13 @@
msgid "%s is not a valid region code"
msgstr "%s address@hidden ISO 639 »y¨¥½X"
-#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4311
+#: texi2html/texi2html.pl:2574 tp/Texinfo/Parser.pm:4315
#, fuzzy, perl-format
msgid "@%s arg must be `separate' or `end', not `%s'"
msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
-#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4332
-#: tp/Texinfo/Parser.pm:4335
+#: texi2html/texi2html.pl:2629 tp/Texinfo/Parser.pm:4336
+#: tp/Texinfo/Parser.pm:4339
#, fuzzy, perl-format
msgid "@paragraphindent arg must be numeric/`none'/`asis', not `%s'"
msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼ÆÈ/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
@@ -3124,656 +3185,646 @@
msgid "when generating %s, only one input FILE may be specified with -o"
msgstr ""
-#: texi2html/texi2html.pl:4505
+#: texi2html/texi2html.pl:4499
msgid "Missing type"
msgstr ""
-#: texi2html/texi2html.pl:4510
+#: texi2html/texi2html.pl:4504
#, fuzzy, perl-format
msgid "Unrecognized type: %s"
msgstr "%s: ¥¼ª¾ªº¿ï¶µ `--%s'\n"
-#: texi2html/texi2html.pl:4584 tp/texi2any.pl:573
+#: texi2html/texi2html.pl:4578 tp/texi2any.pl:530
#, perl-format
msgid "Ignoring splitting for format %s"
msgstr ""
-#: texi2html/texi2html.pl:4680
+#: texi2html/texi2html.pl:4674
#, fuzzy, perl-format
msgid "Cannot split output %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: texi2html/texi2html.pl:4755
+#: texi2html/texi2html.pl:4749
#, fuzzy, perl-format
msgid "Can't create directories `%s' or `%s': %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: texi2html/texi2html.pl:4780
+#: texi2html/texi2html.pl:4774
msgid "current directory not writable"
msgstr ""
-#: texi2html/texi2html.pl:4784
+#: texi2html/texi2html.pl:4778
#, fuzzy, perl-format
msgid "%s not writable"
msgstr "%s: ªÅÀÉ®×"
-#: texi2html/texi2html.pl:5132
+#: texi2html/texi2html.pl:5126
#, fuzzy
msgid " end of file"
msgstr "§ä´MÀÉ®×: "
-#: texi2html/texi2html.pl:5497 tp/Texinfo/Parser.pm:4001
+#: texi2html/texi2html.pl:5491 tp/Texinfo/Parser.pm:4005
msgid "Superfluous arguments for node"
msgstr ""
-#: texi2html/texi2html.pl:5505
+#: texi2html/texi2html.pl:5499
#, fuzzy, perl-format
msgid "Node `%s' previously defined %s"
msgstr "¸`ÂI `%s' ¤w¦b²Ä %d ¦æ©w¸q¹L¤F"
-#: texi2html/texi2html.pl:5510 texi2html/texi2html.pl:13288
-#: texi2html/texi2html.pl:13793 tp/Texinfo/Parser.pm:2633
+#: texi2html/texi2html.pl:5504 texi2html/texi2html.pl:13282
+#: texi2html/texi2html.pl:13787 tp/Texinfo/Parser.pm:2633
#, perl-format
msgid "Syntax for an external node used for `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5636
+#: texi2html/texi2html.pl:5630
#, fuzzy, perl-format
msgid "@%s requires an argument"
msgstr "%c%s ¥²¶·n¦³¦WºÙ"
-#: texi2html/texi2html.pl:5727 texi2html/texi2html.pl:15853
-#: tp/Texinfo/Parser.pm:4038
+#: texi2html/texi2html.pl:5721 texi2html/texi2html.pl:15847
+#: tp/Texinfo/Parser.pm:4042
#, fuzzy, perl-format
msgid "Expected @end %s"
msgstr "Expected `%s'"
-#: texi2html/texi2html.pl:5776
+#: texi2html/texi2html.pl:5770
#, perl-format
msgid "Translations for `%s' not found. Reverting to `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5831 tp/Texinfo/Parser.pm:4094
+#: texi2html/texi2html.pl:5825 tp/Texinfo/Parser.pm:4098
#, fuzzy, perl-format
msgid "@%s should only accept a @-command as argument, not `%s'"
msgstr "¨Ï¥Î¤j¬A¸¹±N©R¥O¥]°_¨Ó, address@hidden @%s ªº¤Þ¼Æ"
-#: texi2html/texi2html.pl:5869 tp/Texinfo/Parser.pm:4341
+#: texi2html/texi2html.pl:5863 tp/Texinfo/Parser.pm:4345
#, fuzzy, perl-format
msgid "@firstparagraphindent arg must be `none' or `insert', not `%s'"
msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼ÆÈ/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
-#: texi2html/texi2html.pl:5884 tp/Texinfo/Parser.pm:4349
+#: texi2html/texi2html.pl:5878 tp/Texinfo/Parser.pm:4353
#, fuzzy, perl-format
msgid "@exampleindent arg must be numeric/`asis', not `%s'"
msgstr "%s: --paragraph-indent ªº¤Þ¼Æ¥²¶·¬° ¼ÆÈ/`none'/`asis', ¦Ó¤£¬O `%s'.\n"
-#: texi2html/texi2html.pl:5906 tp/Texinfo/Parser.pm:4365
+#: texi2html/texi2html.pl:5900 tp/Texinfo/Parser.pm:4369
#, perl-format
msgid "@kbdinputstyle arg must be `code'/`example'/`distinct', not `%s'"
msgstr ""
-#: texi2html/texi2html.pl:5930 tp/Texinfo/Parser.pm:4371
+#: texi2html/texi2html.pl:5924 tp/Texinfo/Parser.pm:4375
#, fuzzy, perl-format
msgid "@allowcodebreaks arg must be `true' or `false', not `%s'"
msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
-#: texi2html/texi2html.pl:5979
+#: texi2html/texi2html.pl:5973
#, perl-format
msgid "Encoding %s is not a canonical texinfo encoding"
msgstr ""
-#: texi2html/texi2html.pl:5998
+#: texi2html/texi2html.pl:5992
#, perl-format
msgid "@%s arg must be an encoding"
msgstr ""
-#: texi2html/texi2html.pl:6139 tp/Texinfo/Parser.pm:4239
+#: texi2html/texi2html.pl:6133 tp/Texinfo/Parser.pm:4243
#, fuzzy, perl-format
msgid "Unknown from index `%s' in @%s"
msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
-#: texi2html/texi2html.pl:6141 tp/Texinfo/Parser.pm:4241
+#: texi2html/texi2html.pl:6135 tp/Texinfo/Parser.pm:4245
#, fuzzy, perl-format
msgid "Unknown to index name `%s' in @%s"
msgstr "¥¼ª¾ªº¯Á¤Þ `%s'"
-#: texi2html/texi2html.pl:6176 tp/Texinfo/Parser.pm:4222
+#: texi2html/texi2html.pl:6170 tp/Texinfo/Parser.pm:4226
#, perl-format
msgid "Reserved index name %s"
msgstr ""
-#: texi2html/texi2html.pl:6206 tp/Texinfo/Parser.pm:4299
+#: texi2html/texi2html.pl:6200 tp/Texinfo/Parser.pm:4303
#, fuzzy, perl-format
msgid "@%s arg must be `top' or `bottom', not `%s'"
msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼ÆÈ, ¦Ó¤£¬O `%s'.\n"
-#: texi2html/texi2html.pl:6247 tp/Texinfo/Parser.pm:4317
+#: texi2html/texi2html.pl:6241 tp/Texinfo/Parser.pm:4321
#, fuzzy, perl-format
msgid "@%s arg must be `on', `off' or `odd', not `%s'"
msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼ÆÈ, ¦Ó¤£¬O `%s'.\n"
-#: texi2html/texi2html.pl:6395 texi2html/texi2html.pl:16979
-#: tp/Texinfo/Parser.pm:4404
+#: texi2html/texi2html.pl:6389 texi2html/texi2html.pl:16973
+#: tp/Texinfo/Parser.pm:4409
#, fuzzy, perl-format
msgid "Cannot read %s: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: texi2html/texi2html.pl:6418 texi2html/texi2html.pl:13216
-#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4417
+#: texi2html/texi2html.pl:6412 texi2html/texi2html.pl:13210
+#: tp/Texinfo/Parser.pm:2354 tp/Texinfo/Parser.pm:4422
#, fuzzy, perl-format
msgid "@%s: Cannot find %s"
msgstr "µLªk§ä¨ì `%s'."
-#: texi2html/texi2html.pl:6598 tp/Texinfo/Parser.pm:2616
+#: texi2html/texi2html.pl:6592 tp/Texinfo/Parser.pm:2616
#, perl-format
msgid "Empty node name after expansion `%s'"
msgstr ""
-#: texi2html/texi2html.pl:7231 tp/Texinfo/Structuring.pm:492
+#: texi2html/texi2html.pl:7225 tp/Texinfo/Structuring.pm:494
#, fuzzy, perl-format
msgid "%s reference to nonexistent `%s'"
msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
-#: texi2html/texi2html.pl:7374 tp/Texinfo/Structuring.pm:522
+#: texi2html/texi2html.pl:7368 tp/Texinfo/Structuring.pm:524
#, perl-format
msgid "For `%s', up in menu `%s' and up `%s' don't match"
msgstr ""
-#: texi2html/texi2html.pl:7427 tp/Texinfo/Structuring.pm:449
+#: texi2html/texi2html.pl:7421 tp/Texinfo/Structuring.pm:451
#, perl-format
msgid "No node following `%s' in menu, but `%s' follows in sectioning"
msgstr ""
-#: texi2html/texi2html.pl:7428 tp/Texinfo/Structuring.pm:455
+#: texi2html/texi2html.pl:7422 tp/Texinfo/Structuring.pm:457
#, perl-format
msgid "Node following `%s' in menu `%s' and in sectioning `%s' differ"
msgstr ""
-#: texi2html/texi2html.pl:8924
+#: texi2html/texi2html.pl:8918
#, perl-format
msgid "@%s after the first element"
msgstr ""
-#: texi2html/texi2html.pl:9390
+#: texi2html/texi2html.pl:9384
#, fuzzy, perl-format
msgid "File empty for renamed node `%s'"
msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
-#: texi2html/texi2html.pl:9394
+#: texi2html/texi2html.pl:9388
#, perl-format
msgid "Node to be renamed as, `%s' not found"
msgstr ""
-#: texi2html/texi2html.pl:9398
+#: texi2html/texi2html.pl:9392
#, fuzzy, perl-format
msgid "Node `%s' that is to be renamed exists "
msgstr "¯Á¤Þ `%s' ¤w¦s¦b"
-#: texi2html/texi2html.pl:9602
+#: texi2html/texi2html.pl:9596
#, fuzzy, perl-format
msgid "%s: Removing output files due to errors; use --force to preserve.\n"
msgstr "%s: ¦]¬°¿ù»~, ²¾°£¿é¥XÀÉ `%s'; Yn«O¦s¥¦, ½Ð¨Ï¥Î --force ¿ï¶µ.\n"
-#: texi2html/texi2html.pl:9741
+#: texi2html/texi2html.pl:9735
#, fuzzy, perl-format
msgid "%s:%d: warning: %s (possibly involving @%s)\n"
msgstr "%s:%d: ĵ§i: "
-#: texi2html/texi2html.pl:9745
+#: texi2html/texi2html.pl:9739
#, fuzzy, perl-format
msgid "%s:%d: warning: %s\n"
msgstr "%s:%d: ĵ§i: "
-#: texi2html/texi2html.pl:9778
+#: texi2html/texi2html.pl:9772
#, perl-format
msgid "(in %s l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9782
+#: texi2html/texi2html.pl:9776
#, perl-format
msgid "(l. %d possibly involving @%s)"
msgstr ""
-#: texi2html/texi2html.pl:9787
+#: texi2html/texi2html.pl:9781
#, perl-format
msgid "(in %s l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9791
+#: texi2html/texi2html.pl:9785
#, perl-format
msgid "(l. %d)"
msgstr ""
-#: texi2html/texi2html.pl:9948
+#: texi2html/texi2html.pl:9942
#, perl-format
msgid "Too much '}' in @%s"
msgstr ""
-#: texi2html/texi2html.pl:9958
+#: texi2html/texi2html.pl:9952
#, fuzzy, perl-format
msgid "Missing `}' on @%s line"
msgstr "@def °Ñ¼Æ¤¤¿òº| `}'"
-#: texi2html/texi2html.pl:10108
+#: texi2html/texi2html.pl:10102
#, perl-format
msgid "Anchor `%s' ignored in %s expanded more than once"
msgstr ""
-#: texi2html/texi2html.pl:10459 tp/Texinfo/Parser.pm:3671
+#: texi2html/texi2html.pl:10453 tp/Texinfo/Parser.pm:3675
#, fuzzy, perl-format
msgid "Region %s inside region %s is not allowed"
msgstr "©w¸qµù¸}, ¦ý¬O¨S¦³¤÷¸`ÂI"
-#: texi2html/texi2html.pl:10738 tp/Texinfo/Parser.pm:4205
+#: texi2html/texi2html.pl:10732 tp/Texinfo/Parser.pm:4209
#, perl-format
msgid "column fraction not a number: %s"
msgstr ""
-#: texi2html/texi2html.pl:10781
+#: texi2html/texi2html.pl:10775
#, perl-format
msgid "Too many %s closed"
msgstr ""
-#: texi2html/texi2html.pl:10851 tp/Texinfo/Parser.pm:1186
+#: texi2html/texi2html.pl:10845 texi2html/formats/info.pm:899
+#: tp/Texinfo/Parser.pm:1186
#, perl-format
msgid "@%s has text but no @item"
msgstr ""
-#: texi2html/texi2html.pl:11011
+#: texi2html/texi2html.pl:11005
#, fuzzy, perl-format
msgid "Unknown format %s"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: texi2html/texi2html.pl:11227 texi2html/texi2html.pl:11665
+#: texi2html/texi2html.pl:11221 texi2html/texi2html.pl:11659
#, fuzzy, perl-format
msgid "@%s (argument nr %d)"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: texi2html/texi2html.pl:11311
+#: texi2html/texi2html.pl:11305
#, perl-format
msgid "prepended for @%s"
msgstr ""
-#: texi2html/texi2html.pl:11327 tp/Texinfo/Parser.pm:2154
+#: texi2html/texi2html.pl:11321 tp/Texinfo/Parser.pm:2154
#, fuzzy
msgid "empty multitable"
msgstr "%s: ªÅÀÉ®×"
-#: texi2html/texi2html.pl:11337
+#: texi2html/texi2html.pl:11331
#, perl-format
msgid "@columnfraction (argument nr %d)"
msgstr ""
-#: texi2html/texi2html.pl:11525 texi2html/texi2html.pl:11539
+#: texi2html/texi2html.pl:11519 texi2html/texi2html.pl:11533
msgid "node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11526
+#: texi2html/texi2html.pl:11520
msgid "normalized node name in menu"
msgstr ""
-#: texi2html/texi2html.pl:11532
+#: texi2html/texi2html.pl:11526
msgid "menu entry name"
msgstr ""
-#: texi2html/texi2html.pl:11567 tp/Texinfo/Structuring.pm:382
+#: texi2html/texi2html.pl:11561 tp/Texinfo/Structuring.pm:384
#, fuzzy, perl-format
msgid "Menu reference to nonexistent node `%s'"
msgstr "¥¼³Q°Ñ·Óªº¸`ÂI `%s'"
-#: texi2html/texi2html.pl:11641
+#: texi2html/texi2html.pl:11635
#, fuzzy, perl-format
msgid "First argument to @%s may not be empty"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: texi2html/texi2html.pl:11778
+#: texi2html/texi2html.pl:11772
#, perl-format
msgid "@%s not in text (in anchor, node, section...)"
msgstr ""
-#: texi2html/texi2html.pl:11790 texi2html/texi2html.pl:14561
+#: texi2html/texi2html.pl:11784 texi2html/texi2html.pl:14555
msgid "@listoffloats @float type"
msgstr ""
-#: texi2html/texi2html.pl:11809 tp/Texinfo/Structuring.pm:621
+#: texi2html/texi2html.pl:11803 tp/Texinfo/Structuring.pm:774
#, fuzzy, perl-format
msgid "@%s reference to nonexistent node `%s'"
msgstr "%s °Ñ·Ó¨ì¤£¦s¦bªº¸`ÂI: `%s'"
-#: texi2html/texi2html.pl:11950
+#: texi2html/texi2html.pl:11944
msgid "@float style"
msgstr ""
-#: texi2html/texi2html.pl:12082 texi2html/texi2html.pl:12083
+#: texi2html/texi2html.pl:12076 texi2html/texi2html.pl:12077
msgid "@image base name"
msgstr ""
-#: texi2html/texi2html.pl:12092 texi2html/texi2html.pl:12093
+#: texi2html/texi2html.pl:12086 texi2html/texi2html.pl:12087
msgid "@image extension"
msgstr ""
-#: texi2html/texi2html.pl:12100
+#: texi2html/texi2html.pl:12094
#, fuzzy
msgid "@image file name"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: texi2html/texi2html.pl:12122
+#: texi2html/texi2html.pl:12116
msgid "@image alt text"
msgstr ""
-#: texi2html/texi2html.pl:12205 tp/Texinfo/Parser.pm:1492
+#: texi2html/texi2html.pl:12199 tp/Texinfo/Parser.pm:1492
#, fuzzy, perl-format
msgid "Macro `%s' called with too many args"
msgstr "¥¨¶° `%s' ¦b²Ä %d ¦æ³Q©I¥s, ¦ý¬O¤Þ¼Æ¹L¦h"
-#: texi2html/texi2html.pl:12229
+#: texi2html/texi2html.pl:12223
#, perl-format
msgid "\\ in macro expansion followed `%s' instead of parameter name or \\"
msgstr ""
-#: texi2html/texi2html.pl:12424
+#: texi2html/texi2html.pl:12418
#, fuzzy, perl-format
msgid "No index prefix found for @%s"
msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
-#: texi2html/texi2html.pl:12906 texi2html/texi2html.pl:14691
+#: texi2html/texi2html.pl:12900 texi2html/texi2html.pl:14685
#, fuzzy, perl-format
msgid "@%s not allowed in argument to @%s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: texi2html/texi2html.pl:12968
+#: texi2html/texi2html.pl:12962
#, perl-format
msgid "Macro definition without macro name: %s"
msgstr ""
-#: texi2html/texi2html.pl:13021 tp/Texinfo/Parser.pm:3198
+#: texi2html/texi2html.pl:13015 tp/Texinfo/Parser.pm:3198
msgid "Bad syntax for @value"
msgstr ""
-#: texi2html/texi2html.pl:13058 tp/Texinfo/Parser.pm:2921
+#: texi2html/texi2html.pl:13052 tp/Texinfo/Parser.pm:2921
#, perl-format
msgid ""
"@%s defined with zero or more than one argument should be invoked with {}"
msgstr ""
-#: texi2html/texi2html.pl:13081 tp/Texinfo/Parser.pm:2860
+#: texi2html/texi2html.pl:13075 tp/Texinfo/Parser.pm:2860
#, perl-format
msgid "@%s without associated character"
msgstr ""
-#: texi2html/texi2html.pl:13231
+#: texi2html/texi2html.pl:13225
#, fuzzy, perl-format
msgid "@%s already set"
msgstr "¯Á¤Þ `%s' ¤w¦s¦b"
-#: texi2html/texi2html.pl:13283
+#: texi2html/texi2html.pl:13277
#, fuzzy, perl-format
msgid "Anchor `%s' previously defined %s"
msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
-#: texi2html/texi2html.pl:13319
+#: texi2html/texi2html.pl:13313
#, fuzzy, perl-format
msgid "No closing brace for specially handled command %s"
msgstr "µù¸} `%s' ¨S¦³¥k¤j¬A¸¹"
-#: texi2html/texi2html.pl:13606 tp/Texinfo/Parser.pm:3205
+#: texi2html/texi2html.pl:13600 tp/Texinfo/Parser.pm:3205
#, fuzzy, perl-format
msgid "%c%s is obsolete."
msgstr "%c%s ¤w¼o¤î¤£¥Î"
-#: texi2html/texi2html.pl:13610 tp/Texinfo/Parser.pm:3208
+#: texi2html/texi2html.pl:13604 tp/Texinfo/Parser.pm:3208
#, fuzzy, perl-format
msgid "%c%s is obsolete; %s"
msgstr "%c%s ¤w¼o¤î¤£¥Î"
-#: texi2html/texi2html.pl:13631 tp/Texinfo/Parser.pm:4284
+#: texi2html/texi2html.pl:13625 tp/Texinfo/Parser.pm:4288
#, perl-format
msgid "Printindex before document beginning: @printindex %s"
msgstr ""
-#: texi2html/texi2html.pl:13698
+#: texi2html/texi2html.pl:13692
#, perl-format
msgid "ignored @%s already in an @%s entry"
msgstr ""
-#: texi2html/texi2html.pl:13723 texi2html/texi2html.pl:13771
-#: tp/Texinfo/Parser.pm:3689
+#: texi2html/texi2html.pl:13717 texi2html/texi2html.pl:13765
+#: tp/Texinfo/Parser.pm:3693
#, fuzzy, perl-format
msgid "@%s seen before first @node"
msgstr "@menu address@hidden @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
-#: texi2html/texi2html.pl:13728 tp/Texinfo/Parser.pm:911
-#: tp/Texinfo/Structuring.pm:367
+#: texi2html/texi2html.pl:13722 tp/Texinfo/Parser.pm:911
+#: tp/Texinfo/Structuring.pm:369
#, perl-format
msgid "Multiple @%s"
msgstr ""
-#: texi2html/texi2html.pl:13740
+#: texi2html/texi2html.pl:13734
#, perl-format
msgid "@%s not allowed within %s"
msgstr ""
-#: texi2html/texi2html.pl:13789
+#: texi2html/texi2html.pl:13783
#, fuzzy, perl-format
msgid "Float label `%s' previously defined %s"
msgstr "¥¨¶° `%s' ¤w©w¸q¹L"
-#: texi2html/texi2html.pl:14108 texi2html/texi2html.pl:14109
-#: texi2html/texi2html.pl:14112
+#: texi2html/texi2html.pl:14102 texi2html/texi2html.pl:14103
+#: texi2html/texi2html.pl:14106
msgid "new menu entry"
msgstr ""
-#: texi2html/texi2html.pl:14242
+#: texi2html/texi2html.pl:14236
msgid "paragraph end"
msgstr ""
-#: texi2html/texi2html.pl:14554
+#: texi2html/texi2html.pl:14548
msgid "@listoffloats type"
msgstr ""
-#: texi2html/texi2html.pl:14746 tp/Texinfo/Parser.pm:3017
+#: texi2html/texi2html.pl:14740 tp/Texinfo/Parser.pm:3017
#, perl-format
msgid "Accent command address@hidden' must not be followed by whitespace"
msgstr ""
-#: texi2html/texi2html.pl:14768 tp/Texinfo/Parser.pm:3051
+#: texi2html/texi2html.pl:14762 tp/Texinfo/Parser.pm:3051
#, fuzzy, perl-format
msgid "@%s expected braces"
msgstr "%c%s ¹wpn¦³ `{...}'"
-#: texi2html/texi2html.pl:14959 tp/Texinfo/Parser.pm:3446
+#: texi2html/texi2html.pl:14953 tp/Texinfo/Parser.pm:3450
#, perl-format
msgid "@%s outside of table or list"
msgstr ""
-#: texi2html/texi2html.pl:14977 tp/Texinfo/Parser.pm:3404
+#: texi2html/texi2html.pl:14971 tp/Texinfo/Parser.pm:3408
#, fuzzy, perl-format
msgid "@%s in empty multitable"
msgstr "%s: ªÅÀÉ®×"
-#: texi2html/texi2html.pl:14999
+#: texi2html/texi2html.pl:14993
#, fuzzy
msgid "ignoring @tab in empty multitable"
msgstr "©¿²¤ multitable ¥~ªº @tab"
-#: texi2html/texi2html.pl:15034
+#: texi2html/texi2html.pl:15028
msgid "@center should not appear in another format"
msgstr ""
-#: texi2html/texi2html.pl:15416 tp/Texinfo/Parser.pm:3409
+#: texi2html/texi2html.pl:15410 tp/Texinfo/Parser.pm:3413
msgid "@tab before @item"
msgstr ""
-#: texi2html/texi2html.pl:15651 tp/Texinfo/Parser.pm:3033
-#: tp/Texinfo/Parser.pm:3936
+#: texi2html/texi2html.pl:15645 tp/Texinfo/Parser.pm:3033
+#: tp/Texinfo/Parser.pm:3940
#, fuzzy, perl-format
msgid "%c%s expects `i' or `j' as argument, not `%s'"
msgstr "%c%s ´Á±æ¨Ï¥Î `i' ©Î `j' address@hidden, ¦Ó¤£¬O `%c'"
-#: texi2html/texi2html.pl:15703
+#: texi2html/texi2html.pl:15697
#, fuzzy, perl-format
msgid "Unknown command with braces address@hidden'"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: texi2html/texi2html.pl:15743
+#: texi2html/texi2html.pl:15737
#, fuzzy, perl-format
msgid "Unexpected command `%s' here"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: texi2html/texi2html.pl:15838 tp/Texinfo/Parser.pm:1514
+#: texi2html/texi2html.pl:15832 tp/Texinfo/Parser.pm:1514
#, fuzzy, perl-format
msgid "@%s missing close brace"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
-#: texi2html/texi2html.pl:16034 tp/Texinfo/Parser.pm:1043
+#: texi2html/texi2html.pl:16028 tp/Texinfo/Parser.pm:1043
#, fuzzy, perl-format
msgid "@%s missing closing delimiter sequence: %s}"
msgstr "%c%s ¿òº|¥k¤j¬A¸¹"
-#: texi2html/texi2html.pl:16147
+#: texi2html/texi2html.pl:16141
#, fuzzy, perl-format
msgid "%s should not appear in %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: texi2html/texi2html.pl:16624
+#: texi2html/texi2html.pl:16618
#, perl-format
msgid "Index entry not caught: `%s' in %s"
msgstr ""
-#: texi2html/texi2html.pl:16722
+#: texi2html/texi2html.pl:16716
#, fuzzy, perl-format
msgid "Empty index entry for @%s"
msgstr "§ä¤£¨ì¥]§t `%s' ªº¯Á¤Þ¶µ¥Ø\n"
-#: texi2html/texi2html.pl:16858
+#: texi2html/texi2html.pl:16852
#, perl-format
msgid "%s:%d: string not closed in css file"
msgstr ""
-#: texi2html/texi2html.pl:16860
+#: texi2html/texi2html.pl:16854
#, perl-format
msgid "%s:%d @import not finished in css file"
msgstr ""
-#: texi2html/texi2html.pl:16890
+#: texi2html/texi2html.pl:16884
#, fuzzy, perl-format
msgid "%s: could not open --css-file %s: %s\n"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: texi2html/texi2html.pl:16962
+#: texi2html/texi2html.pl:16956
#, perl-format
msgid "%s:%d: no node to be renamed\n"
msgstr ""
-#: texi2html/texi2html.pl:16973
+#: texi2html/texi2html.pl:16967
#, perl-format
msgid "%s:%d: nodes without a new name at the end of file\n"
msgstr ""
-#: texi2html/texi2html.init:1267
+#: texi2html/texi2html.pm:1267
msgid "Document encoding is utf8, but there is no unicode support"
msgstr ""
-#: texi2html/texi2html.init:6674 texi2html/formats/docbook.init:1498
-#: texi2html/formats/html.init:2348
-#: texi2html/maintained_extra/mediawiki.init:1141
-#, c-format
-msgid "Raw format %s is not converted"
+#: texi2html/texi2html.pm:2219 tp/Texinfo/Common.pm:580
+msgid "recursion is always allowed"
msgstr ""
-#: texi2html/formats/docbook.init:1021 texi2html/formats/info.init:2996
-#: texi2html/formats/plaintext.init:151
-#, fuzzy, c-format
-msgid "address@hidden file `%s' unreadable: %s"
-msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
+#: texi2html/texi2html.pm:2220 tp/Texinfo/Common.pm:581
+msgid "arguments are quoted by default"
+msgstr ""
-#: texi2html/formats/docbook.init:1026 texi2html/formats/info.init:3001
-#: texi2html/formats/plaintext.init:156
-#, fuzzy, c-format
-msgid "Cannot find address@hidden file `%s.txt'"
+#: texi2html/texi2html.pm:6674 texi2html/formats/docbook.pm:1498
+#: texi2html/formats/html.pm:2348 texi2html/maintained_extra/mediawiki.pm:1141
+#, perl-format
+msgid "Raw format %s is not converted"
+msgstr ""
+
+#: texi2html/formats/docbook.pm:1026 texi2html/formats/info.pm:3001
+#: texi2html/formats/plaintext.pm:156 tp/Texinfo/Convert/Info.pm:556
+#, fuzzy, perl-format
+msgid "Cannot find @image file `%s.txt'"
msgstr "§ä¤£¨ì `%s' ¸`ÂI."
-#: texi2html/formats/html.init:2485
-#, fuzzy, c-format
-msgid "address@hidden file `%s' (for HTML) not found, using `%s'"
+#: texi2html/formats/html.pm:2485
+#, fuzzy, perl-format
+msgid "@image file `%s' (for HTML) not found, using `%s'"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: texi2html/formats/info.init:899
-#, c-format
-msgid "address@hidden has text but no address@hidden"
-msgstr ""
-
-#: texi2html/formats/info.init:1188
-msgid ""
-"address@hidden produces a spurious cross-reference in Info; reword to "
-"avoid that"
-msgstr ""
-
-#: texi2html/formats/info.init:1352
+#: texi2html/formats/info.pm:1352
#, fuzzy
-msgid "`.' or `,' must follow address@hidden"
+msgid "`.' or `,' must follow @xref."
msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
-#: texi2html/formats/info.init:1357
-#, fuzzy, c-format
-msgid "`.' or `,' must follow address@hidden, not %s"
+#: texi2html/formats/info.pm:1357 tp/Texinfo/Convert/Plaintext.pm:1511
+#, fuzzy, perl-format
+msgid "`.' or `,' must follow @xref, not %s"
msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
-#: texi2html/formats/info.init:2465
+#: texi2html/formats/info.pm:2465
msgid "anchor outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:2780
+#: texi2html/formats/info.pm:2780
#, fuzzy
-msgid "address@hidden before first node"
+msgid "@menu before first node"
msgstr "@menu address@hidden @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
-#: texi2html/formats/info.init:2785
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:2785 tp/Texinfo/Parser.pm:3687
+#, fuzzy
+msgid "@direntry after first node"
+msgstr "@menu address@hidden @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
-#: texi2html/formats/info.init:3539
+#: texi2html/formats/info.pm:3539
msgid "float reference outside of any node, it won't be registered"
msgstr ""
-#: texi2html/formats/info.init:3642
-msgid "address@hidden after first node"
-msgstr ""
+#: texi2html/formats/info.pm:3642 tp/Texinfo/Parser.pm:3537
+#, fuzzy
+msgid "@dircategory after first node"
+msgstr "@menu address@hidden @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
-#: texi2html/maintained_extra/mediawiki.init:1100
-#, fuzzy, c-format
-msgid "address@hidden file `%s' not found, using `%s'"
+#: texi2html/maintained_extra/mediawiki.pm:1100
+#, fuzzy, perl-format
+msgid "@image file `%s' not found, using `%s'"
msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
-#: tp/texi2any.pl:268
+#: tp/texi2any.pl:220
#, perl-format
msgid "error loading %s: %s\n"
msgstr ""
-#: tp/texi2any.pl:277 tp/texi2any.pl:290
+#: tp/texi2any.pl:229
#, fuzzy, perl-format
msgid "Unknown variable %s"
msgstr "¥¼ª¾ªº©R¥O `%s'"
-#: tp/texi2any.pl:482
+#: tp/texi2any.pl:242
+#, fuzzy, perl-format
+msgid "Unknown variable %s\n"
+msgstr "¥¼ª¾ªº©R¥O `%s'"
+
+#: tp/texi2any.pl:434
#, fuzzy, perl-format
msgid "Can't read init file %s"
msgstr "µLªk¶}±Ò¦Ü `%s' ªººÞ¹D."
-#: tp/texi2any.pl:663
+#: tp/texi2any.pl:620
#, fuzzy, perl-format
msgid "Could not open %s for writing: %s\n"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Common.pm:461
-msgid "recursion is always allowed"
-msgstr ""
-
-#: tp/Texinfo/Common.pm:462
-msgid "arguments are quoted by default"
-msgstr ""
-
#: tp/Texinfo/Parser.pm:769
#, fuzzy, perl-format
msgid "Can't read file %s: %s"
@@ -3824,7 +3875,7 @@
msgid "Unexpected argument on @%s line: %s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4167
+#: tp/Texinfo/Parser.pm:2210 tp/Texinfo/Parser.pm:4171
#, fuzzy, perl-format
msgid "Superfluous argument to @%s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
@@ -3840,7 +3891,7 @@
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
#: tp/Texinfo/Parser.pm:2297 tp/Texinfo/Parser.pm:2420
-#: tp/Texinfo/Parser.pm:4159
+#: tp/Texinfo/Parser.pm:4163
#, fuzzy, perl-format
msgid "@%s missing argument"
msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
@@ -3913,156 +3964,160 @@
msgid "@%s not allowed inside address@hidden' block"
msgstr "@%s ¦b address@hidden' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
-#: tp/Texinfo/Parser.pm:3486
+#: tp/Texinfo/Parser.pm:3320
+#, fuzzy, perl-format
+msgid "@%s should only appear in heading or footing"
+msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
+
+#: tp/Texinfo/Parser.pm:3490
#, perl-format
msgid "Must be after address@hidden' to use address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3533
-#, fuzzy
-msgid "@dircategory after first node"
-msgstr "@menu address@hidden @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
-
-#: tp/Texinfo/Parser.pm:3683
-#, fuzzy
-msgid "@direntry after first node"
-msgstr "@menu address@hidden @node ¤§«e¥X²{, ±N«Ø¥ß `Top' ¸`ÂI"
-
-#: tp/Texinfo/Parser.pm:3748
+#: tp/Texinfo/Parser.pm:3752
#, fuzzy, perl-format
msgid "@%s should only appear in math context"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Parser.pm:3768
+#: tp/Texinfo/Parser.pm:3772
#, fuzzy
msgid "Unexpected @"
msgstr "Expected `%s'"
-#: tp/Texinfo/Parser.pm:3796
+#: tp/Texinfo/Parser.pm:3800
#, fuzzy, perl-format
msgid "@%s is not meaningful outside address@hidden' environment"
msgstr "@%s ¦b address@hidden' °Ï¶ô¤§¤º, ¨Ã¤£¨ã¦³·N¸q"
-#: tp/Texinfo/Parser.pm:3800
+#: tp/Texinfo/Parser.pm:3804
#, perl-format
msgid "@%s should be right below address@hidden'"
msgstr ""
-#: tp/Texinfo/Parser.pm:3808
+#: tp/Texinfo/Parser.pm:3812
#, perl-format
msgid "Ignoring multiple @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:3885
+#: tp/Texinfo/Parser.pm:3889
#, perl-format
msgid "Command @%s does not accept arguments"
msgstr ""
-#: tp/Texinfo/Parser.pm:3904
+#: tp/Texinfo/Parser.pm:3908
#, fuzzy, perl-format
msgid "Command @%s missing a node argument"
msgstr "%s: ¿òº|Àɮפ޼Æ.\n"
-#: tp/Texinfo/Parser.pm:4092
+#: tp/Texinfo/Parser.pm:4096
#, fuzzy, perl-format
msgid "Remaining argument on @%s line: %s"
msgstr "¹ï %c%s µL¥Îªº¤Þ¼Æ"
-#: tp/Texinfo/Parser.pm:4197
+#: tp/Texinfo/Parser.pm:4201
#, perl-format
msgid "Empty @%s"
msgstr ""
-#: tp/Texinfo/Parser.pm:4214
+#: tp/Texinfo/Parser.pm:4218
#, fuzzy, perl-format
msgid "@sp arg must be numeric, not `%s'"
msgstr "%s: %s ¤Þ¼Æ¥²¶·¬°¼ÆÈ, ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/Parser.pm:4260
+#: tp/Texinfo/Parser.pm:4264
#, perl-format
msgid "@%s leads to a merging of %s in itself, ignoring"
msgstr ""
-#: tp/Texinfo/Parser.pm:4277
+#: tp/Texinfo/Parser.pm:4281
#, perl-format
msgid "Printing an index `%s' merged in another one `%s'"
msgstr ""
-#: tp/Texinfo/Parser.pm:4377
+#: tp/Texinfo/Parser.pm:4381
#, fuzzy, perl-format
msgid "@urefbreakstyle arg must be `after'/`before'/`none', not `%s'"
msgstr "%s: --footnote-style ªº¤Þ¼Æ¥²¶·¬° `separate' ©Î `end', ¦Ó¤£¬O `%s'.\n"
-#: tp/Texinfo/Structuring.pm:201
-#, fuzzy
-msgid "@top already exists"
-msgstr "¯Á¤Þ `%s' ¤w¦s¦b"
-
-#: tp/Texinfo/Structuring.pm:224
+#: tp/Texinfo/Structuring.pm:225
#, perl-format
msgid "Upping the section level of @%s which is too low"
msgstr ""
-#: tp/Texinfo/Structuring.pm:259
+#: tp/Texinfo/Structuring.pm:260
#, perl-format
msgid "Lowering the section level of @%s appearing after a lower element"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:120
+#: tp/Texinfo/Convert/HTML.pm:1392
+msgid "Must specify a title with a title command or @top"
+msgstr ""
+
+#: tp/Texinfo/Convert/HTML.pm:1429 tp/Texinfo/Convert/HTML.pm:1457
+#: tp/Texinfo/Convert/Info.pm:88 tp/Texinfo/Convert/Info.pm:151
+#: tp/Texinfo/Convert/Info.pm:170 tp/Texinfo/Convert/Plaintext.pm:430
#, fuzzy, perl-format
-msgid "Can't create directories `%s': %s"
+msgid "Could not open %s for writing: %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/Info.pm:133 tp/Texinfo/Convert/Info.pm:196
-#: tp/Texinfo/Convert/Info.pm:216 tp/Texinfo/Convert/Plaintext.pm:526
+#: tp/Texinfo/Convert/Info.pm:75
#, fuzzy, perl-format
-msgid "Could not open %s for writing: %s"
+msgid "Can't create directories `%s': %s"
msgstr "µLªk«Ø¥ß¿é¥XÀÉ®× `%s'."
-#: tp/Texinfo/Convert/Info.pm:143
+#: tp/Texinfo/Convert/Info.pm:97
#, fuzzy
msgid "Document without nodes."
msgstr "¥»¸`ÂI¨S¦³¿ï³æ."
-#: tp/Texinfo/Convert/Info.pm:155
+#: tp/Texinfo/Convert/Info.pm:109
msgid "Document without Top node."
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:181
+#: tp/Texinfo/Convert/Info.pm:136
#, perl-format
msgid "Rename %s failed: %s"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:241
+#: tp/Texinfo/Convert/Info.pm:195
#, perl-format
msgid "@%s `%s' output more than once"
msgstr ""
-#: tp/Texinfo/Convert/Info.pm:501
+#: tp/Texinfo/Convert/Info.pm:455
#, fuzzy, perl-format
msgid "@%s outside of any node"
msgstr "(¤£¦b¥ô¦óªº¸`ÂI¤º)"
-#: tp/Texinfo/Convert/Info.pm:602
-#, fuzzy, perl-format
-msgid "Cannot find @image file `%s.txt'"
-msgstr "§ä¤£¨ì `%s' ¸`ÂI."
-
-#: tp/Texinfo/Convert/Plaintext.pm:1612
-#, fuzzy, perl-format
-msgid "`.' or `,' must follow @xref, not %s"
-msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
-
-#: tp/Texinfo/Convert/Plaintext.pm:1614
+#: tp/Texinfo/Convert/Plaintext.pm:1513
#, fuzzy
msgid "`.' or `,' must follow @xref"
msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
-#: tp/Texinfo/Convert/Plaintext.pm:2246
+#: tp/Texinfo/Convert/Plaintext.pm:2148
#, perl-format
msgid "Node expansion `%s' in menu differs from normal node expansion `%s'"
msgstr ""
+#, fuzzy
+#~ msgid "address@hidden file `%s' unreadable: %s"
+#~ msgstr "@image ÀÉ®× `%s' µLªkŪ¨ú: %s"
+
+#, fuzzy
+#~ msgid "Cannot find address@hidden file `%s.txt'"
+#~ msgstr "§ä¤£¨ì `%s' ¸`ÂI."
+
+#, fuzzy
+#~ msgid "`.' or `,' must follow address@hidden, not %s"
+#~ msgstr "`.' ©Î `,' ¥²¶·¸òµÛ¥æ¤¬°Ñ·Ó, ¦Ó¤£¬O %c"
+
+#~ msgid "%s: warning: "
+#~ msgstr "%s: ĵ§i: "
+
+#, fuzzy
+#~ msgid "@top already exists"
+#~ msgstr "¯Á¤Þ `%s' ¤w¦s¦b"
+
#~ msgid "%s: illegal option -- %c\n"
#~ msgstr "%s: ¤£¦Xªkªº¿ï¶µ -- %c\n"
Index: po_document/POTFILES.in
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/POTFILES.in,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- po_document/POTFILES.in 6 Apr 2011 23:43:15 -0000 1.3
+++ po_document/POTFILES.in 9 Apr 2011 00:10:42 -0000 1.4
@@ -1,20 +1,20 @@
# List of source files which contain translatable strings.
texi2html/texi2html.pl
-texi2html/texi2html.init
+texi2html/texi2html.pm
texi2html/T2h_l2h.pm
texi2html/T2h_i18n.pm
-texi2html/formats/docbook.init
-texi2html/formats/html.init
-texi2html/formats/info.init
-texi2html/formats/plaintext.init
-texi2html/formats/xml.init
-texi2html/maintained_extra/book.init
-texi2html/maintained_extra/chm.init
-texi2html/maintained_extra/html32.init
-texi2html/maintained_extra/tex4ht.init
-texi2html/maintained_extra/mediawiki.init
-texi2html/examples/roff.init
+texi2html/formats/docbook.pm
+texi2html/formats/html.pm
+texi2html/formats/info.pm
+texi2html/formats/plaintext.pm
+texi2html/formats/xml.pm
+texi2html/maintained_extra/book.pm
+texi2html/maintained_extra/chm.pm
+texi2html/maintained_extra/html32.pm
+texi2html/maintained_extra/tex4ht.pm
+texi2html/maintained_extra/mediawiki.pm
+texi2html/examples/roff.pm
tp/Texinfo/Parser.pm
tp/Texinfo/Convert/Info.pm
tp/Texinfo/Convert/Plaintext.pm
Index: po_document/de.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/de.us-ascii.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/de.us-ascii.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/de.us-ascii.po 9 Apr 2011 00:10:42 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2008-03-19\n"
"Last-Translator: Reinhold Kainhofer <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "@\"Uber dieses Dokument"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "Inhaltsverzeichnis"
@@ -32,225 +32,225 @@
msgstr "Kurzes Inhaltsverzeichnis"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "address@hidden"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr "Anfang"
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr "Inhalt"
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr "@\"Ubersicht"
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "Index"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr ""
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr ""
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr "Nach oben"
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr ""
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
#, fuzzy
msgid "Forward node"
msgstr "Nach vorne"
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
#, fuzzy
msgid "Back node"
msgstr "Knoten nach oben"
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr ""
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr ""
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr "Titelseite des Dokuments"
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr "Inhaltsverzeichnis"
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr "Kurzes Inhaltsverzeichnis"
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr "Aktueller Abschnitt"
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr "Voriger Abschnitt in Lesereihenfolge"
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr "Anfang dieses oder des letzten Kapitels"
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr "Voriger Abschnitt derselben Ebene"
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr "Abschnitt nach oben"
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr "address@hidden"achster Abschitt derselben Ebene"
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr "Knoten nach oben"
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr "address@hidden"achster Knoten"
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr "Voriger Knoten"
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
#, fuzzy
msgid "Next node in node reading order"
msgstr "address@hidden"achster Abschnitt in Lesereihenfolge"
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
#, fuzzy
msgid "Previous node in node reading order"
msgstr "Voriger Abschnitt in Lesereihenfolge"
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr "address@hidden"achster Abschnitt in Lesereihenfolge"
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr "address@hidden"achstes Kapitel"
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr "@\"Uber (Hilfe)"
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr "Erster Abschnitt in Lesereihenfolge"
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr "Letzter Abschnitt in Lesereihenfolge"
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr ""
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr ""
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr ""
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr "address@hidden"uck"
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr ""
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr ""
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr ""
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr ""
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr ""
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
#, fuzzy
msgid "NodeForward"
msgstr "Nach vorne"
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
#, fuzzy
msgid "NodeBack"
msgstr "address@hidden"uck"
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr "Nach vorne"
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr ""
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr "@\"Uber"
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr ""
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr ""
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr ""
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr ""
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
@@ -259,7 +259,7 @@
"Dieses Dokument wurde erzeugt am @i{{date}} durch @uref{{program_homepage}, "
"@i{{program}}}."
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
@@ -268,152 +268,152 @@
"Dieses Dokument wurde erzeugt durch @uref{{program_homepage}, @emph"
"{{program}}}."
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr "{style} {number}"
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr "{style}: {caption_first_line}"
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr "{style}: {shortcaption_first_line}"
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr ""
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr ""
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "siehe {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "Abschnitt `{section}' in @cite{{book}}"
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "siehe @cite{{book}}"
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "siehe {reference_name}"
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "Abschnitt nach oben"
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Siehe {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Siehe Abschnitt `{section}' in @cite{{book}}"
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "siehe {reference_name}"
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "Abschnitt nach oben"
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "siehe @cite{{book}}"
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "Abschnitt `{section}' in @cite{{book}}"
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "{reference_name}"
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "Abschnitt nach oben"
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "siehe Abschnitt {reference_name}"
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr "siehe {reference_name}"
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr "am @emph{{date}}"
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr "{acronym_like} ({explanation})"
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr ""
@@ -470,88 +470,88 @@
msgid "{month} {day}, {year}"
msgstr "{day}. {month} {year}"
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr ""
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr ""
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr " Nach oben "
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr "Knoten nach oben"
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr "Unbenanntes Dokumen"
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " Die Links in der Navigationsleiste haben die folgende Bedeutung: "
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr ""
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr "Name"
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr "Gehe zu"
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr "Von 1.2.3 gehe zu"
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -561,186 +561,190 @@
"@strong{ Unterabschnitt 1-2-3 } in einem Dokument mit folgender Struktur "
"liegt:"
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr "Abschnitt 1"
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr "Unterabschnitt 1-1"
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr "Unterabschnitt 1-2"
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr "Unterabschnitt 1-2-1"
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr "Unterabschnitt 1-2-2"
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr "Unterabschnitt 1-2-3"
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr "Aktuelle Position"
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr "Unterabschnitt 1-2-4"
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr "Unterabschnitt 1-3"
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr "Unterabschnitt 1-4"
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Der Knoten, den Sie sehen, befindet sich bei {href}"
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr "Indexeintrag"
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr "Abschnitt"
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr "Springe zu"
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr ""
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr ""
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr ""
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr "Auswahl:"
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, perl-brace-format
msgid "{category} on {class}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, perl-brace-format
msgid "{category} of {class}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, fuzzy, perl-brace-format
msgid "{float_number}"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, fuzzy, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{acronym_like} ({explanation})"
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
+
#~ msgid "Node following in node reading order"
#~ msgstr "address@hidden"achster Abschnitt in Lesereihenfolge"
Index: po_document/es.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/es.us-ascii.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/es.us-ascii.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/es.us-ascii.po 9 Apr 2011 00:10:42 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2008-08-28\n"
"Last-Translator: Francisco Vila <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "Acerca de este documento"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "@'address@hidden General"
@@ -32,225 +32,225 @@
msgstr "Resumen del Contenido"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "Notas al pie"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr "Arriba"
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr "@'Indice general"
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr "Panor@'amica"
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "@'Indice"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr ""
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr ""
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr "Subir"
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr "Siguiente"
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
#, fuzzy
msgid "Forward node"
msgstr "Adelante"
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
#, fuzzy
msgid "Back node"
msgstr "Subir nodo"
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr "Archivo siguiente"
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr "Archivo anterior"
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr "Portada del documento"
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr "@'address@hidden general"
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr "Resumen del contenido"
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr "Secci@'on actual"
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr "Secci@'on anterior en orden de lectura"
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr "Inicio de este cap@'itulo o cap@'itulo anterior"
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr "Secci@'on anterior en el mismo nivel"
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr "Subir secci@'on"
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr "Secci@'on siguiente en el mismo nivel"
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr "Subir nodo"
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr "Nodo siguiente"
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr "Nodo anterior"
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
#, fuzzy
msgid "Next node in node reading order"
msgstr "Secci@'on siguiente en orden de lectura"
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
#, fuzzy
msgid "Previous node in node reading order"
msgstr "Secci@'on anterior en orden de lectura"
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr "Secci@'on siguiente en orden de lectura"
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr "Cap@'itulo siguiente"
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr "Acerca de (p@'agina de ayuda)"
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr "Primera secci@'on en orden de lectura"
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr "@'Ultima secci@'on en orden de lectura"
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr "Avanzar secci@'on en el pr@'oximo archivo"
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr "Retroceder secci@'on en el archivo anterior"
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr "Este"
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr "Atr@'as"
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr "Retroceso r@'apido"
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr "Ant"
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr "SubirNodo"
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr "NodoSiguiente"
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr "NodoAnterior"
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
#, fuzzy
msgid "NodeForward"
msgstr "Adelante"
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
#, fuzzy
msgid "NodeBack"
msgstr "Atr@'as"
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr "Adelante"
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr "Avance r@'apido"
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr "Acerca de"
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr "Primero"
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr "@'Ultimo"
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr "ArchivoSiguiente"
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr "ArchivoAnt"
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
@@ -259,7 +259,7 @@
"Este documento se gener@'o el @i{{date}} utilizando @uref"
"{{program_homepage}, @i{{program}}}."
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
@@ -268,152 +268,152 @@
"Este documento se gener@'o utilizando @uref{{program_homepage}, @emph"
"{{program}}}."
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr ""
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} en {class}"
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} de {class}"
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "v@'ease {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "secci@'on `{section}' en @cite{{book}}"
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "v@'ease @cite{{book}}"
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "v@'ease {reference_name}"
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "Subir secci@'on"
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "V@'ease {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "V@'ease la secci@'on `{section}' en @cite{{book}}"
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "V@'ease @cite{{book}}"
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "V@'ease {reference_name}"
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "Subir secci@'on"
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "v@'ease @cite{{book}}"
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "secci@'on `{section}' en @cite{{book}}"
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "v@'ease {reference_name}"
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "Subir secci@'on"
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "v@'ease la secci@'on {reference_name}"
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr "v@'ease {reference_name}"
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "V@'ease la secci@'on {reference_name}"
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr "V@'ease {reference_name}"
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr "el @emph{{date}}"
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr ""
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr ""
@@ -470,89 +470,89 @@
msgid "{month} {day}, {year}"
msgstr "el {day} {month} {year}"
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr ""
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr "actual"
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr " Subir "
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr "Subir nodo"
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr "Documento sin t@'itulo"
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" Los botones de los paneles de navegaci@'on tienen el significado siguiente:"
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr "Bot@'on"
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr "Nombre"
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr "Ir a"
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr "Desde 1.2.3 ir a"
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -562,186 +562,190 @@
"@strong{ Sub-subsecci@'on uno-dos-tres } de un documento de la estructura "
"siguiente:"
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr "Secci@'on Uno"
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr "Subsecci@'on uno-uno"
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr "Subsecci@'on uno-dos"
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr "Sub-subsecci@'on uno-dos-uno"
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr "Sub-subsecci@'on uno-dos-dos"
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr "Sub-subsecci@'on uno-dos-tres"
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr "Posici@'on actual"
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr "Sub-subsecci@'on uno-dos-cuatro"
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr "Subsecci@'on uno-tres"
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr "Subsecci@'on uno-cuatro"
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "El nodo que busca se encuentra en {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr "Entrada de @'indice"
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr "Secci@'on"
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr "Saltar a"
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr ""
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr ""
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr ""
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr "Men@'u:"
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, fuzzy, perl-brace-format
msgid "{category} on {class}"
msgstr "{name} en {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, fuzzy, perl-brace-format
msgid "{category} of {class}"
msgstr "{name} de {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
+
#~ msgid "Following"
#~ msgstr "Siguiente"
Index: po_document/fr.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/fr.us-ascii.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/fr.us-ascii.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/fr.us-ascii.po 9 Apr 2011 00:10:42 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2008-07-20\n"
"Last-Translator: Jean-Charles Malahieude <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "A propos de ce document"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "Table des address@hidden"
@@ -32,225 +32,225 @@
msgstr "R@'esum@'e du contenu"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "Notes de bas de page"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr "Racine"
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr "Table des address@hidden"
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr "Vue d'ensemble"
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "Index"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr ""
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr ""
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr "Monter"
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr "Suivant"
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
#, fuzzy
msgid "Forward node"
msgstr "Avant"
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
#, fuzzy
msgid "Back node"
msgstr "address@hidden au dessus"
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr "Fichier suivant"
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr "Fichier pr@'ec@'edent"
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr "Couverture (top) du document"
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr "Table des address@hidden"
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr "R@'esum@'e du contenu"
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr "Section actuelle"
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr "Section pr@'ec@'edente dans l'ordre de lecture"
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr "D@'ebut de ce chapitre ou chapitre pr@'ec@'edent"
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr "Section pr@'ec@'edente au address@hidden niveau"
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr "Section sup@'erieure"
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr "Section suivante au address@hidden niveau"
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr "address@hidden au dessus"
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr "address@hidden suivant"
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr "address@hidden pr@'ec@'edent"
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
#, fuzzy
msgid "Next node in node reading order"
msgstr "Section suivante dans l'ordre de lecture"
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
#, fuzzy
msgid "Previous node in node reading order"
msgstr "Section pr@'ec@'edente dans l'ordre de lecture"
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr "Section suivante dans l'ordre de lecture"
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr "Chapitre suivant"
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr "A propos (page d'aide)"
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr "address@hidden section dans l'ordre de lecture"
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr "address@hidden section dans l'ordre de lecture"
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr ""
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr ""
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr "Ici"
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr "Retour"
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr "RetourRapide"
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr "Pr@'ec@'edent"
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr "address@hidden"
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr "address@hidden"
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr "address@hidden@'ec@'edent"
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
#, fuzzy
msgid "NodeForward"
msgstr "Avant"
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
#, fuzzy
msgid "NodeBack"
msgstr "Retour"
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr "Avant"
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr "AvanceRapide"
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr "A propos"
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr "Premier"
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr "Dernier"
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr "FichierSuivant"
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr ""
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
@@ -259,7 +259,7 @@
"Ce document a @'et@'e g@'en@'er@'e le @emph{{date}} en utilisant @uref"
"{{program_homepage}, @emph{{program}}}"
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
@@ -268,152 +268,152 @@
"Ce document a @'et@'e g@'en@'er@'e en utilisant @uref{{program_homepage}, "
"@emph{{program}}}."
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr ""
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} de {class}"
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} de {class}"
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "voir {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "section `{section}' dans @cite{{book}}"
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "voir @cite{{book}}"
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "voir {reference_name}"
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "Section sup@'erieure"
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Voir {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Voir la section `{section}' dans @cite{{book}}"
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Voir @cite{{book}}"
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "Voir {reference_name}"
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "Section sup@'erieure"
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "voir @cite{{book}}"
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "section `{section}' dans @cite{{book}}"
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "voir {reference_name}"
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "Section sup@'erieure"
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "voir la section {reference_name}"
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr "voir {reference_name}"
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Voir la section {reference_name}"
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Voir {reference_name}"
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr "le @emph{{date}}"
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr ""
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr ""
@@ -470,88 +470,88 @@
msgid "{month} {day}, {year}"
msgstr "le {day} {month} {year}"
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr ""
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr "courante"
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr "Plus haut"
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr "address@hidden au dessus"
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr "Document sans titre"
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " Les boutons de navigation ont la signification suivante :"
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr "Bouton"
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr "Nom"
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr "Aller @`a"
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr "Depuis 1.2.3 aller @`a"
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -560,186 +560,190 @@
" Dans cet exemple on est @`a @strong{ Sous sous section un-deux-trois } "
"dans un document dont la structure est :"
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr "Section un"
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr "Sous section un-un"
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr "Sous section un-deux"
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr "Sous sous section un-deux-un"
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr "Sous sous section un-deux-deux"
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr "Sous sous section un-deux-trois"
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr "Position"
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr "Sous sous section un-deux-quatre"
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr "Sous section un-trois"
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr "Sous section un-quatre"
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Le address@hidden que vous recherchez est ici@ : {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr "Entr@'ee d'index"
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr ""
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr "Aller @`a"
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr ""
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr ""
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr ""
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr "Menu@ :"
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} de {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} de {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
+
#~ msgid "Following"
#~ msgstr "Suivant"
Index: po_document/hu.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/hu.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/hu.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/hu.po 9 Apr 2011 00:10:43 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2009-12-27 22:02+0100\n"
"Last-Translator: Harmath Dénes <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "A navigációs panel használata"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "Tartalomjegyzék"
@@ -32,225 +32,225 @@
msgstr "Rövid tartalomjegyzék"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "Lábjegyzet"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Nincs értéke ennek: `{value}'@}"
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr "CÃmoldal"
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr "Tartalom"
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr "Ãttekintés"
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "Tárgymutató"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr "Aktuális"
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr "ElÅzÅ"
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr "Fel"
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr "KövetkezÅ"
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
#, fuzzy
msgid "Forward node"
msgstr "ElÅre"
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
#, fuzzy
msgid "Back node"
msgstr "SzülŠcsomópont"
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr "KövetkezŠfájl"
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr "ElÅzÅ fájl"
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr "Dokumentum cÃmoldala"
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr "Tartalomjegyzék"
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr "Rövid tartalomjegyzék"
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr "Aktuális szakasz"
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr "ElÅzÅ szakasz az olvasási sorrendben"
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr "Fejezet eleje vagy elÅzÅ fejezet"
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr "ElÅzÅ szakasz ugyanazon a szinten"
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr "SzülŠszakasz"
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr "KövetkezŠszakasz ugyanazon a szinten"
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr "SzülŠcsomópont"
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr "KövetkezŠcsomópont"
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr "ElÅzÅ csomópont"
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
#, fuzzy
msgid "Next node in node reading order"
msgstr "KövetkezŠszakasz az olvasási sorrendben"
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
#, fuzzy
msgid "Previous node in node reading order"
msgstr "ElÅzÅ szakasz az olvasási sorrendben"
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr "KövetkezŠszakasz az olvasási sorrendben"
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr "KövetkezŠfejezet"
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr "SegÃtség a navigációhoz"
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr "ElsŠszakasz az olvasási sorrendben"
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr "Utolsó szakasz az olvasási sorrendben"
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr "KövetkezŠfájl elülsŠszakasza"
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr "ElÅzÅ fájl hátsó szakasza"
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr "Ez a(z)"
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr "Vissza"
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr "Visszaugrás"
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr "ElÅzÅ"
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr "SzülÅCsomópont"
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr "KövetkezÅCsomópont"
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr "ElÅzÅCsomópont"
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
#, fuzzy
msgid "NodeForward"
msgstr "ElÅre"
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
#, fuzzy
msgid "NodeBack"
msgstr "Vissza"
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr "ElÅre"
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr "ElÅreugrás"
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr "Súgó"
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr "ElsÅ"
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr "Utolsó"
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr "KövetkezÅFájl"
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr "ElÅzÅFájl"
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
@@ -259,7 +259,7 @@
"Ezt a dokumentumot @i{{date}} napon generálta a(z) @uref{{program_homepage},
"
"@i{{program}}}."
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
@@ -268,152 +268,152 @@
"Ezt a dokumentumot a(z) @uref{{program_homepage}, @emph{{program}}} "
"generálta."
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr "{style} {number}"
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr "{style}: {caption_first_line}"
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr "{style}: {shortcaption_first_line}"
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} ezen: {class}"
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} tÃpusa: {class}"
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "ld. {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "szakasz: `{section}' itt: @cite{{book}}"
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "ld. @cite{{book}}"
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "ld. {reference_name}"
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "SzülŠszakasz"
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "See {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Ld. ezt a szakaszt: `{section}' itt: @cite{{book}}"
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Ld. @cite{{book}}"
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "Ld. {reference_name}"
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "SzülŠszakasz"
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "szakasz: `{section}' itt: @cite{{book}}"
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "{reference_name}"
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "SzülŠszakasz"
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "ld. ezt a szakaszt: {reference_name}"
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr "ld. {reference_name}"
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Ld. ezt a szakaszt: {reference_name}"
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Ld. {reference_name}"
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr "ekkor: @emph{{date}}"
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr "{acronym_like} ({explanation})"
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr "(bármelyik elemen kÃvül)"
@@ -470,90 +470,90 @@
msgid "{month} {day}, {year}"
msgstr ""
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr "szakasz: address@hidden'@asis{}' itt: @cite{{book}}"
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
"Ld. ezt a szakaszt: address@hidden'@asis{}' itt: @cite{{book}}"
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
"ld. ezt a szakaszt: address@hidden'@asis{}' itt: @cite{{book}}"
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr "{ref}"
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr "ld. {ref}"
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr "Ld. {ref}"
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr "ld. {title_ref}"
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Ld. {title_ref}"
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr "aktuális"
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr "Fel"
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr "SzülŠcsomópont"
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr "Névtelen dokumentum"
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " A navigációs panelen levÅ gombok jelentése a következÅ:"
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr "Gomb"
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr "Név"
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr "Cél"
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr "1.2.3-ból ide jutunk"
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -562,186 +562,190 @@
" @strong{ Példánkban } az aktuális pozÃció az @strong{ 1.2.3
alalszakasz } "
"egy olyan dokumentumban, melynek szerkezete a következÅ:"
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr "szakasz"
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr "alszakasz"
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr "alszakasz"
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr "alalszakasz"
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr "alalszakasz"
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr "alalszakasz"
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr "Aktuális pozÃció"
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr "alalszakasz"
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr "alszakasz"
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr "alszakasz"
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "A keresett csomópont itt található: {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr "Tárgymutató-bejegyzés"
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr "Szakasz"
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr "Ugorj ide"
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr "(bármelyik csomóponton kÃvül)"
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr "ld. "
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr "Ld. "
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr "Menü:"
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, fuzzy, perl-brace-format
msgid "{category} on {class}"
msgstr "{name} ezen: {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, fuzzy, perl-brace-format
msgid "{category} of {class}"
msgstr "{name} tÃpusa: {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, fuzzy, perl-brace-format
msgid "{float_number}"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, fuzzy, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{acronym_like} ({explanation})"
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
+
#~ msgid "Following"
#~ msgstr "KövetkezÅ"
Index: po_document/it.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/it.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/it.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/it.po 9 Apr 2011 00:10:43 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2009-12-27 22:02+0100\n"
"Last-Translator: Federico Bruni <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "Informazioni su questo documento"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "Indice"
@@ -32,225 +32,225 @@
msgstr "Indice breve"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "Note a piè di pagina"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr "@{Nessun valore per `{value}'@}"
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr "Inizio"
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr "Contenuti"
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr "Panoramica"
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "Indice"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr "Attuale"
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr "Precedente"
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr "Su"
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr "Successivo"
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
#, fuzzy
msgid "Forward node"
msgstr "Avanti"
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
#, fuzzy
msgid "Back node"
msgstr "Nodo superiore"
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr "File successivo"
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr "File precedente"
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr "Copertina (inizio) del documento"
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr "Indice"
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr "Indice breve"
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr "Sezione attuale"
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr "Sezione precedente in ordine di lettura"
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr "Inizio di questo capitolo o capitolo precedente"
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr "Sezione precedente sullo stesso livello"
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr "Sezione superiore"
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr "Sezione successiva sullo stesso livello"
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr "Nodo superiore"
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr "Nodo successivo"
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr "Nodo precedente"
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
#, fuzzy
msgid "Next node in node reading order"
msgstr "Sezione successiva in ordine di lettura"
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
#, fuzzy
msgid "Previous node in node reading order"
msgstr "Sezione precedente in ordine di lettura"
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr "Sezione successiva in ordine di lettura"
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr "Capitolo successivo"
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr "Informazioni (aiuto)"
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr "Prima sezione in ordine di lettura"
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr "Ultima sezione in ordine di lettura"
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr "Sezione successiva nel prossimo file"
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr ""
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr "Questo"
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr "Indietro"
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr "Indietro veloce"
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr "Prec."
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr "Nodo superiore"
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr "Nodo successivo"
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr "Nodo precedente"
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
#, fuzzy
msgid "NodeForward"
msgstr "Avanti"
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
#, fuzzy
msgid "NodeBack"
msgstr "Indietro"
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr "Avanti"
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr "Avanti veloce"
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr "Informazioni"
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr "Primo"
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr "Ultimo"
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr "File successivo"
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr "File precedente"
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
@@ -259,7 +259,7 @@
"Questo documento è stato generato il @i{{date}} con @uref"
"{{program_homepage}, @i{{program}}}."
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
@@ -268,152 +268,152 @@
"Questo documento è stato generato con @uref{{program_homepage}, @emph"
"{{program}}}."
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr "{style} {number}"
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr "{style}: {caption_first_line}"
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr "{style}: {shortcaption_first_line}"
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} in {class}"
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} di {class}"
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "vedi {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "sezione `{section}' in @cite{{book}}"
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "vedi @cite{{book}}"
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "vedi {reference_name}"
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "Sezione superiore"
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Vedi {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Vedi la sezione `{section}' in @cite{{book}}"
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Vedi @cite{{book}}"
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "Vedi {reference_name}"
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "Sezione superiore"
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "sezione `{section}' in @cite{{book}}"
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr "@cite{{book}}"
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "{reference_name}"
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "Sezione superiore"
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "vedi la sezione {reference_name}"
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr "vedi {reference_name}"
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Vedi la sezione {reference_name}"
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Vedi {reference_name}"
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr "{reference_name}"
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr "il @emph{{date}}"
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr "{acronym_like} ({explanation})"
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr "@b{{quotation_arg}:} "
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr "(fuori da qualsiasi elemento)"
@@ -470,88 +470,88 @@
msgid "{month} {day}, {year}"
msgstr ""
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr "sezione address@hidden'@asis{}' in @cite{{book}}"
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr "Vedi la sezione address@hidden'@asis{}' in @cite{{book}}"
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr "vedi la sezione address@hidden'@asis{}' in @cite{{book}}"
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr "{ref}"
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr "vedi {ref}"
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr "Vedi {ref}"
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr "{title_ref}"
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr "vedi {title_ref}"
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr "Vedi {title_ref}"
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr "attuale"
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr " Su "
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr "Nodo superiore"
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr "Documento senza titolo"
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr " I bottoni nei pannelli di navigazione hanno il seguente significato:"
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr "Bottone"
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr "Nome"
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr "Vai a"
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr "Da 1.2.3 vai a"
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -561,186 +561,190 @@
"{ Sottosottosezione Uno-Due-Tre } di un documento che ha la seguente "
"struttura:"
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr "Sezione uno"
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr "Sottosezione Uno-Uno"
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr "Sottosezione Uno-Due"
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr "Sottosottosezione Uno-Due-Uno"
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr "Sottosottosezione Uno-Due-Due"
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr "Sottosottosezione Uno-Due-Tre"
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr "Posizione Attuale"
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr "Sottosottosezione Uno-Due-Quattro"
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr "Sottosezione Uno-Tre"
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr "Sottosezione Uno-Quattro"
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "Il nodo che stai cercando è {href}"
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr "Voce dell'indice"
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr "Sezione"
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr "Salta a"
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr "(fuori da qualsiasi nodo)"
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr "vedi "
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr "Vedi"
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr "Menu"
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, fuzzy, perl-brace-format
msgid "{category} on {class}"
msgstr "{name} in {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, fuzzy, perl-brace-format
msgid "{category} of {class}"
msgstr "{name} di {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, fuzzy, perl-brace-format
msgid "{float_number}"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, fuzzy, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr "{acronym_like} ({explanation})"
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, fuzzy, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr "{style} {number}"
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
+
#~ msgid "Following"
#~ msgstr "Seguente"
Index: po_document/ja.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/ja.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/ja.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/ja.po 9 Apr 2011 00:10:43 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2007-02-05\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "ãã®ææ¸ã«ã¤ãã¦"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "ç®æ¬¡"
@@ -32,219 +32,219 @@
msgstr "ç°¡ç¥åããç®æ¬¡"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "è注"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr "åé "
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr "ç®æ¬¡"
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr "æ¦è¦"
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "è¦åºã"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr ""
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr ""
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr ""
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr "次"
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
msgid "Forward node"
msgstr ""
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
msgid "Back node"
msgstr ""
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr ""
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr ""
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr ""
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr ""
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr ""
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr ""
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr ""
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr ""
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr ""
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr ""
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr ""
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr ""
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr ""
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
msgid "Next node in node reading order"
msgstr ""
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
msgid "Previous node in node reading order"
msgstr ""
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr ""
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr ""
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr ""
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr ""
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr ""
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr ""
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr ""
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr "å"
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr ""
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr ""
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr ""
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
msgid "NodeForward"
msgstr ""
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
msgid "NodeBack"
msgstr ""
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr ""
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr ""
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr ""
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr ""
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr ""
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr ""
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr ""
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
@@ -253,7 +253,7 @@
"address@hidden@uref{{program_homepage}, @emph{{program}}}ãç¨ãã¦"
"çæããã¾ããã"
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
@@ -261,152 +261,152 @@
msgstr ""
"address@hidden, @emph{{program}}}ãç¨ãã¦çæããã¾ããã"
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr ""
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr ""
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr ""
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "{node_file_href} @cite{{book}}åç
§"
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "@cite{{book}}ã® `{section}' "
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "{node_file_href}åç
§"
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, perl-brace-format
msgid "see `{section}'"
msgstr ""
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "{node_file_href} @cite{{book}}åç
§"
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "@cite{{book}}ã® `{section}' "
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, perl-brace-format
msgid "See {reference}"
msgstr ""
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "é
"
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "{node_file_href} @cite{{book}}åç
§"
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "@cite{{book}}ã® `{section}' "
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, perl-brace-format
msgid "{reference}"
msgstr ""
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "é
"
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr "@emph{{date}}"
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr ""
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr ""
@@ -463,88 +463,88 @@
msgid "{month} {day}, {year}"
msgstr ""
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr ""
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr "ç¾å¨ä½ç½®"
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr "ä¸"
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr ""
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr "ç¡é¡ã®ææ¸"
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr
"ããã²ã¼ã·ã§ã³ããã«ä¸ã®ãã¿ã³ã«ã¯ä»¥ä¸ã®æå³ãããã¾ãã"
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr "ãã¿ã³"
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr "å称"
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr "移åå
"
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr "1.2.3é
ããã®ç§»åå
"
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -553,182 +553,186 @@
"@address@hidden"
"ã¦ãã¾ãã"
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr "第1é
"
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr "第1.1é
"
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr "第1.2é
"
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr "第1.2.1é
"
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr "第1.2.2é
"
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr "第1.2.3é
"
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr "ç¾å¨ä½ç½®"
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr "第1.2.4é
"
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr "第1.3é
"
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr "第1.4é
"
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr ""
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr "è¦åºãä¸è¦§"
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr "é
"
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr "移å"
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr ""
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr ""
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr ""
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr "ã¡ãã¥ã¼"
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, perl-brace-format
msgid "{category} on {class}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, perl-brace-format
msgid "{category} of {class}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
Index: po_document/nl.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/nl.us-ascii.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/nl.us-ascii.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/nl.us-ascii.po 9 Apr 2011 00:10:43 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2001-01-01\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "No translation available!"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "Inhoudsopgave"
@@ -32,378 +32,378 @@
msgstr "Korte inhoudsopgave"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "No translation available!"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr ""
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr ""
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr ""
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "Index"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr ""
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr ""
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr ""
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr ""
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
msgid "Forward node"
msgstr ""
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
msgid "Back node"
msgstr ""
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr ""
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr ""
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr ""
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr ""
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr ""
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr ""
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr ""
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr ""
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr ""
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr ""
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr ""
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr ""
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr ""
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
msgid "Next node in node reading order"
msgstr ""
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
msgid "Previous node in node reading order"
msgstr ""
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr ""
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr ""
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr ""
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr ""
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr ""
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr ""
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr ""
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr ""
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr ""
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr ""
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr ""
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
msgid "NodeForward"
msgstr ""
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
msgid "NodeBack"
msgstr ""
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr ""
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr ""
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr ""
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr ""
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr ""
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr ""
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr ""
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
"@emph{{program}}}."
msgstr ""
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
"{{program}}}."
msgstr ""
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr ""
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr ""
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr ""
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, perl-brace-format
msgid "see {reference}"
msgstr ""
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, perl-brace-format
msgid "see `{section}'"
msgstr ""
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, perl-brace-format
msgid "See {reference}"
msgstr ""
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, perl-brace-format
msgid "See `{section}'"
msgstr ""
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, perl-brace-format
msgid "{reference}"
msgstr ""
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, perl-brace-format
msgid "`{section}'"
msgstr ""
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr ""
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr ""
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr ""
@@ -460,270 +460,274 @@
msgid "{month} {day}, {year}"
msgstr ""
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr ""
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr ""
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr ""
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr ""
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr ""
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr ""
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr ""
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr ""
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr ""
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
"structure:"
msgstr ""
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr ""
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr ""
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr ""
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr ""
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr ""
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr ""
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr ""
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr ""
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr ""
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr ""
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr ""
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr ""
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr ""
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr ""
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr ""
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr ""
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, perl-brace-format
msgid "{category} on {class}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, perl-brace-format
msgid "{category} of {class}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
Index: po_document/no.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/no.us-ascii.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/no.us-ascii.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/no.us-ascii.po 9 Apr 2011 00:10:43 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2001-01-01\n"
"Last-Translator: Unknown\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "No translation available!"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "Innholdsfortegnelse"
@@ -32,378 +32,378 @@
msgstr "Kort innholdsfortegnelse"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "No translation available!"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr ""
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr ""
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr ""
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "Indeks"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr ""
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr ""
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr ""
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr ""
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
msgid "Forward node"
msgstr ""
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
msgid "Back node"
msgstr ""
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr ""
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr ""
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr ""
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr ""
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr ""
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr ""
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr ""
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr ""
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr ""
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr ""
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr ""
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr ""
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr ""
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
msgid "Next node in node reading order"
msgstr ""
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
msgid "Previous node in node reading order"
msgstr ""
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr ""
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr ""
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr ""
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr ""
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr ""
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr ""
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr ""
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr ""
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr ""
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr ""
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr ""
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr ""
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
msgid "NodeForward"
msgstr ""
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
msgid "NodeBack"
msgstr ""
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr ""
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr ""
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr ""
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr ""
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr ""
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr ""
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr ""
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
"@emph{{program}}}."
msgstr ""
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
"{{program}}}."
msgstr ""
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr ""
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr ""
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr ""
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, perl-brace-format
msgid "see {reference}"
msgstr ""
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, perl-brace-format
msgid "see `{section}'"
msgstr ""
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, perl-brace-format
msgid "See {reference}"
msgstr ""
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, perl-brace-format
msgid "See `{section}'"
msgstr ""
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, perl-brace-format
msgid "{reference}"
msgstr ""
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, perl-brace-format
msgid "`{section}'"
msgstr ""
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr ""
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr ""
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr ""
@@ -460,270 +460,274 @@
msgid "{month} {day}, {year}"
msgstr ""
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr ""
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr ""
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr ""
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr ""
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr ""
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr ""
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr ""
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr ""
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr ""
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
"structure:"
msgstr ""
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr ""
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr ""
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr ""
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr ""
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr ""
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr ""
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr ""
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr ""
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr ""
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr ""
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr ""
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr ""
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr ""
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr ""
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr ""
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr ""
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, perl-brace-format
msgid "{category} on {class}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, perl-brace-format
msgid "{category} of {class}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
Index: po_document/pt.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/pt.us-ascii.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/pt.us-ascii.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/pt.us-ascii.po 9 Apr 2011 00:10:43 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2006-01-09\n"
"Last-Translator: Jorge Barros de Abreu <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "Sobre Esse Documento"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "Sum@'ario"
@@ -32,225 +32,225 @@
msgstr "Breve Sum@'ario"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "Notas de Rodap@'e"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr "Topo"
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr "Conte@'udo"
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr "address@hidden geral"
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "@'Indice"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr ""
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr ""
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr "Acima"
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr "Pr@'oximo"
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
#, fuzzy
msgid "Forward node"
msgstr "Avan@,{c}ar"
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
#, fuzzy
msgid "Back node"
msgstr "Nodo acima"
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr ""
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr ""
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr "In@'icio (topo) do documento"
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr "Sum@'ario"
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr "Breve sum@'ario"
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr "Se@,address@hidden atual"
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr "Se@,address@hidden anterior na ordem de leitura"
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr "Se@,address@hidden anterior no mesmo n@'ivel"
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr "Se@,address@hidden acima"
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr "Pr@'oxima se@,address@hidden no mesmo n@'ivel"
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr "Nodo acima"
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr "Pr@'oximo nodo"
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr "Nodo anterior"
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
#, fuzzy
msgid "Next node in node reading order"
msgstr "Pr@'oxima se@,address@hidden na ordem de leitura"
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
#, fuzzy
msgid "Previous node in node reading order"
msgstr "Se@,address@hidden anterior na ordem de leitura"
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr "Pr@'oxima se@,address@hidden na ordem de leitura"
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr "Pr@'oximo cap@'itulo"
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr "Sobre (ajuda)"
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr "Primeira se@,address@hidden na ordem de leitura"
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr "@'Ultima se@,address@hidden na ordem de leitura"
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr ""
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr ""
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr "Esse"
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr "Volta"
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr "Voltar R@'apido"
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr "Pr@'evio"
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr "Nodo Acima"
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr "Pr@'oximo Nodo"
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr "Nodo Anterior"
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
#, fuzzy
msgid "NodeForward"
msgstr "Avan@,{c}ar"
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
#, fuzzy
msgid "NodeBack"
msgstr "Volta"
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr "Avan@,{c}ar"
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr "Avan@,{c}ar R@'apido"
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr "Sobre"
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr "Primeiro"
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr "@'Ultimo"
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr ""
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr ""
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
@@ -259,7 +259,7 @@
"Esse documento foi gerado em @i{{date}} usando @uref{{program_homepage}, @i"
"{{program}}}."
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
@@ -267,152 +267,152 @@
msgstr ""
"Esse documento foi gerado usando @uref{{program_homepage}, @emph{{program}}}."
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr ""
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} na {class}"
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} da {class}"
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "veja {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "se@,address@hidden `{section}' em @cite{{book}}"
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "veja {reference_name}"
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "Se@,address@hidden acima"
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Veja {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Veja se@,address@hidden `{section}' em @cite{{book}}"
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "Veja {reference_name}"
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "Se@,address@hidden acima"
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "se@,address@hidden `{section}' em @cite{{book}}"
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "veja {reference_name}"
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "Se@,address@hidden acima"
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "veja se@,address@hidden {reference_name}"
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr "veja {reference_name}"
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Veja se@,address@hidden {reference_name}"
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Veja {reference_name}"
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr "em @emph{{date}}"
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr ""
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr ""
@@ -469,90 +469,90 @@
msgid "{month} {day}, {year}"
msgstr "{day} de {month} de {year}"
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr ""
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr "atual"
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr " Acima "
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr "Nodo acima"
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr "Documento Sem Nome"
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" Os address@hidden nos pain@'eis de navega@,address@hidden possuem os
seguintes "
"significados:"
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr "address@hidden"
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr "Nome"
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr "V@'a para"
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr "De 1.2.3 v@'a para"
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -562,186 +562,190 @@
"@strong{ Subsub@,address@hidden address@hidden } de um documento com a
seguinte "
"estrutura:"
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr "Se@,address@hidden Um"
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr "Subse@,address@hidden Um-Um"
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr "Subse@,address@hidden Um-Dois"
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr "Subse@,address@hidden Um-Dois-Um"
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr "Subse@,address@hidden Um-Dois-Dois"
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr "Subse@,address@hidden address@hidden"
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr "Posi@,address@hidden Atual"
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr "Subse@,address@hidden Um-Dois-Quatro"
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr "Subse@,address@hidden address@hidden"
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr "Subse@,address@hidden Um-Quatro"
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "O nodo que address@hidden est@'a olhando est@'a em {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr "Entrada de @'Indice"
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr "Se@,address@hidden"
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr "Pular para"
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr ""
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr ""
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr ""
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, perl-brace-format
msgid "{category} on {class}"
msgstr "{category} na {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, perl-brace-format
msgid "{category} of {class}"
msgstr "{category} da {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
+
#~ msgid "Following"
#~ msgstr "Seguinte"
Index: po_document/pt_BR.us-ascii.po
===================================================================
RCS file: /sources/texinfo/texinfo/po_document/pt_BR.us-ascii.po,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- po_document/pt_BR.us-ascii.po 6 Apr 2011 23:44:08 -0000 1.26
+++ po_document/pt_BR.us-ascii.po 9 Apr 2011 00:10:43 -0000 1.27
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: texi2html 1.83\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2011-04-06 22:00+0200\n"
+"POT-Creation-Date: 2011-04-09 01:24+0200\n"
"PO-Revision-Date: 2006-01-09\n"
"Last-Translator: Jorge Barros de Abreu <address@hidden>\n"
"Language-Team: Unknown\n"
@@ -22,7 +22,7 @@
msgstr "Sobre Esse Documento"
#: texi2html/texi2html.pl:6268 texi2html/texi2html.pl:6272
-#: texi2html/texi2html.pl:6276 texi2html/examples/roff.init:989
+#: texi2html/texi2html.pl:6276 texi2html/examples/roff.pm:989
msgid "Table of Contents"
msgstr "Sum@'ario"
@@ -32,225 +32,225 @@
msgstr "Breve Sum@'ario"
#: texi2html/texi2html.pl:6270 texi2html/texi2html.pl:6274
-#: texi2html/texi2html.pl:6278 texi2html/texi2html.init:6745
-#: texi2html/formats/html.init:2416
+#: texi2html/texi2html.pl:6278 texi2html/texi2html.pm:6745
+#: texi2html/formats/html.pm:2416
msgid "Footnotes"
msgstr "Notas de Rodap@'e"
-#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1570
+#: texi2html/texi2html.pl:13002 tp/Texinfo/Convert/Plaintext.pm:1569
#, perl-brace-format
msgid "@{No value for `{value}'@}"
msgstr ""
-#: texi2html/texi2html.init:1101 texi2html/texi2html.init:1155
-#: texi2html/formats/html.init:615
+#: texi2html/texi2html.pm:1101 texi2html/texi2html.pm:1155
+#: texi2html/formats/html.pm:615
msgid "Top"
msgstr "Topo"
-#: texi2html/texi2html.init:1102 texi2html/texi2html.init:1156
-#: texi2html/formats/html.init:616
+#: texi2html/texi2html.pm:1102 texi2html/texi2html.pm:1156
+#: texi2html/formats/html.pm:616
msgid "Contents"
msgstr "Conte@'udo"
-#: texi2html/texi2html.init:1103 texi2html/texi2html.init:1157
-#: texi2html/formats/html.init:617
+#: texi2html/texi2html.pm:1103 texi2html/texi2html.pm:1157
+#: texi2html/formats/html.pm:617
msgid "Overview"
msgstr "address@hidden geral"
-#: texi2html/texi2html.init:1104 texi2html/texi2html.init:1132
-#: texi2html/texi2html.init:1158 texi2html/formats/html.init:618
+#: texi2html/texi2html.pm:1104 texi2html/texi2html.pm:1132
+#: texi2html/texi2html.pm:1158 texi2html/formats/html.pm:618
msgid "Index"
msgstr "@'Indice"
-#: texi2html/texi2html.init:1106
+#: texi2html/texi2html.pm:1106
msgid "Current"
msgstr ""
-#: texi2html/texi2html.init:1109 texi2html/texi2html.init:1114
+#: texi2html/texi2html.pm:1109 texi2html/texi2html.pm:1114
msgid "Previous"
msgstr ""
-#: texi2html/texi2html.init:1110 texi2html/texi2html.init:1112
-#: texi2html/texi2html.init:1164
+#: texi2html/texi2html.pm:1110 texi2html/texi2html.pm:1112
+#: texi2html/texi2html.pm:1164
msgid "Up"
msgstr "Acima"
-#: texi2html/texi2html.init:1111 texi2html/texi2html.init:1113
-#: texi2html/texi2html.init:1165 texi2html/formats/html.init:625
+#: texi2html/texi2html.pm:1111 texi2html/texi2html.pm:1113
+#: texi2html/texi2html.pm:1165 texi2html/formats/html.pm:625
msgid "Next"
msgstr "Pr@'oximo"
-#: texi2html/texi2html.init:1115 texi2html/formats/html.init:629
+#: texi2html/texi2html.pm:1115 texi2html/formats/html.pm:629
#, fuzzy
msgid "Forward node"
msgstr "Avan@,{c}ar"
-#: texi2html/texi2html.init:1116 texi2html/formats/html.init:630
+#: texi2html/texi2html.pm:1116 texi2html/formats/html.pm:630
#, fuzzy
msgid "Back node"
msgstr "Nodo acima"
-#: texi2html/texi2html.init:1122 texi2html/formats/html.init:636
+#: texi2html/texi2html.pm:1122 texi2html/formats/html.pm:636
msgid "Next file"
msgstr ""
-#: texi2html/texi2html.init:1123 texi2html/formats/html.init:637
+#: texi2html/texi2html.pm:1123 texi2html/formats/html.pm:637
msgid "Previous file"
msgstr ""
-#: texi2html/texi2html.init:1129
+#: texi2html/texi2html.pm:1129
msgid "Cover (top) of document"
msgstr "In@'icio (topo) do documento"
-#: texi2html/texi2html.init:1130
+#: texi2html/texi2html.pm:1130
msgid "Table of contents"
msgstr "Sum@'ario"
-#: texi2html/texi2html.init:1131
+#: texi2html/texi2html.pm:1131
msgid "Short table of contents"
msgstr "Breve sum@'ario"
-#: texi2html/texi2html.init:1133
+#: texi2html/texi2html.pm:1133
msgid "Current section"
msgstr "Se@,address@hidden atual"
-#: texi2html/texi2html.init:1134
+#: texi2html/texi2html.pm:1134
msgid "Previous section in reading order"
msgstr "Se@,address@hidden anterior na ordem de leitura"
-#: texi2html/texi2html.init:1135
+#: texi2html/texi2html.pm:1135
msgid "Beginning of this chapter or previous chapter"
msgstr "Come@,{c}o desse cap@'itulo ou cap@'itulo anterior"
-#: texi2html/texi2html.init:1136
+#: texi2html/texi2html.pm:1136
msgid "Previous section on same level"
msgstr "Se@,address@hidden anterior no mesmo n@'ivel"
-#: texi2html/texi2html.init:1137
+#: texi2html/texi2html.pm:1137
msgid "Up section"
msgstr "Se@,address@hidden acima"
-#: texi2html/texi2html.init:1138
+#: texi2html/texi2html.pm:1138
msgid "Next section on same level"
msgstr "Pr@'oxima se@,address@hidden no mesmo n@'ivel"
-#: texi2html/texi2html.init:1139
+#: texi2html/texi2html.pm:1139
msgid "Up node"
msgstr "Nodo acima"
-#: texi2html/texi2html.init:1140 texi2html/formats/html.init:627
+#: texi2html/texi2html.pm:1140 texi2html/formats/html.pm:627
msgid "Next node"
msgstr "Pr@'oximo nodo"
-#: texi2html/texi2html.init:1141 texi2html/formats/html.init:628
+#: texi2html/texi2html.pm:1141 texi2html/formats/html.pm:628
msgid "Previous node"
msgstr "Nodo anterior"
-#: texi2html/texi2html.init:1142
+#: texi2html/texi2html.pm:1142
#, fuzzy
msgid "Next node in node reading order"
msgstr "Pr@'oxima se@,address@hidden na ordem de leitura"
-#: texi2html/texi2html.init:1143
+#: texi2html/texi2html.pm:1143
#, fuzzy
msgid "Previous node in node reading order"
msgstr "Se@,address@hidden anterior na ordem de leitura"
-#: texi2html/texi2html.init:1144
+#: texi2html/texi2html.pm:1144
msgid "Next section in reading order"
msgstr "Pr@'oxima se@,address@hidden na ordem de leitura"
-#: texi2html/texi2html.init:1145
+#: texi2html/texi2html.pm:1145
msgid "Next chapter"
msgstr "Pr@'oximo cap@'itulo"
-#: texi2html/texi2html.init:1146
+#: texi2html/texi2html.pm:1146
msgid "About (help)"
msgstr "Sobre (ajuda)"
-#: texi2html/texi2html.init:1147
+#: texi2html/texi2html.pm:1147
msgid "First section in reading order"
msgstr "Primeira se@,address@hidden na ordem de leitura"
-#: texi2html/texi2html.init:1148
+#: texi2html/texi2html.pm:1148
msgid "Last section in reading order"
msgstr "@'Ultima se@,address@hidden na ordem de leitura"
-#: texi2html/texi2html.init:1149
+#: texi2html/texi2html.pm:1149
msgid "Forward section in next file"
msgstr ""
-#: texi2html/texi2html.init:1150
+#: texi2html/texi2html.pm:1150
msgid "Back section in previous file"
msgstr ""
-#: texi2html/texi2html.init:1160
+#: texi2html/texi2html.pm:1160
msgid "This"
msgstr "Esse"
-#: texi2html/texi2html.init:1161
+#: texi2html/texi2html.pm:1161
msgid "Back"
msgstr "Volta"
-#: texi2html/texi2html.init:1162
+#: texi2html/texi2html.pm:1162
msgid "FastBack"
msgstr "Voltar R@'apido"
-#: texi2html/texi2html.init:1163 texi2html/formats/html.init:623
+#: texi2html/texi2html.pm:1163 texi2html/formats/html.pm:623
msgid "Prev"
msgstr "Pr@'evio"
-#: texi2html/texi2html.init:1166
+#: texi2html/texi2html.pm:1166
msgid "NodeUp"
msgstr "Nodo Acima"
-#: texi2html/texi2html.init:1167
+#: texi2html/texi2html.pm:1167
msgid "NodeNext"
msgstr "Pr@'oximo Nodo"
-#: texi2html/texi2html.init:1168
+#: texi2html/texi2html.pm:1168
msgid "NodePrev"
msgstr "Nodo Anterior"
-#: texi2html/texi2html.init:1169
+#: texi2html/texi2html.pm:1169
#, fuzzy
msgid "NodeForward"
msgstr "Avan@,{c}ar"
-#: texi2html/texi2html.init:1170
+#: texi2html/texi2html.pm:1170
#, fuzzy
msgid "NodeBack"
msgstr "Volta"
-#: texi2html/texi2html.init:1171
+#: texi2html/texi2html.pm:1171
msgid "Forward"
msgstr "Avan@,{c}ar"
-#: texi2html/texi2html.init:1172
+#: texi2html/texi2html.pm:1172
msgid "FastForward"
msgstr "Avan@,{c}ar R@'apido"
-#: texi2html/texi2html.init:1173
+#: texi2html/texi2html.pm:1173
msgid "About"
msgstr "Sobre"
-#: texi2html/texi2html.init:1174
+#: texi2html/texi2html.pm:1174
msgid "First"
msgstr "Primeiro"
-#: texi2html/texi2html.init:1175
+#: texi2html/texi2html.pm:1175
msgid "Last"
msgstr "@'Ultimo"
-#: texi2html/texi2html.init:1176
+#: texi2html/texi2html.pm:1176
msgid "NextFile"
msgstr ""
-#: texi2html/texi2html.init:1177
+#: texi2html/texi2html.pm:1177
msgid "PrevFile"
msgstr ""
-#: texi2html/texi2html.init:1773
+#: texi2html/texi2html.pm:1773
#, fuzzy, perl-brace-format
msgid ""
"This document was generated on @emph{{date}} using @uref{{program_homepage}, "
@@ -259,7 +259,7 @@
"Esse documento foi gerado em @i{{date}} usando @uref{{program_homepage}, @i"
"{{program}}}."
-#: texi2html/texi2html.init:1776
+#: texi2html/texi2html.pm:1776
#, perl-brace-format
msgid ""
"This document was generated using @uref{{program_homepage}, @emph"
@@ -267,152 +267,152 @@
msgstr ""
"Esse documento foi gerado usando @uref{{program_homepage}, @emph{{program}}}."
-#: texi2html/texi2html.init:5389 texi2html/texi2html.init:5512
-#: texi2html/formats/html.init:1478 texi2html/formats/html.init:1576
+#: texi2html/texi2html.pm:5389 texi2html/texi2html.pm:5512
+#: texi2html/formats/html.pm:1478 texi2html/formats/html.pm:1576
#, perl-brace-format
msgid "{style} {number}"
msgstr ""
-#: texi2html/texi2html.init:5411 texi2html/formats/html.init:1492
+#: texi2html/texi2html.pm:5411 texi2html/formats/html.pm:1492
#, perl-brace-format
msgid "{style}: {caption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5439 texi2html/formats/html.init:1509
+#: texi2html/texi2html.pm:5439 texi2html/formats/html.pm:1509
#, perl-brace-format
msgid "{style}: {shortcaption_first_line}"
msgstr ""
-#: texi2html/texi2html.init:5744 texi2html/texi2html.init:5765
+#: texi2html/texi2html.pm:5744 texi2html/texi2html.pm:5765
#: tp/Texinfo/Parser.pm:2082
#, perl-brace-format
msgid "{name} on {class}"
msgstr "{name} na {class}"
-#: texi2html/texi2html.init:5748 texi2html/texi2html.init:5769
+#: texi2html/texi2html.pm:5748 texi2html/texi2html.pm:5769
#: tp/Texinfo/Parser.pm:2087
#, perl-brace-format
msgid "{name} of {class}"
msgstr "{name} da {class}"
-#: texi2html/texi2html.init:6090
+#: texi2html/texi2html.pm:6090
#, fuzzy, perl-brace-format
msgid "see {reference} in @cite{{book}}"
msgstr "veja {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6094
+#: texi2html/texi2html.pm:6094
#, fuzzy, perl-brace-format
msgid "see `{section}' in @cite{{book}}"
msgstr "se@,address@hidden `{section}' em @cite{{book}}"
-#: texi2html/texi2html.init:6098
+#: texi2html/texi2html.pm:6098
#, perl-brace-format
msgid "see @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: texi2html/texi2html.init:6102
+#: texi2html/texi2html.pm:6102
#, fuzzy, perl-brace-format
msgid "see {reference}"
msgstr "veja {reference_name}"
-#: texi2html/texi2html.init:6106
+#: texi2html/texi2html.pm:6106
#, fuzzy, perl-brace-format
msgid "see `{section}'"
msgstr "Se@,address@hidden acima"
-#: texi2html/texi2html.init:6113
+#: texi2html/texi2html.pm:6113
#, fuzzy, perl-brace-format
msgid "See {reference} in @cite{{book}}"
msgstr "Veja {node_file_href} @cite{{book}}"
-#: texi2html/texi2html.init:6117
+#: texi2html/texi2html.pm:6117
#, fuzzy, perl-brace-format
msgid "See `{section}' in @cite{{book}}"
msgstr "Veja se@,address@hidden `{section}' em @cite{{book}}"
-#: texi2html/texi2html.init:6121
+#: texi2html/texi2html.pm:6121
#, perl-brace-format
msgid "See @cite{{book}}"
msgstr "Veja @cite{{book}}"
-#: texi2html/texi2html.init:6125
+#: texi2html/texi2html.pm:6125
#, fuzzy, perl-brace-format
msgid "See {reference}"
msgstr "Veja {reference_name}"
-#: texi2html/texi2html.init:6129
+#: texi2html/texi2html.pm:6129
#, fuzzy, perl-brace-format
msgid "See `{section}'"
msgstr "Se@,address@hidden acima"
-#: texi2html/texi2html.init:6136
+#: texi2html/texi2html.pm:6136
#, fuzzy, perl-brace-format
msgid "{reference} in @cite{{book}}"
msgstr "veja @cite{{book}}"
-#: texi2html/texi2html.init:6140
+#: texi2html/texi2html.pm:6140
#, fuzzy, perl-brace-format
msgid "`{section}' in @cite{{book}}"
msgstr "se@,address@hidden `{section}' em @cite{{book}}"
-#: texi2html/texi2html.init:6144
+#: texi2html/texi2html.pm:6144
#, perl-brace-format
msgid "@cite{{book}}"
msgstr ""
-#: texi2html/texi2html.init:6148
+#: texi2html/texi2html.pm:6148
#, fuzzy, perl-brace-format
msgid "{reference}"
msgstr "veja {reference_name}"
-#: texi2html/texi2html.init:6152
+#: texi2html/texi2html.pm:6152
#, fuzzy, perl-brace-format
msgid "`{section}'"
msgstr "Se@,address@hidden acima"
-#: texi2html/texi2html.init:6187
+#: texi2html/texi2html.pm:6187
#, perl-brace-format
msgid "see section {reference_name}"
msgstr "veja se@,address@hidden {reference_name}"
-#: texi2html/texi2html.init:6188 texi2html/texi2html.init:6205
+#: texi2html/texi2html.pm:6188 texi2html/texi2html.pm:6205
#, perl-brace-format
msgid "see {reference_name}"
msgstr "veja {reference_name}"
-#: texi2html/texi2html.init:6192
+#: texi2html/texi2html.pm:6192
#, perl-brace-format
msgid "See section {reference_name}"
msgstr "Veja se@,address@hidden {reference_name}"
-#: texi2html/texi2html.init:6193 texi2html/texi2html.init:6209
+#: texi2html/texi2html.pm:6193 texi2html/texi2html.pm:6209
#, perl-brace-format
msgid "See {reference_name}"
msgstr "Veja {reference_name}"
-#: texi2html/texi2html.init:6197 texi2html/texi2html.init:6213
+#: texi2html/texi2html.pm:6197 texi2html/texi2html.pm:6213
#, perl-brace-format
msgid "{reference_name}"
msgstr ""
-#: texi2html/texi2html.init:6833
+#: texi2html/texi2html.pm:6833
#, perl-brace-format
msgid "on @emph{{date}}"
msgstr "em @emph{{date}}"
-#: texi2html/texi2html.init:7008 texi2html/formats/html.init:2620
-#: texi2html/maintained_extra/html32.init:165
+#: texi2html/texi2html.pm:7008 texi2html/formats/html.pm:2620
+#: texi2html/maintained_extra/html32.pm:165
#, perl-brace-format
msgid "{acronym_like} ({explanation})"
msgstr ""
-#: texi2html/texi2html.init:7028 texi2html/formats/docbook.init:1399
-#: tp/Texinfo/Convert/Plaintext.pm:1629
+#: texi2html/texi2html.pm:7028 texi2html/formats/docbook.pm:1399
+#: tp/Texinfo/Convert/Plaintext.pm:1628
#, perl-brace-format
msgid "@b{{quotation_arg}:} "
msgstr ""
-#: texi2html/texi2html.init:7155
+#: texi2html/texi2html.pm:7155
msgid "(outside of any element)"
msgstr ""
@@ -469,90 +469,90 @@
msgid "{month} {day}, {year}"
msgstr "{day} de {month} de {year}"
-#: texi2html/formats/docbook.init:733
+#: texi2html/formats/docbook.pm:733
#, perl-brace-format
msgid "section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:737
+#: texi2html/formats/docbook.pm:737
#, perl-brace-format
msgid "See section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:741
+#: texi2html/formats/docbook.pm:741
#, perl-brace-format
msgid "see section address@hidden'@asis{}' in @cite{{book}}"
msgstr ""
-#: texi2html/formats/docbook.init:751
+#: texi2html/formats/docbook.pm:751
#, perl-brace-format
msgid "{ref}"
msgstr ""
-#: texi2html/formats/docbook.init:755
+#: texi2html/formats/docbook.pm:755
#, perl-brace-format
msgid "see {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:759
+#: texi2html/formats/docbook.pm:759
#, perl-brace-format
msgid "See {ref}"
msgstr ""
-#: texi2html/formats/docbook.init:766
+#: texi2html/formats/docbook.pm:766
#, perl-brace-format
msgid "{title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:770
+#: texi2html/formats/docbook.pm:770
#, perl-brace-format
msgid "see {title_ref}"
msgstr ""
-#: texi2html/formats/docbook.init:774
+#: texi2html/formats/docbook.pm:774
#, perl-brace-format
msgid "See {title_ref}"
msgstr ""
-#: texi2html/formats/html.init:620
+#: texi2html/formats/html.pm:620
msgid "current"
msgstr "atual"
-#: texi2html/formats/html.init:624
+#: texi2html/formats/html.pm:624
msgid " Up "
msgstr " Acima "
-#: texi2html/formats/html.init:626
+#: texi2html/formats/html.pm:626
msgid "Node up"
msgstr "Nodo acima"
-#: texi2html/formats/html.init:647
+#: texi2html/formats/html.pm:647 tp/Texinfo/Convert/HTML.pm:1389
msgid "Untitled Document"
msgstr "Documento Sem Nome"
-#: texi2html/formats/html.init:1277
+#: texi2html/formats/html.pm:1277
msgid " The buttons in the navigation panels have the following meaning:"
msgstr ""
" Os address@hidden nos pain@'eis de navega@,address@hidden possuem os
seguintes "
"significados:"
-#: texi2html/formats/html.init:1283
+#: texi2html/formats/html.pm:1283
msgid "Button"
msgstr "address@hidden"
-#: texi2html/formats/html.init:1284
+#: texi2html/formats/html.pm:1284
msgid "Name"
msgstr "Nome"
-#: texi2html/formats/html.init:1285
+#: texi2html/formats/html.pm:1285
msgid "Go to"
msgstr "V@'a para"
-#: texi2html/formats/html.init:1286
+#: texi2html/formats/html.pm:1286
msgid "From 1.2.3 go to"
msgstr "De 1.2.3 v@'a para"
-#: texi2html/formats/html.init:1310
+#: texi2html/formats/html.pm:1310
msgid ""
" where the @strong{ Example } assumes that the current position is at "
"@strong{ Subsubsection One-Two-Three } of a document of the following "
@@ -562,186 +562,190 @@
"@strong{ Subsub@,address@hidden address@hidden } de um documento com a
seguinte "
"estrutura:"
-#: texi2html/formats/html.init:1320
+#: texi2html/formats/html.pm:1320
msgid "Section One"
msgstr "Se@,address@hidden Um"
-#: texi2html/formats/html.init:1322
+#: texi2html/formats/html.pm:1322
msgid "Subsection One-One"
msgstr "Subse@,address@hidden Um-Um"
-#: texi2html/formats/html.init:1329
+#: texi2html/formats/html.pm:1329
msgid "Subsection One-Two"
msgstr "Subse@,address@hidden Um-Dois"
-#: texi2html/formats/html.init:1331
+#: texi2html/formats/html.pm:1331
msgid "Subsubsection One-Two-One"
msgstr "Subse@,address@hidden Um-Dois-Um"
-#: texi2html/formats/html.init:1332
+#: texi2html/formats/html.pm:1332
msgid "Subsubsection One-Two-Two"
msgstr "Subse@,address@hidden Um-Dois-Dois"
-#: texi2html/formats/html.init:1333
+#: texi2html/formats/html.pm:1333
msgid "Subsubsection One-Two-Three"
msgstr "Subse@,address@hidden address@hidden"
-#: texi2html/formats/html.init:1335
+#: texi2html/formats/html.pm:1335
msgid "Current Position"
msgstr "Posi@,address@hidden Atual"
-#: texi2html/formats/html.init:1336
+#: texi2html/formats/html.pm:1336
msgid "Subsubsection One-Two-Four"
msgstr "Subse@,address@hidden Um-Dois-Quatro"
-#: texi2html/formats/html.init:1339
+#: texi2html/formats/html.pm:1339
msgid "Subsection One-Three"
msgstr "Subse@,address@hidden address@hidden"
-#: texi2html/formats/html.init:1346
+#: texi2html/formats/html.pm:1346
msgid "Subsection One-Four"
msgstr "Subse@,address@hidden Um-Quatro"
-#: texi2html/formats/html.init:1366
+#: texi2html/formats/html.pm:1366
#, perl-brace-format
msgid "The node you are looking for is at {href}."
msgstr "O nodo que address@hidden est@'a olhando est@'a em {href}."
-#: texi2html/formats/html.init:2644 texi2html/formats/info.init:2808
-#: tp/Texinfo/Convert/Plaintext.pm:2443
+#: texi2html/formats/html.pm:2644 texi2html/formats/info.pm:2808
+#: tp/Texinfo/Convert/Plaintext.pm:2442
#, perl-brace-format
msgid "@center --- @emph{{author}}\n"
msgstr ""
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Index Entry"
msgstr "Entrada de @'Indice"
-#: texi2html/formats/html.init:2661
+#: texi2html/formats/html.pm:2661
msgid "Section"
msgstr "Se@,address@hidden"
-#: texi2html/formats/html.init:2773
-#: texi2html/maintained_extra/mediawiki.init:1038
+#: texi2html/formats/html.pm:2773 texi2html/maintained_extra/mediawiki.pm:1038
msgid "Jump to"
msgstr "Pular para"
-#: texi2html/formats/info.init:3129 tp/Texinfo/Convert/Info.pm:405
+#: texi2html/formats/info.pm:3129 tp/Texinfo/Convert/Info.pm:405
msgid "(outside of any node)"
msgstr ""
-#: texi2html/formats/xml.init:1043
+#: texi2html/formats/xml.pm:1043
msgid "see "
msgstr ""
-#: texi2html/formats/xml.init:1047
+#: texi2html/formats/xml.pm:1047
msgid "See "
msgstr ""
-#: texi2html/examples/roff.init:655
+#: texi2html/examples/roff.pm:655
msgid "Menu:"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:580
+#: tp/Texinfo/Convert/Plaintext.pm:579 tp/Texinfo/Convert/HTML.pm:1545
#, fuzzy, perl-brace-format
msgid "{category} on {class}"
msgstr "{name} na {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:584
+#: tp/Texinfo/Convert/Plaintext.pm:583 tp/Texinfo/Convert/HTML.pm:1549
#, fuzzy, perl-brace-format
msgid "{category} of {class}"
msgstr "{name} da {class}"
-#: tp/Texinfo/Convert/Plaintext.pm:1329
+#: tp/Texinfo/Convert/Plaintext.pm:1328
#, perl-brace-format
msgid "{name} @indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1332
+#: tp/Texinfo/Convert/Plaintext.pm:1331
#, perl-brace-format
msgid "@indicateurl{{email}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1354
+#: tp/Texinfo/Convert/Plaintext.pm:1353
#, perl-brace-format
msgid "{text} ({url})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1359
+#: tp/Texinfo/Convert/Plaintext.pm:1358
#, perl-brace-format
msgid "@code{{url}}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1439
+#: tp/Texinfo/Convert/Plaintext.pm:1438
#, perl-brace-format
msgid "{float_type} {float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1443
+#: tp/Texinfo/Convert/Plaintext.pm:1442
#, perl-brace-format
msgid "{float_type}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1447
+#: tp/Texinfo/Convert/Plaintext.pm:1446
#, perl-brace-format
msgid "{float_number}"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1537
+#: tp/Texinfo/Convert/Plaintext.pm:1536
#, perl-brace-format
msgid "{abbr_or_acronym} ({explanation})"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1888
+#: tp/Texinfo/Convert/Plaintext.pm:1887
#, perl-brace-format
msgid "* {float_type} {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1893
+#: tp/Texinfo/Convert/Plaintext.pm:1892
#, perl-brace-format
msgid "* {float_type}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1901
+#: tp/Texinfo/Convert/Plaintext.pm:1900
#, perl-brace-format
msgid "* {float_number}: {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:1905
+#: tp/Texinfo/Convert/Plaintext.pm:1904
#, perl-brace-format
msgid "* : {float_label}."
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2391
+#: tp/Texinfo/Convert/Plaintext.pm:2390
#, perl-brace-format
msgid "{float_type} {float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2395
+#: tp/Texinfo/Convert/Plaintext.pm:2394
#, perl-brace-format
msgid "{float_type}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2400
+#: tp/Texinfo/Convert/Plaintext.pm:2399
#, perl-brace-format
msgid "{float_type} {float_number}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2404
+#: tp/Texinfo/Convert/Plaintext.pm:2403
#, perl-brace-format
msgid "{float_type}\n"
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2410
+#: tp/Texinfo/Convert/Plaintext.pm:2409
#, perl-brace-format
msgid "{float_number}: "
msgstr ""
-#: tp/Texinfo/Convert/Plaintext.pm:2413
+#: tp/Texinfo/Convert/Plaintext.pm:2412
#, perl-brace-format
msgid "{float_number}\n"
msgstr ""
+#: tp/Texinfo/Convert/HTML.pm:1176
+#, perl-brace-format
+msgid "{title}: {element_text}"
+msgstr ""
+
#~ msgid "Following"
#~ msgstr "Seguinte"
Index: texi2html/Makefile.am
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/Makefile.am,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -b -r1.84 -r1.85
--- texi2html/Makefile.am 8 Apr 2011 10:41:48 -0000 1.84
+++ texi2html/Makefile.am 9 Apr 2011 00:10:43 -0000 1.85
@@ -39,24 +39,24 @@
texi2html_additional_scripts = \
MySimple.pm \
T2h_i18n.pm \
- texi2html.init \
+ texi2html.pm \
translations.pl \
examples/l2h.init \
T2h_l2h.pm \
documentlanguages.pl
texi2html_formats = \
- formats/html.init \
- formats/info.init \
- formats/docbook.init \
- formats/xml.init \
- formats/plaintext.init
-
-dist_init_DATA = maintained_extra/book.init \
- maintained_extra/chm.init \
- maintained_extra/tex4ht.init \
- maintained_extra/html32.init \
- maintained_extra/mediawiki.init
+ formats/html.pm \
+ formats/info.pm \
+ formats/docbook.pm \
+ formats/xml.pm \
+ formats/plaintext.pm
+
+dist_init_DATA = maintained_extra/book.pm \
+ maintained_extra/chm.pm \
+ maintained_extra/tex4ht.pm \
+ maintained_extra/html32.pm \
+ maintained_extra/mediawiki.pm
texi2html_sources = texi2html_configured.pl $(texi2html_additional_scripts)
@@ -79,13 +79,12 @@
regenerate_documentlanguages.pl \
$(texi2html_additional_scripts) \
$(texi2html_formats) \
- examples/l2h.init \
- examples/makeinfo.init \
- examples/xhtml.init \
- examples/noheaders.init \
- examples/utf8.init \
- examples/enable_encoding.init \
- examples/roff.init \
+ examples/makeinfo.pm \
+ examples/xhtml.pm \
+ examples/noheaders.pm \
+ examples/utf8.pm \
+ examples/enable_encoding.pm \
+ examples/roff.pm \
examples/my-bib-macros.texi \
examples/bib-example.texi \
examples/glossary.texi \
Index: texi2html/README.dev
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/README.dev,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- texi2html/README.dev 18 Jul 2010 18:49:02 -0000 1.1
+++ texi2html/README.dev 9 Apr 2011 00:10:43 -0000 1.2
@@ -18,14 +18,14 @@
options; with later settings overriding earlier ones.
The default initialisation options are defined in the
-'texi2html.init' and built-in formats files in formats/*.init files
+'texi2html.pm' and built-in formats files in formats/*.pm files
contained in the Texi2html distribution (in fact, a script pastes
those files into the beginning of the perl file generated by
`./configure' from texi2html.pl and generates the actual 'texi2html'
script this way.).
To customize 'texi2html' it is best if you copy the appropriate
-sections from the 'texi2html.init' file into an appropriate local
+sections from the 'texi2html.pm' file into an appropriate local
initialization file, make the necessary changes there, and then have
'texi2html' read this initialisation file by one of the means described
above.
@@ -36,7 +36,7 @@
The texi2html Texinfo manual is lagging behind the development. In
addition, you might want to have a look at the comments in the
-'texi2html.init' file for explanations about customizable parameters
+'texi2html.pm' file for explanations about customizable parameters
and at the (not up-to-date) texi2html man page for an overview of
texi2html's synopsis.
@@ -57,16 +57,16 @@
texi2html Actual script to run. Generated by
make, `buildt2h.sh' and `addformats.sh'
- from texi2html.pl, texi2html.init,
- MySimple.pm, T2h_i18n.pm, l2h.init,
- translations.pl and formats/*.init.
+ from texi2html.pl, texi2html.pm,
+ MySimple.pm, T2h_i18n.pm, examples/l2h.init,
+ translations.pl and formats/*.pm.
texi2html.pl Main source file of the converter.
texi2html_configured.pl File generated by `./configure' from
texi2html.pl.
- texi2html.init Default values of configurable
+ texi2html.pm Default values of configurable
parameters. `buildt2h.sh' inserts this
file into texi2html_configured.pl when
it generates the actual `texi2html' script.
@@ -85,9 +85,6 @@
files and files in the `i18n' directory
(obsolete).
- l2h.init default configuration file for `latex2html'
- used to convert maths and TeX.
-
po_document/ Directory containing po files used for
translation of strings. The primary source
for the file are outside of texi2html,
Index: texi2html/TODO
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/TODO,v
retrieving revision 1.201
retrieving revision 1.202
diff -u -b -r1.201 -r1.202
--- texi2html/TODO 15 Sep 2010 22:39:25 -0000 1.201
+++ texi2html/TODO 9 Apr 2011 00:10:43 -0000 1.202
@@ -191,7 +191,7 @@
* test stuff on 'line_command' relevant in pass 1, like @macro, @ignore...
-* in chm.init (Jose Fonseca)
+* in chm.pm (Jose Fonseca)
[WINDOWS]
@@ -344,9 +344,9 @@
Maybe it is because they are in footnotes. Or maybe because they are
in a caption.
-* in examples/chm.init use main::open_out to open files.
+* in examples/chm.pm use main::open_out to open files.
-* examples/mediawiki.init: end of lines within lists leads to empty lines
+* examples/mediawiki.pm: end of lines within lists leads to empty lines
that may not be what the user wanted. Maybe this could be ameliorated.
* mediawiki: external links, in node directions, in menus, in @refs
@@ -429,14 +429,14 @@
open paragraphs in tex rendering while the whole is already in a
paragraph.
-* utf8.init doesn't work with info.init (see encodings/nodetest_to_utf8_latin1)
+* utf8.pm doesn't work with info.pm (see encodings/nodetest_to_utf8_latin1)
* menu_description is menucomment in xml.
menuentry is the menunode+menutitle+menucomment
menu_comment in makeinfo --xml treated as normal text.
the documentation, however uses the same words than in texi2html.
-* enable_encoding.init is certainly dependent on USE_UNICODE through
+* enable_encoding.pm is certainly dependent on USE_UNICODE through
the use of non 8 bit representation of characters.
* code_style is used for code_style style @-commands in remove_texi.
@@ -479,4 +479,4 @@
So things are right as is, but in formats that always set the quotes to
a special font should honor txicodequote* like tex. There is an example
-of such code commented out in texi2html.init in normal_text.
+of such code commented out in texi2html.pm in normal_text.
Index: texi2html/manage_i18n.pl.in
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/manage_i18n.pl.in,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- texi2html/manage_i18n.pl.in 13 Aug 2010 23:11:46 -0000 1.12
+++ texi2html/manage_i18n.pl.in 9 Apr 2011 00:10:43 -0000 1.13
@@ -61,8 +61,8 @@
#my $template = 'template';
my $template_lang = 'en';
-my @sources = ('texi2html.pl', 'texi2html.init', 'T2h_i18n.pm',
- 'examples/roff.init', 'examples/noheaders.init');
+my @sources = ('texi2html.pl', 'texi2html.pm', 'T2h_i18n.pm',
+ 'examples/roff.pm', 'examples/noheaders.pm');
my $lang;
my $charset;
Index: texi2html/texi2html.pl
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.pl,v
retrieving revision 1.434
retrieving revision 1.435
diff -u -b -r1.434 -r1.435
--- texi2html/texi2html.pl 22 Mar 2011 00:36:56 -0000 1.434
+++ texi2html/texi2html.pl 9 Apr 2011 00:10:43 -0000 1.435
@@ -71,7 +71,7 @@
# NOTE FOR DEBUGGING THIS SCRIPT:
# You can run 'perl -x texi2html.pl' directly, provided you have the script
# in the same directory with, or the environment variable T2H_HOME set to
-# the directory containing, the texi2html.init, T2h_i18n.pm, translations.pl,
+# the directory containing, the texi2html.pm, T2h_i18n.pm, translations.pl,
# l2h.init, & T2h_l2h.pm files. Ditto makeinfo.pl, if you make it a
# symlink to texi2html.pl.
#
@@ -90,7 +90,7 @@
}
# CVS version:
-# $Id: texi2html.pl,v 1.434 2011/03/22 00:36:56 pertusus Exp $
+# $Id: texi2html.pl,v 1.435 2011/04/09 00:10:43 pertusus Exp $
# Homepage:
my $T2H_HOMEPAGE = "http://www.gnu.org/software/texinfo/";;
@@ -303,8 +303,8 @@
# #
# Initialization #
# Some declarations, some functions that are GPL and therefore cannot be in #
-# texi2html.init, some functions that are not to be customized. #
-# Pasted content of File $(srcdir)/texi2html.init: Default initializations #
+# texi2html.pm, some functions that are not to be customized. #
+# Pasted content of File $(srcdir)/texi2html.pm: Default initializations #
# #
#---###########################################################################
{
@@ -661,7 +661,7 @@
# workaround for having the function redefined, though.
foreach my $output_format (keys(%output_format_names))
{
- if ($file =~ /\/$output_format\.init$/)
+ if ($file =~ /\/$output_format\.pm$/)
{
t2h_default_load_format($output_format, 1);
return 1;
@@ -835,7 +835,7 @@
#
# Function refs covered by the GPL as part of the texi2html.pl original
-# code. As such they cannot appear in texi2html.init which is public
+# code. As such they cannot appear in texi2html.pm which is public
# domain (at least the things coded by me, and, if I'm not wrong also the
# things coded by Olaf -- Pat).
#
@@ -1574,43 +1574,43 @@
# leave this within comments, and keep the require statement
# This way, you can directly run texi2html.pl, if
-# $T2H_HOME/texi2html.init exists.
+# $T2H_HOME/texi2html.pm exists.
# @INIT@
-require "$T2H_HOME/texi2html.init"
+require "$T2H_HOME/texi2html.pm"
if ($0 =~ /\.pl$/ &&
- -e "$T2H_HOME/texi2html.init" && -r "$T2H_HOME/texi2html.init");
+ -e "$T2H_HOME/texi2html.pm" && -r "$T2H_HOME/texi2html.pm");
# @INIT_HTML@
-require "$T2H_HOME/formats/html.init"
+require "$T2H_HOME/formats/html.pm"
if ($0 =~ /\.pl$/ &&
- -e "$T2H_HOME/formats/html.init" && -r "$T2H_HOME/formats/html.init");
+ -e "$T2H_HOME/formats/html.pm" && -r "$T2H_HOME/formats/html.pm");
# @INIT_INFO@
-require "$T2H_HOME/formats/info.init"
+require "$T2H_HOME/formats/info.pm"
if ($0 =~ /\.pl$/ &&
- -e "$T2H_HOME/formats/info.init" && -r "$T2H_HOME/formats/info.init");
+ -e "$T2H_HOME/formats/info.pm" && -r "$T2H_HOME/formats/info.pm");
# @INIT_DOCBOOK@
-require "$T2H_HOME/formats/docbook.init"
+require "$T2H_HOME/formats/docbook.pm"
if ($0 =~ /\.pl$/ &&
- -e "$T2H_HOME/formats/docbook.init" && -r
"$T2H_HOME/formats/docbook.init");
+ -e "$T2H_HOME/formats/docbook.pm" && -r
"$T2H_HOME/formats/docbook.pm");
# @INIT_XML@
-require "$T2H_HOME/formats/xml.init"
+require "$T2H_HOME/formats/xml.pm"
if ($0 =~ /\.pl$/ &&
- -e "$T2H_HOME/formats/xml.init" && -r "$T2H_HOME/formats/xml.init");
+ -e "$T2H_HOME/formats/xml.pm" && -r "$T2H_HOME/formats/xml.pm");
# @INIT_PLAINTEXT@
-require "$T2H_HOME/formats/plaintext.init"
+require "$T2H_HOME/formats/plaintext.pm"
if ($0 =~ /\.pl$/ &&
- -e "$T2H_HOME/formats/plaintext.init" && -r
"$T2H_HOME/formats/plaintext.init");
+ -e "$T2H_HOME/formats/plaintext.pm" && -r
"$T2H_HOME/formats/plaintext.pm");
my $translation_file = 'translations.pl'; # file containing all the
translations
my $T2H_OBSOLETE_STRINGS;
@@ -1798,7 +1798,7 @@
# Some global variables are set in the script, and used in the subroutines
# they are in the Texi2HTML namespace, thus prefixed with Texi2HTML::.
-# see texi2html.init for details.
+# see texi2html.pm for details.
#+++############################################################################
#
#
@@ -4409,7 +4409,7 @@
push @Texi2HTML::Config::command_handler_process,
\&Texi2HTML::LaTeX2HTML::latex2html;
# do it here once to have something ready for special regions
push @Texi2HTML::Config::command_handler_process,
\&Texi2HTML::LaTeX2HTML::init_from_html;
- # do it here once more in case the file was modified (see mediawiki.init)
+ # do it here once more in case the file was modified (see mediawiki.pm)
push @Texi2HTML::Config::command_handler_output,
\&Texi2HTML::LaTeX2HTML::init_from_html;
push @Texi2HTML::Config::command_handler_finish,
\&Texi2HTML::LaTeX2HTML::finish;
$Texi2HTML::Config::command_handler{'math'} =
@@ -7143,7 +7143,7 @@
push @{$section->{'sectionup'}->{'section_childs'}}, $section;
}
$previous_sections[$section->{'level'}] = $section;
- # This is what is used in the .init file.
+ # This is what is used in the init file.
$section->{'up'} = $section->{'sectionup'};
# Not used but documented.
$section->{'next'} = $section->{'sectionnext'};
@@ -7514,7 +7514,7 @@
if (defined($section->{$direction}));
}
}
- # 'up' is used in .init files. It is almost sectionup, but not
+ # 'up' is used in init files. It is almost sectionup, but not
# exactly, it allows to have something relevant whether elements
# are nodes or sections -- just like Back and Forward. So it
# should certainly be kept.
@@ -8149,7 +8149,7 @@
}
}
# convert directions in direction with first letter in all caps, to be
- # consistent with the convention used in the .init file.
+ # consistent with the convention used in the init file.
foreach my $element (@elements_list)
{
foreach my $direction (@element_directions)
@@ -11250,7 +11250,7 @@
elsif ((exists ($Texi2HTML::Config::complex_format_map->{$macro})
or exists ($Texi2HTML::Config::complex_format_map{$macro}))
and ($format_type{$macro} ne 'menu' or get_conf('SIMPLE_MENU')))
- { # handle menu if SIMPLE_MENU. see texi2html.init
+ { # handle menu if SIMPLE_MENU. see texi2html.pm
my $complex_format;
if (exists ($Texi2HTML::Config::complex_format_map->{$macro}))
{
@@ -14648,7 +14648,7 @@
}
# currently if remove_texi and anchor/ref/footnote
# the text within the command is ignored
- # see t2h_remove_command in texi2html.init
+ # see t2h_remove_command in texi2html.pm
my $new_command_ref = { 'style' => $macro, 'text' => '',
'arg_nr' => 0, 'line_nr' => $line_nr };
push (@$stack, $new_command_ref);
if ($no_paragraph_macro{$macro})
@@ -17053,7 +17053,7 @@
@{$Texi2HTML::THIS_SECTION} = ();
# the reference to these hashes may be used before this point (for example
- # see makeinfo.init), so they should be kept as is and the values undef
+ # see makeinfo.pm), so they should be kept as is and the values undef
# but the key should not be deleted because the ref is on the key.
foreach my $hash (\%Texi2HTML::HREF, \%Texi2HTML::NAME, \%Texi2HTML::NODE,
\%Texi2HTML::NO_TEXI, \%Texi2HTML::SIMPLE_TEXT)
Index: texi2html/texi2html.spec.in
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/texi2html.spec.in,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- texi2html/texi2html.spec.in 29 Oct 2009 14:09:52 -0000 1.6
+++ texi2html/texi2html.spec.in 9 Apr 2011 00:10:44 -0000 1.7
@@ -66,7 +66,7 @@
%files
%defattr(-,root,root,-)
-%doc AUTHORS COPYING ChangeLog NEWS README TODO %{name}.init
+%doc AUTHORS COPYING ChangeLog NEWS README TODO %{name}.pm
%doc __dist_examples/examples/
%{_bindir}/%{name}
%{_bindir}/texi2any
@@ -74,7 +74,7 @@
%{_infodir}/%{name}.info*
%dir %{_datadir}/texinfo/
%dir %{_datadir}/texinfo/init
-%{_datadir}/texinfo/init/*.init
+%{_datadir}/texinfo/init/*.pm
%{_datadir}/texinfo/html/%{name}.html
%dir %{_datadir}/%{name}/i18n/
%{_datadir}/%{name}/i18n/*
Index: texi2html/po_document/POTFILES.in.in
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/po_document/POTFILES.in.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- texi2html/po_document/POTFILES.in.in 20 Feb 2010 13:55:57 -0000
1.2
+++ texi2html/po_document/POTFILES.in.in 9 Apr 2011 00:10:45 -0000
1.3
@@ -1,17 +1,17 @@
# List of source files which contain translatable strings.
@address@hidden
address@hidden@texi2html.init
address@hidden@texi2html.pm
@address@hidden
@address@hidden
address@hidden@formats/docbook.init
address@hidden@formats/html.init
address@hidden@formats/info.init
address@hidden@formats/plaintext.init
address@hidden@formats/xml.init
address@hidden@maintained_extra/book.init
address@hidden@maintained_extra/chm.init
address@hidden@maintained_extra/html32.init
address@hidden@maintained_extra/tex4ht.init
address@hidden@maintained_extra/mediawiki.init
address@hidden@examples/roff.init
address@hidden@formats/docbook.pm
address@hidden@formats/html.pm
address@hidden@formats/info.pm
address@hidden@formats/plaintext.pm
address@hidden@formats/xml.pm
address@hidden@maintained_extra/book.pm
address@hidden@maintained_extra/chm.pm
address@hidden@maintained_extra/html32.pm
address@hidden@maintained_extra/tex4ht.pm
address@hidden@maintained_extra/mediawiki.pm
address@hidden@examples/roff.pm
Index: texi2html/po_messages/POTFILES.in.in
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/po_messages/POTFILES.in.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- texi2html/po_messages/POTFILES.in.in 15 Nov 2009 23:39:08 -0000
1.1
+++ texi2html/po_messages/POTFILES.in.in 9 Apr 2011 00:10:46 -0000
1.2
@@ -1,16 +1,16 @@
# List of source files which contain translatable strings.
@address@hidden
address@hidden@texi2html.init
address@hidden@texi2html.pm
@address@hidden
@address@hidden
address@hidden@formats/docbook.init
address@hidden@formats/html.init
address@hidden@formats/info.init
address@hidden@formats/plaintext.init
address@hidden@formats/xml.init
address@hidden@maintained_extra/book.init
address@hidden@maintained_extra/chm.init
address@hidden@maintained_extra/html32.init
address@hidden@maintained_extra/tex4ht.init
address@hidden@maintained_extra/mediawiki.init
address@hidden@formats/docbook.pm
address@hidden@formats/html.pm
address@hidden@formats/info.pm
address@hidden@formats/plaintext.pm
address@hidden@formats/xml.pm
address@hidden@maintained_extra/book.pm
address@hidden@maintained_extra/chm.pm
address@hidden@maintained_extra/html32.pm
address@hidden@maintained_extra/tex4ht.pm
address@hidden@maintained_extra/mediawiki.pm
Index: texi2html/test/run_test.sh
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/run_test.sh,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- texi2html/test/run_test.sh 3 Apr 2011 22:48:26 -0000 1.33
+++ texi2html/test/run_test.sh 9 Apr 2011 00:10:46 -0000 1.34
@@ -169,7 +169,7 @@
fi
use_latex2html=yes
l2h_tmp_dir="--set-init-var 'L2H_TMP $tmp_dir'"
- elif echo "$remaining" | grep -qs -- '-init tex4ht.init'; then
+ elif echo "$remaining" | grep -qs -- '-init tex4ht.pm'; then
if [ "$no_tex4ht" = 'yes' ]; then
echo "S: (no tex4ht) $dir"
continue
Index: texi2html/test/run_test_all.sh
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/run_test_all.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- texi2html/test/run_test_all.sh 3 Apr 2011 22:48:27 -0000 1.22
+++ texi2html/test/run_test_all.sh 9 Apr 2011 00:10:46 -0000 1.23
@@ -221,7 +221,7 @@
fi
use_latex2html=yes
l2h_tmp_dir="--set-init-var 'L2H_TMP $tmp_dir'"
- elif echo "$remaining" | grep -qs -- '-init tex4ht.init'; then
+ elif echo "$remaining" | grep -qs -- '-init tex4ht.pm'; then
if [ "$no_tex4ht" = 'yes' ]; then
echo "S: (no tex4ht) $current"
continue 2
@@ -229,7 +229,7 @@
use_tex4ht=yes
fi
if [ $use_tex4ht = 'yes' -o $use_latex2html = 'yes' ]; then
- if echo "$remaining" | grep -qs -- '-init mediawiki.init'; then
+ if echo "$remaining" | grep -qs -- '-init mediawiki.pm'; then
if [ "$no_html2wiki" = 'yes' ]; then
echo "S: (no html2wiki) $current"
continue 2
Index: texi2html/test/contents/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/contents/tests.txt,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- texi2html/test/contents/tests.txt 21 Feb 2011 01:08:34 -0000 1.6
+++ texi2html/test/contents/tests.txt 9 Apr 2011 00:10:46 -0000 1.7
@@ -33,9 +33,9 @@
no_content_do_contents_inline no_content.texi --set-init-var 'INLINE_CONTENTS
1' --set-init-var 'contents 1'
no_content_setcatpage_inline no_content_setcatpage.texi --set-init-var
'INLINE_CONTENTS 1'
no_content_setcatpage_do_contents_inline no_content_setcatpage.texi
--set-init-var 'INLINE_CONTENTS 1' --set-init-var 'contents 1'
-double_contents_book double_contents.texi --init book.init
-double_contents_setcontentsaftertitlepage_book
double_contents_setcontentsaftertitlepage.texi --init book.init
-double_contents_setcontentsaftertitlepage_book_chapter
double_contents_setcontentsaftertitlepage.texi --init book.init --split chapter
+double_contents_book double_contents.texi --init book.pm
+double_contents_setcontentsaftertitlepage_book
double_contents_setcontentsaftertitlepage.texi --init book.pm
+double_contents_setcontentsaftertitlepage_book_chapter
double_contents_setcontentsaftertitlepage.texi --init book.pm --split chapter
contents_and_parts contents_and_parts.texi
contents_at_begin_info contents_at_begin.texi --info
Index: texi2html/test/encodings/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/encodings/tests.txt,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- texi2html/test/encodings/tests.txt 2 Mar 2011 21:04:38 -0000 1.17
+++ texi2html/test/encodings/tests.txt 9 Apr 2011 00:10:46 -0000 1.18
@@ -23,7 +23,7 @@
nodetest_utf8_no_unicode nodetest_utf8.texi --set-init-var 'USE_UNICODE 0'
nodetest_utf8_use_nodes nodetest_utf8.texi --node-files --set-init-var
'USE_NODES 1' --split node
nodetest_utf8_use_nodes_no_unidecode nodetest_utf8.texi --set-init-var
'USE_UNIDECODE 0' --node-files --set-init-var 'USE_NODES 1' --split node
-nodetest_to_utf8_latin1 nodetest_latin1.texi --init utf8.init
+nodetest_to_utf8_latin1 nodetest_latin1.texi --init utf8.pm
nodetest_latin1 nodetest_latin1.texi
nodetest_latin1_no_unicode nodetest_latin1.texi --set-init-var 'USE_UNICODE 0'
nodetest_latin1_use_nodes_no_unicode nodetest_latin1.texi --set-init-var
'USE_UNICODE 0' --node-files --split node
@@ -42,14 +42,14 @@
umlaut umlaut.texi
formatting_fr ../coverage/formatting.texi --document-language fr
formatting_fr_icons ../coverage/formatting.texi --document-language fr --init
icons.init
-formatting_converted_to_utf8 ../coverage/formatting.texi --init utf8.init
+formatting_converted_to_utf8 ../coverage/formatting.texi --init utf8.pm
accentenc accentenc.texi
-#accentenc_encoding accentenc.texi --init enable_encoding.init
+#accentenc_encoding accentenc.texi --init enable_encoding.pm
accentenc_encoding accentenc.texi --enable-encoding --set-init-var
'ENABLE_ENCODING_USE_ENTITY 0' --set-init-var 'USE_ISO 0'
accentenc_encoding_use_entity accentenc.texi --enable-encoding
accent accent.texi
weird_accents weird_accents.texi
-weird_accents_encoding weird_accents.texi --init enable_encoding.init
+weird_accents_encoding weird_accents.texi --init enable_encoding.pm
ogolat2 ogolat2.texi
ogoutf ogoutf.texi
nodetest_info nodetest.texi --info
@@ -61,11 +61,11 @@
documentlanguage_set_unknown documentlanguage_set.texi --document-language
unknown
# iconv < encoding_index-utf8.texi -t latin1 |sed 's/utf8/latin1/' >
encoding_index-latin1.texi
encoding_index encoding_index.texi
-encoding_index_toutf8 encoding_index.texi --init utf8.init
+encoding_index_toutf8 encoding_index.texi --init utf8.pm
encoding_index-utf8 encoding_index-utf8.texi
-encoding_index-utf8_toutf8 encoding_index-utf8.texi --init utf8.init
+encoding_index-utf8_toutf8 encoding_index-utf8.texi --init utf8.pm
encoding_index-latin1 encoding_index-latin1.texi
-encoding_index-latin1_toutf8 encoding_index-latin1.texi --init utf8.init
+encoding_index-latin1_toutf8 encoding_index-latin1.texi --init utf8.pm
accentenc_info accentenc.texi --info
sample_utf8 sample_utf8.texi
formatting_utf8_enable_encoding formatting_utf8.texi --enable-encoding
Index: texi2html/test/formatting/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/formatting/tests.txt,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- texi2html/test/formatting/tests.txt 6 Mar 2011 11:27:26 -0000 1.51
+++ texi2html/test/formatting/tests.txt 9 Apr 2011 00:10:46 -0000 1.52
@@ -72,10 +72,10 @@
ref_in_anchor ref_in_anchor.texi
tex tex.texi --set-init-var 'L2H 1' --iftex
tex_notex tex.texi
-tex_httex tex.texi --init tex4ht.init --iftex
-tex_mediawiki tex.texi --init mediawiki.init --iftex
-tex_httex_mediawiki tex.texi --html --init tex4ht.init --init mediawiki.init
--iftex
-tex_l2h_mediawiki tex.texi --html --set-init-var 'L2H 1' --iftex --init
mediawiki.init
+tex_httex tex.texi --init tex4ht.pm --iftex
+tex_mediawiki tex.texi --init mediawiki.pm --iftex
+tex_httex_mediawiki tex.texi --html --init tex4ht.pm --init mediawiki.pm
--iftex
+tex_l2h_mediawiki tex.texi --html --set-init-var 'L2H 1' --iftex --init
mediawiki.pm
block_EOL block_EOL.texi
block_EOL_tex block_EOL.texi --set-init-var 'L2H 1' --iftex
detailmenus detailmenus.texi
@@ -102,8 +102,8 @@
symbol_after_command symbol_after_command.texi
formatting_weird_quotes ../coverage/formatting.texi --set-init-var
'OPEN_QUOTE_SYMBOL @' --set-init-var "CLOSE_QUOTE_SYMBOL '‘"
comments_redefine_need ../coverage/comments.texi --init redefine_need.init
-simplest_httex simplest.texi --init tex4ht.init --iftex
-html-extrali html-extrali.texi --init makeinfo.init
+simplest_httex simplest.texi --init tex4ht.pm --iftex
+html-extrali html-extrali.texi --init makeinfo.pm
html-para html-para.texi
html-title html-title.texi
images images.texi
@@ -143,7 +143,7 @@
warn_characters_in_var warn_characters_in_var.texi
itemize_w itemize_w.texi
-#lightweight_markups_mediawiki lightweight_markups.texi --init mediawiki.init
+#lightweight_markups_mediawiki lightweight_markups.texi --init mediawiki.pm
quotation_docbook quotation.texi --docbook
at_command_glued_info at_command_glued.texi --info
test_sp_info test_sp.texi --info
@@ -154,7 +154,7 @@
formatting_html_nodes ../coverage/formatting.texi --html --split node
--node-files --set-init-var 'TOP_FILE index.html'
formatting_info ../coverage/formatting.texi --info -U texi2html
formatting_plaintext ../coverage/formatting.texi --plaintext -U texi2html
-#formatting_mediawiki ../coverage/formatting.texi --init mediawiki.init
+#formatting_mediawiki ../coverage/formatting.texi --init mediawiki.pm
direntry_dircategory_info direntry_dircategory.texi --info
direntry_dircategory_info_split direntry_dircategory.texi --info --split-size 1
direntry_dircategory_xml direntry_dircategory.texi --xml
Index: texi2html/test/indices/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/indices/tests.txt,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- texi2html/test/indices/tests.txt 21 Feb 2011 01:08:36 -0000 1.26
+++ texi2html/test/indices/tests.txt 9 Apr 2011 00:10:46 -0000 1.27
@@ -3,16 +3,16 @@
index_table_chapter index_table.texi --split chapter --init index_test.init
split_chapter_index split_chapter_index.texi --split chapter --init
index_test.init
index_split index_split.texi --split chapter --init index_test.init
-makeinfo_index_split index_split.texi --init makeinfo.init --init
index_test.init
+makeinfo_index_split index_split.texi --init makeinfo.pm --init index_test.init
index_no_node index_no_node.texi --split chapter --init index_test.init
-makeinfo_nodes_before_top nodes_before_top.texi --init makeinfo.init --init
index_test.init --split node --no-node-files
+makeinfo_nodes_before_top nodes_before_top.texi --init makeinfo.pm --init
index_test.init --split node --no-node-files
nodes_before_top nodes_before_top.texi --set-init-var 'USE_NODES 1' --init
index_test.init --split chapter
# there is no sectioning command in nodes_before_top.texi, so when called as
# texi2html there is nothing split, including indices.
nodes_before_top_no_nodes nodes_before_top.texi --init index_test.init --split
chapter
nodes_before_top_and_sections nodes_before_top_and_sections.texi --init
index_test.init --split chapter
nodes_before_top_and_sections_monolithic nodes_before_top_and_sections.texi
-makeinfo_nodes_before_top_and_sections nodes_before_top_and_sections.texi
--init makeinfo.init --init index_test.init
+makeinfo_nodes_before_top_and_sections nodes_before_top_and_sections.texi
--init makeinfo.pm --init index_test.init
nodes_before_top_and_sections_html_chapter nodes_before_top_and_sections.texi
--html --split chapter
nodes_before_top_and_sections_html_chapter_nodes
nodes_before_top_and_sections.texi --html --set-init-var 'USE_NODES 1'
--node-files --split chapter
index_special_region index_special_region.texi --split chapter --set-init-var
'USE_TITLEPAGE_FOR_TITLE 0'
@@ -22,7 +22,7 @@
index_special_region_no_region_html index_special_region_no_region.texi --html
--split chapter
index_special_region_no_insertcopying_html
index_special_region_no_insertcopying.texi --html --split chapter
index_nodes index_nodes.texi
-makeinfo_index_nodes index_nodes.texi --init makeinfo.init --init
index_test.init --split node
+makeinfo_index_nodes index_nodes.texi --init makeinfo.pm --init
index_test.init --split node
printindex_between_node_section printindex_between_node_section.texi --init
index_test.init --node-files
printindex_between_part_chapter printindex_between_part_chapter.texi --init
index_test.init
index_and_node_same_name index_and_node_same_name.texi
Index: texi2html/test/layout/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/layout/tests.txt,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- texi2html/test/layout/tests.txt 17 Jul 2010 11:08:42 -0000 1.11
+++ texi2html/test/layout/tests.txt 9 Apr 2011 00:10:46 -0000 1.12
@@ -6,7 +6,7 @@
no_monolithic_only_toc_out no_monolithic.texi --set-init-var 'MONOLITHIC 0'
--init only_toc_out.init
navigation navigation.texi
navigation_no_header navigation.texi --no-header
-navigation_noheaders_init navigation.texi --init noheaders.init
+navigation_noheaders_init navigation.texi --init noheaders.pm
navigation_vertical navigation.texi --set-init-var 'VERTICAL_HEAD_NAVIGATION 1'
navigation_no_header_vertical navigation.texi --set-init-var
'VERTICAL_HEAD_NAVIGATION 1' --set-init-var HEADERS=0
navigation_chapter navigation.texi --split chapter
@@ -15,9 +15,9 @@
navigation_chapter_no_header navigation.texi --split chapter --no-header
navigation_section_no_header navigation.texi --split section --no-header
navigation_node_no_header navigation.texi --split node --no-header
-navigation_chapter_noheaders_init navigation.texi --split chapter --init
noheaders.init
-navigation_section_noheaders_init navigation.texi --split section --init
noheaders.init
-navigation_node_noheaders_init navigation.texi --split node --init
noheaders.init
+navigation_chapter_noheaders_init navigation.texi --split chapter --init
noheaders.pm
+navigation_section_noheaders_init navigation.texi --split section --init
noheaders.pm
+navigation_node_noheaders_init navigation.texi --split node --init
noheaders.pm
navigation_chapter_vertical navigation.texi --set-init-var
'VERTICAL_HEAD_NAVIGATION 1' --split chapter
navigation_section_vertical navigation.texi --set-init-var
'VERTICAL_HEAD_NAVIGATION 1' --split section
navigation_node_vertical navigation.texi --set-init-var
'VERTICAL_HEAD_NAVIGATION 1' --split node
@@ -27,8 +27,8 @@
navigation_test_misc_file_collision navigation.texi --split node --init
misc_file_collision.init
formatting_regions formatting_regions.texi
formatting_exotic ../coverage/formatting.texi --split section --no-header
--no-number-sections --set-init-var 'TOC_LINKS 1' --set-init-var 'DEF_TABLE 1'
--set-init-var 'SHORT_REF 1' --footnote-style=end --css-ref
http://www.environnement.ens.fr/perso/dumas/background-color.css
--internal-links=/dev/null --set-init-var 'USE_TITLEPAGE_FOR_TITLE 0'
-formatting_makeinfo ../coverage/formatting.texi --init makeinfo.init --no-warn
-formatting_chm ../coverage/formatting.texi --init chm.init
+formatting_makeinfo ../coverage/formatting.texi --init makeinfo.pm --no-warn
+formatting_chm ../coverage/formatting.texi --init chm.pm
formatting_program_texi2any ../coverage/formatting.texi --program texi2any
formatting_program_foo ../coverage/formatting.texi --program foo
float_program_texi2any ../coverage/float.texi --program texi2any
Index: texi2html/test/macros/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/macros/tests.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- texi2html/test/macros/tests.txt 27 Feb 2011 17:36:10 -0000 1.16
+++ texi2html/test/macros/tests.txt 9 Apr 2011 00:10:46 -0000 1.17
@@ -55,10 +55,10 @@
value_in_pass0_macros_plain value_in_pass0_macros.texi
address@hidden@/value_in_pass0_macros-expanded.texi
macros_in_pass0_macros_plain macros_in_pass0_macros.texi
address@hidden@/macros_in_pass0_macros-expanded.texi
macro-at_info macro-at.texi --info
-value_in_pass0_macros value_in_pass0_macros.texi --init makeinfo.init
-macros_in_pass0_macros macros_in_pass0_macros.texi --init makeinfo.init
+value_in_pass0_macros value_in_pass0_macros.texi --init makeinfo.pm
+macros_in_pass0_macros macros_in_pass0_macros.texi --init makeinfo.pm
node-expand_plain node-expand.texi
-node-expand node-expand.texi --init makeinfo.init
+node-expand node-expand.texi --init makeinfo.pm
node-expand_xml node-expand.texi --xml
node-expand_info node-expand.texi --info
include-value include-value.texi
Index: texi2html/test/manuals/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/manuals/tests.txt,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- texi2html/test/manuals/tests.txt 3 Apr 2011 23:07:36 -0000 1.16
+++ texi2html/test/manuals/tests.txt 9 Apr 2011 00:10:47 -0000 1.17
@@ -11,10 +11,10 @@
texinfo_info_dev_null texinfo.texi --info -o /dev/null
texinfo_nodes texinfo.texi --split node --node-files --ifinfo
ccvs cvs.texi --split chapter --init cvs.init
-#ccvs_mediawiki cvs.texi --init mediawiki.init --split chapter
-#ccvs_mediawiki_nosplit cvs.texi --init mediawiki.init --init cvs.init
+#ccvs_mediawiki cvs.texi --init mediawiki.pm --split chapter
+#ccvs_mediawiki_nosplit cvs.texi --init mediawiki.pm --init cvs.init
ccvs_info cvs.texi --info
-mini_ker mini_ker.texi --init book.init --split section --node-files
--set-init-var 'USE_NODES 1' --iftex --init mini_ker_t2h.init --init tex4ht.init
+mini_ker mini_ker.texi --init book.pm --split section --node-files
--set-init-var 'USE_NODES 1' --iftex --init mini_ker_t2h.init --init tex4ht.pm
texinfo_xml texinfo.texi --xml
texinfo_html texinfo.texi --html
texinfo_html_nosplit texinfo.texi --html --no-split
Index: texi2html/test/misc/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/misc/tests.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- texi2html/test/misc/tests.txt 14 Jul 2010 15:42:39 -0000 1.7
+++ texi2html/test/misc/tests.txt 9 Apr 2011 00:10:47 -0000 1.8
@@ -6,7 +6,7 @@
verbatim_html verbatim_html.texi
viper_unsplit viper.texi --ifinfo
viper_chapter_split viper.texi --split chapter --ifinfo
-formatting_html32 ../coverage/formatting.texi --init html32.init
+formatting_html32 ../coverage/formatting.texi --init html32.pm
mini_ker_l2h ../manuals/mini_ker.texi --set-init-var 'L2H 1' --iftex
-mini_ker_httex ../manuals/mini_ker.texi --init tex4ht.init --iftex
+mini_ker_httex ../manuals/mini_ker.texi --init tex4ht.pm --iftex
templates templates.texi
Index: texi2html/test/sectioning/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/sectioning/tests.txt,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- texi2html/test/sectioning/tests.txt 13 Mar 2011 23:00:30 -0000 1.7
+++ texi2html/test/sectioning/tests.txt 9 Apr 2011 00:10:47 -0000 1.8
@@ -5,10 +5,10 @@
sectioning sectioning.texi
sectioning_directions sectioning.texi --init test_directions.init
novalidate novalidate.texi
-makeinfo_novalidate_split novalidate.texi --init makeinfo.init --no-node-file
+makeinfo_novalidate_split novalidate.texi --init makeinfo.pm --no-node-file
# --debug 255
-makeinfo_novalidate_unsplit novalidate.texi --init makeinfo.init --split no
--no-node-file
-makeinfo_novalidate_unsplit_node_file novalidate.texi --init makeinfo.init
--split no
+makeinfo_novalidate_unsplit novalidate.texi --init makeinfo.pm --split no
--no-node-file
+makeinfo_novalidate_unsplit_node_file novalidate.texi --init makeinfo.pm
--split no
# in docbook, the @top 'chapter' is closed before the section, makeinfo
# closes it after the section.
# also text before first chapter is not allowed in docbook.
@@ -42,7 +42,7 @@
double_top double_top.texi
rec_nodes rec_nodes.texi --set-init-var 'USE_NODES 1'
rec_nodes_no_node rec_nodes.texi
-makeinfo_rec_nodes rec_nodes.texi --init makeinfo.init --no-node-files
+makeinfo_rec_nodes rec_nodes.texi --init makeinfo.pm --no-node-files
lower_subsub lower_subsub.texi
raiselowersections raiselowersections.texi
top_without_node top_without_node.texi
@@ -61,16 +61,16 @@
equivalent_nodes_test_renamed_nodes equivalent_nodes.texi --init
test_renamed_nodes.init
html-top_no_Top_node html-top.texi
menu-whitespace_plain menu-whitespace.texi
-menu-whitespace menu-whitespace.texi --init makeinfo.init
+menu-whitespace menu-whitespace.texi --init makeinfo.pm
menu-whitespace_xml menu-whitespace.texi --xml
node-whitespace_plain node-whitespace.texi
-node-whitespace node-whitespace.texi --init makeinfo.init
+node-whitespace node-whitespace.texi --init makeinfo.pm
nodename_parentheses nodename_parentheses.texi
nodes_id_docbook nodes_id.texi --docbook
two_footnotes_in_nodes_plain two_footnotes_in_nodes.texi
-two_footnotes_in_nodes two_footnotes_in_nodes.texi --init makeinfo.init
+two_footnotes_in_nodes two_footnotes_in_nodes.texi --init makeinfo.pm
section_in_unnumbered section_in_unnumbered.texi
-more_nodes_than_sections more_nodes_than_sections.texi --init makeinfo.init
+more_nodes_than_sections more_nodes_than_sections.texi --init makeinfo.pm
more_sections_than_nodes more_sections_than_nodes.texi
no_element no_element.texi
one_element one_element.texi
Index: texi2html/test/singular_manual/tests.txt
===================================================================
RCS file: /sources/texinfo/texinfo/texi2html/test/singular_manual/tests.txt,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- texi2html/test/singular_manual/tests.txt 14 Jul 2010 15:42:40 -0000
1.5
+++ texi2html/test/singular_manual/tests.txt 9 Apr 2011 00:10:47 -0000
1.6
@@ -2,4 +2,4 @@
singular_plain singular.texi --split chapter
# Use the obsolete command-line switch to test that they function
singular singular.texi --init-file t2h_singular.init --l2h --short-ext
--prefix=sing --top-file=index.htm --noVerbose
-singular_httex singular.texi --init-file t2h_singular.init --init tex4ht.init
--set-init-var 'SHORTEXTN 1' --set-init-var 'PREFIX sing' --set-init-var
'TOP_FILE index.htm' --no-verbose
+singular_httex singular.texi --init-file t2h_singular.init --init tex4ht.pm
--set-init-var 'SHORTEXTN 1' --set-init-var 'PREFIX sing' --set-init-var
'TOP_FILE index.htm' --no-verbose
Index: texi2html/texi2html.pm
===================================================================
RCS file: texi2html/texi2html.pm
diff -N texi2html/texi2html.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/texi2html.pm 9 Apr 2011 00:10:44 -0000 1.1
@@ -0,0 +1,7385 @@
+# -*-perl-*-
+# vim: set filetype=perl:
+######################################################################
+# File: texi2html.pm
+#
+# Default values for command-line arguments and for various customizable
+# procedures are set in this file.
+#
+# A copy of this file is pasted into the beginning of texi2html by
+# running './configure'.
+#
+# Copy this file, rename it and make changes to it, if you like.
+# Afterwards, load the file with command-line
+# option --init-file <your_init_file>
+#
+# This file is in the public domain. Thus it may easily be used as an
+# example for further customizations.
+#
+# Originally written by Olaf Bachmann in 2000.
+#
+# Those values may be overrided by values set in $sysconfdir/texi2html/Config
+# and then by values set in $HOME/texi2html/Config.
+#
+# $Id: texi2html.pm,v 1.1 2011/04/09 00:10:44 pertusus Exp $
+
+
+##################################################################
+# The following variables can also be set by command-line options
+#
+# command line switches may override these values, and values set in files
+# specified by --init-file are also taken into account.
+#
+# options common with makeinfo
+# -I
+# add a directory to the list of directories where @include files are
+# searched for (besides the directory of the file). additional '-I'
+# args are appended to this list.
+# (APA: Don't implicitely search ., to conform with the docs!)
+# my @INCLUDE_DIRS = (".");
+
+use strict;
+
address@hidden = ();
+
+# -P
+# prepend a directory to the list of directories where @include files are
+# searched for before the directory of the file. additional '-P'
+# args are prepended to this list.
address@hidden = ();
+
+# --split section|chapter|node|none
+# if $SPLIT is set to 'section' (resp. 'chapter') one html file per section
+# (resp. chapter) is generated. If $SPLIT is set to 'node' one html file per
+# node or sectioning element is generated. In all these cases separate pages
+# for Top, Table of content (Toc), Overview and About are generated.
+# Otherwise a monolithic html file that contains the whole document is
+# created.
+set_default('SPLIT', '');
+
+# --separated-footnotes
+# if this is set footnotes are on a separated page. Otherwise they are at
+# the end of each file (if the document is split).
+set_default('footnotestyle', 'end');
+
+# --fill-column
+set_default('FILLCOLUMN', 72);
+
+# --number | --no-number
+# if this is set the sections are numbered, and section names and numbers
+# are used in references and menus (instead of node names).
+set_default('NUMBER_SECTIONS', 1);
+
+# --headers
+# if this is set then navigation panels are printed at the beginning of each
+# section.
+# If the document is split at nodes then navigation panels are
+# printed at the end if there were more than WORDS_IN_PAGE words on page.
+#
+# Navigation panels are always printed at the beginning of output files.
+#
+# This is most useful if you do not want to have section navigation
+# with --split chapter. There will be chapter navigation panel at the
+# beginning and at the end of chapters anyway.
+# this is mostly not used in the default case, important for html.
+set_default('HEADERS', 0);
+
+# -o filename
+# If this is set a monolithic document is outputted into $filename.
+set_default('OUT', undef);
+set_default('OUTFILE', undef);
+
+# --split-size
+# if undef, the info output is not split
+set_default('SPLIT_SIZE', 300000);
+
+# --internal-links
+set_default('INTERNAL_LINKS', undef);
+
+# --no-validate
+# suppress node cross-reference validation
+set_default('novalidate', 0);
+
+# --documentlanguage
+# use gdt('my string') if you want to have translations of 'my string'.
+# Translations are in texinfo/po_document/
+# This is used for the initial language, it is overriden during
+# document processing if there is a @documentlanguage.
+# It is ignored if the language is passed on the command line.
+set_default('documentlanguage', 'en');
+
+# --transliterate-file-names
+# transliterate node names for external refs (and internal if NODE_FILES)
+set_default('TRANSLITERATE_FILE_NAMES', 1);
+
+# --error-limit
+# quit after NUM errors (default 100).
+set_default('ERROR_LIMIT', 100);
+
+# --css-include
+# All the specified css files are used. More precisely the @import sections
+# are added to the beginning of the CSS_LINES the remaining is added at
+# the end of the CSS_LINES (after the css rules generated by the program).
+# cf texinfo manual for more info.
+# - means STDIN
address@hidden = ();
+
+# --css-ref
+# the specified url are used as stylesheet links
address@hidden = ();
+
+# --paragraph-indent
+set_default('paragraphindent',3);
+
+# --enable-encoding
+set_default('ENABLE_ENCODING', 0);
+
+# --force
+set_default('FORCE', 0);
+
+# --no-warn
+set_default('NO_WARN', 0);
+
+# --number-footnotes
+set_default('NUMBER_FOOTNOTES', 1);
+
+# --batch
+set_default('BATCH', 0);
+
+# --silent/--quiet
+set_default('SILENT', 0);
+
+# --Xopt
address@hidden = ();
+
+# not in makeinfo but in texi2dvi
+# --command
address@hidden = ();
+
+##################################################################
+# option specific of texi2html
+# --debug
+# The integer value specifies what kind of debugging output is generated.
+set_default('DEBUG', 0);
+
+# --doctype
+# The value is the 'SystemLiteral' which identifies the canonical DTD
+# for the document.
+# Definition: The SystemLiteral is called the entity's system
+# identifier. It is a URI, which may be used to retrieve the entity.
+# See http://www.xml.com/axml/target.html#NT-ExternalID
+set_default('DOCTYPE', '');
+
+# --frameset-doctype
+# When frames are used, this SystemLiteral identifies the DTD used for
+# the file containing the frame description.
+set_default('FRAMESET_DOCTYPE', '');
+
+# --test
+# If this value is true, some variables which should be dynamically generated
+# (the date, the user running texi2html, the version of texi2html) are set to
+# fix and given values. This is usefull in case the resulting manual is
+# compared with a reference. For example this is used in the tests.
+set_default('TEST', 0);
+
+# --dump-texi
+# This value is usefull for debugging purposes. The result of the first pass is
+# put in <document name>.passtexi, the result of the second pass is put in
+# <document name>.passfirst.
+set_default('DUMP_TEXI', 0);
+
+# --expand
+# the @EXPAND array contains the expanded section names.
address@hidden = ();
+
+# --iso
+# if this value is true, ISO8859 characters are used for quotes.
+# --iso does more than what USE_ISO does.
+set_default('USE_ISO', 0);
+
+# --conf-dir
+# append to the files searched for init files.
address@hidden = ();
+
+# --top-file
+# This file name is used for the top-level file.
+# The extension is set appropriately, if necessary.
+# If empty, <basename of document>.html is used.
+# Typically, you would set this to "index.html".
+set_default('TOP_FILE', '');
+
+# --toc-file
+# This file name is used for the table of contents. The
+# extension is set appropriately, if necessary.
+# If empty, <basename of document>_toc.html is used.
+set_default('TOC_FILE', '');
+
+# --frames
+# if the value is true, HTML 4.0 "frames" are used.
+# A file describing the frame layout is generated, together with a file
+# with the short table of contents.
+set_default('FRAMES', 0);
+
+# --menu | --no-menu
+# if the value is true the Texinfo menus are shown.
+# this is defined in all the formats
+set_default('SHOW_MENU', 1);
+
+# --use-nodes
+# if this is set the nodes are used as sectioning elements.
+# Otherwise the nodes are incorporated in sections.
+set_default('USE_NODES', 1);
+
+# --node-files
+# if this is set one file per node is generated, which can be a target for
+# cross manual references.
+set_default('NODE_FILES', undef);
+
+# --toc-links
+# if this is set, links from headings to toc entries are created.
+set_default('TOC_LINKS', 0);
+
+# --subdir
+# If this is set, then put result files into the specified directory.
+# If not set, then result files are put into the current directory.
+#$SUBDIR = 'html';
+set_default('SUBDIR', undef);
+
+# --short-extn
+# If this is set, then all HTML files will have extension ".htm" instead of
+# ".html". This is helpful when shipping the document to DOS-based systems.
+set_default('SHORTEXTN', 0);
+
+# --prefix
+# This set the output file prefix, prepended to all .html, .gif and .pl files.
+# By default, this is the basename of the document.
+set_default('PREFIX', '');
+
+# --short-ref
+# if this is set cross-references are given without section.
+set_default('SHORT_REF', 1);
+
+# --idx-sum
+# if value is set, then for each @printindex <index name>
+# <document name>_<index name>.idx is created which contains lines of the form
+# key ref sorted alphabetically (case matters).
+set_default('IDX_SUMMARY', 0);
+
+# --def-table
+# If this is set a table construction for @def.... instead of definition
+# lists.
+# (New Option: 27.07.2000 Karl Heinz Marbaise)
+set_default('DEF_TABLE', 0);
+
+# --verbose
+# if this is set chatter about what we are doing.
+set_default('VERBOSE', '');
+
+# --ignore-preamble-text
+# If this is set the text before @node and sectioning commands is ignored.
+set_default('IGNORE_PREAMBLE_TEXT', 0);
+
+# --html-xref-prefix
+# base directory for external manuals. Obsolete.
+set_default('EXTERNAL_DIR', undef);
+
+# --l2h
+# if this is set, latex2html is used for generation of math content.
+set_default('L2H', '');
+
+# --monolithic
+# output only one file including ToC. It only makes sense when not split
+set_default('MONOLITHIC', 1);
+
+######################
+# The following options are only relevant if $L2H is set
+#
+# --l2h-l2h
+# name/location of latex2html program
+set_default('L2H_L2H', 'latex2html');
+
+# --l2h-skip
+# If this is set the actual call to latex2html is skipped. The previously
+# generated content is reused, instead.
+# If set to 0, the cache is not used.
+# If undef the cache is used for as many tex fragments as possible
+# and for the remaining the command is run.
+set_default('L2H_SKIP', undef);
+
+# --l2h-tmp
+# If this is set l2h uses the specified directory for temporary files. The path
+# leading to this directory may not contain a dot (i.e., a ".");
+# otherwise, l2h will fail.
+set_default('L2H_TMP', '');
+
+# --l2h-file
+# If set, l2h uses the file as latex2html init file
+set_default('L2H_FILE', undef);
+
+# --l2h-clean
+# if this is set the intermediate files generated by texi2html in relation with
+# latex2html are cleaned (they all have the prefix <document name>_l2h_).
+set_default('L2H_CLEAN', 1);
+
+##############################################################################
+#
+# The following can only be set in the init file
+#
+##############################################################################
+
address@hidden = ('.txi','.texinfo','.texi','.txinfo','');
+
+set_default('firstparagraphindent', 'none');
+
address@hidden = ('plaintext');
+
+# In file encoding. The @documentencoding allows autodetection of
+# that variable.
+set_default('documentencoding', undef);
+
+# In file encoding, understandable by perl. Set according to documentencoding
+set_default('IN_ENCODING', undef);
+
+# Formatted document encoding name. If undef, set in init_out based on
+# OUT_ENCODING or documentencoding if they are defined
+set_default('ENCODING_NAME', undef);
+
+# Out files encoding, understandable by perl. If undef, set in init_out
+# using ENCODING_NAME or IN_ENCODING if they are defined
+set_default('OUT_ENCODING', undef);
+
+# if undef set to @documentdescription. If there is no @documentdescription,
+# set in page_head.
+set_default('documentdescription', undef);
+
+# EXTERNAL_CROSSREF_SPLIT at the document level set to 1 if SPLIT,
+# to 0 otherwise
+set_default('EXTERNAL_CROSSREF_SPLIT', undef);
+
+# output as @today, and also as the date. Set automatically if not set
+# otherwise.
+set_default('today', undef);
+
+# simple headers formatting, not in a table and using node names.
+set_default('HEADER_IN_TABLE', 0);
+
+# output the generation date in the header.
+set_default('DATE_IN_HEADER', 0);
+
+# use table for indentation of complex formats
+set_default('COMPLEX_FORMAT_IN_TABLE', 0);
+
+# if set, node names are used to construct file names
+# if undef, it is set if split at node, or NODE_FILES is set.
+set_default('NODE_FILENAMES', undef);
+
+# If true do table of contents even if there is no @content
+set_default('contents', undef);
+
+# If true do short table of contents even if there is no @shortcontent
+set_default('shortcontents', undef);
+
+# set by @setcontentsaftertitlepage/@setshortcontentsaftertitlepage
+set_default('setcontentsaftertitlepage', undef);
+set_default('setshortcontentsaftertitlepage', undef);
+
+# corresponds with @kbdinputstyle
+set_default('kbdinputstyle', 'distinct');
+
+# corresponds with @frenchspacing
+set_default('frenchspacing', 'off');
+
+# correspond with @allowcodebreaks
+set_default('allowcodebreaks', 'true');
+
+# corresponds with @setfilename. Set with caution.
+set_default('setfilename', undef);
+
+# if unset, don't show a title
+set_default('SHOW_TITLE', 1);
+
+# if set style is added in attribute.
+set_default('INLINE_CSS_STYLE', 0);
+
+# if set, no css is used.
+set_default('NO_CSS', 0);
+
+# if set, the image files are completed to be relative from the
+# document directory, to the source manual directory and then to
+# the image
+set_default('COMPLETE_IMAGE_PATHS', 0);
+
+# if true, begin outputting at @setfilename, if this command is present.
+set_default('IGNORE_BEFORE_SETFILENAME', 1);
+
+# if true the link in Overview link to the corresponding Toc entry.
+set_default('OVERVIEW_LINK_TO_TOC', 1);
+
+# if set, use node anchors for sections targets
+set_default('USE_NODE_TARGET', 1);
+
+# new style for crossrefs
+set_default('NEW_CROSSREF_STYLE', 1);
+
+# top heading is always at the beginning of the element.
+# FIXME looks like a no-op
+set_default('TOP_HEADING_AT_BEGINNING', 0);
+
+# use titlepage for the title instead of a simplest title
+set_default('USE_TITLEPAGE_FOR_TITLE', 0);
+
+# used as identation for block enclosing command @example, etc
+# If not empty, must be enclosed in <td></td>
+$EXAMPLE_INDENT_CELL = '';
+
+# same as above, only for @small
+$SMALL_EXAMPLE_INDENT_CELL = '';
+
+# unused
+$SMALL_FONT_SIZE = '-1';
+
+# horizontal rules
+# not used
+$SMALL_RULE = '';
+$MIDDLE_RULE = '';
+# used in html
+$DEFAULT_RULE = '';
+$BIG_RULE = '';
+
+# output the program name in the footer
+set_default('PROGRAM_NAME_IN_FOOTER', 0);
+
+# if non-empty, and no @..heading appeared in Top node, then
+# use this as header for top node/section, otherwise use value of
+# @settitle or @shorttitle (in that order)
+$TOP_HEADING = '';
+
+# if set, use this chapter for 'Index' button, else
+# use first chapter with @printindex
+$INDEX_CHAPTER = '';
+
+set_default('SIMPLE_MENU', 1);
+
+set_default('OPEN_QUOTE_SYMBOL', '`');
+set_default('CLOSE_QUOTE_SYMBOL', "'");
+
+$NO_NUMBER_FOOTNOTE_SYMBOL = '*';
+
+# if true put a $MENU_SYMBOL before unnumbered in menus
+$UNNUMBERED_SYMBOL_IN_MENU = 0;
+
+# extension for nodes files when NODE_FILES is true
+set_default('NODE_FILE_EXTENSION', 'txt');
+
+# extension
+set_default('EXTENSION', 'txt');
+
+# file name used for Top node when NODE_FILES is true
+#TOP_NODE_FILE = 'index';
+set_default('TOP_NODE_FILE', undef);
+
+# file name used for Top node in references
+set_default('TOP_NODE_FILE_TARGET', 'index');
+
+# file used as document basename, when input file is -
+$STDIN_DOCU_NAME = 'stdin';
+
+# file used as document output basename, when output file is -
+$STDOUT_DOCU_NAME = 'stdout';
+
+# node name used for Top node when automatic node directions are used
+set_default('TOP_NODE_UP', '(dir)');
+
+# this controls the pre style for menus
+$MENU_PRE_STYLE = 'font-family: serif';
+
+# on bug-texinfo is has been said the the style is not code_style
+# for menus (except for the node name).
+# this controls the menu preformatted format
+# FIXME this is not dynamic, so change in MENU_PRE_STYLE is not taken
+# into account.
+# This is used if the menu appears within a preformatted format (which
+# is certainly an invalid construct), and SIMPLE_MENU is not set.
+$MENU_PRE_COMPLEX_FORMAT = {
+ 'class' => 'menu-preformatted',
+# 'style' => 'code'
+ };
+
+# This controls the ul style for toc
+$NO_BULLET_LIST_STYLE = '';
+$NO_BULLET_LIST_ATTRIBUTE = '';
+
+# These lines are inserted before and after the shortcontents
+$BEFORE_OVERVIEW = "";
+$AFTER_OVERVIEW = "";
+
+# These lines are inserted before and after the contents
+$BEFORE_TOC_LINES = "";
+$AFTER_TOC_LINES = "";
+
+# text inserted after <body ...>
+$AFTER_BODY_OPEN = '';
+
+# text inserted before </body>, this will be automatically inside <p></p>
+$PRE_BODY_CLOSE = '';
+
+# this is added inside <head></head> after <title> and some <meta name>
+# stuff, it can be used for eg. <style>, <script>, <meta> etc. tags.
+$EXTRA_HEAD = '';
+
+# Specifies the minimum page length required before a navigation panel
+# is placed at the bottom of a page
+# FIXME this is not true:
+# THIS_WORDS_IN_PAGE holds number of words of current page
+set_default('WORDS_IN_PAGE', 300);
+
+# if this is set a vertical navigation panel is used.
+set_default('VERTICAL_HEAD_NAVIGATION', 0);
+
+# html version for latex2html
+set_default('L2H_HTML_VERSION', "4.0");
+
+# use icons.
+set_default('ICONS', 0);
+
+# use old framework for translations
+set_default('I18N_PERL_HASH', 0);
+
+# command name to invoke when used as a texi2dvi wrapper
+set_default('TEXI2DVI', 'texi2dvi');
+
+# this resets some defaults, those that are also set in formats and
+# not set in every formats.
+#
+# this is called below after %default_style_map_texi is defined
+sub t2h_default_set_variables_default()
+{
+ $CAPTION_STYLE = 'strong';
+
+# if this variable is true, @setfilename is used if found to determine the
+# out file name
+ set_default('USE_SETFILENAME', 1);
+
+# if true, use the filename and extension from setfilename. For Info.
+ set_default('USE_SETFILENAME_EXTENSION', 0);
+
+# FIXME is this right?
+# default used in init_out for the setting of the ENCODING_NAME variable
+ set_default('DEFAULT_ENCODING', 'utf8');
+
+# if set and menu entry equals menu description, then do not print
+# menu description.
+# Likewise, if node name equals entry name, do not print entry name.
+ set_default('AVOID_MENU_REDUNDANCY', 0);
+
+# if true, use the original command if the result is an entity
+ set_default('ENABLE_ENCODING_USE_ENTITY', 0);
+
+# if set, output the contents where the command is located
+# This is ignored if set*contentsaftertitlepage is set
+ set_default('INLINE_CONTENTS', 1);
+
+# if set, do redirection files for renamed nodes
+ set_default('RENAMED_NODES_REDIRECTIONS', undef);
+
+# symbol put at the beginning of nodes entry in menu (and optionnaly of
+# unnumbered in menus, see UNNUMBERED_SYMBOL_IN_MENU variable)
+ $MENU_SYMBOL = '*';
+
+# symbol put at the end of nodes entry in menu
+ $MENU_ENTRY_COLON = ':';
+
+# symbol put at the end of index entries
+ $INDEX_ENTRY_COLON = ':';
+
+# if set, then use node names in menu entries, instead of section names
+ set_default('NODE_NAME_IN_MENU', 1);
+
+# if set always separate description and menu link, even in
+# preformatted environment
+ set_default('SEPARATE_DESCRIPTION', 0);
+
+# try up sections to complete the node directions
+ set_default('USE_UP_FOR_ADJACENT_NODES', 0);
+
+# use accesskey in hrefs
+ set_default('USE_ACCESSKEY', 1);
+
+# use rel= and rev= in hrefs. Currently only rel is used
+ set_default('USE_REL_REV', 1);
+
+# generate <link> elements in head
+ set_default('USE_LINKS', 1);
+
+# if this variable is true, numeric entities are used when there is no
+# corresponding textual entity.
+ set_default('USE_NUMERIC_ENTITY', 0);
+
+# if set and SPLIT is set, then split index pages at the next letter
+# after they have more than that many entries
+ set_default('SPLIT_INDEX', 0);
+
+# extensions used for images
+ @IMAGE_EXTENSIONS = ('png','jpg', 'txt');
+
+ set_default('USE_NODES', 1);
+
+ set_default('USE_SECTIONS', 1);
+
+# also set by command line options
+ set_default('footnotestyle', 'end');
+
+ set_default('DOCTYPE', '');
+
+ set_default('USE_ISO', 0);
+
+ set_default('NUMBER_SECTIONS', 1);
+
+ set_default('TOP_FILE', '');
+
+ set_default('ENABLE_ENCODING', 0);
+
+#
+# Formatting functions
+#
+# They will be reset here between formats switch
+# if they are defined in this function.
+#
+
+# these are more or less the documented vanilla versions, so they
+# are reset
+$unknown = \&t2h_default_unknown;
+$unknown_style = \&t2h_default_unknown_style;
+$external_ref = \&t2h_default_external_ref;
+$internal_ref = \&t2h_default_internal_ref;
+$tab_item_texi = \&t2h_default_tab_item_texi;
+$complex_format = \&t2h_default_complex_format;
+$toc_body = \&T2H_DEFAULT_toc_body;
+$misc_command_line = \&t2h_default_misc_command_line;
+$misc_command_line_texi = \&t2h_default_misc_command_line;
+$print_title = \&T2H_DEFAULT_print_title;
+# reset in info and xml
+$element_heading = \&t2h_default_element_heading;
+# reset in html
+$inline_contents = \&T2H_DEFAULT_inline_contents;
+# reset in docbook and info.
+$style = \&T2H_GPL_style;
+$format = \&T2H_GPL_format;
+# reset in info
+$simple_command = \&t2h_default_simple_command;
+# reset in info
+$thing_command = \&t2h_default_thing_command;
+# reset in html and xml
+$caption_shortcaption = \&t2h_default_caption_shortcaption;
+$caption_shortcaption_command = \&t2h_default_caption_shortcaption_command;
+# reset in docbook and xml. Not really vanilla, but documented.
+$printindex = \&t2h_GPL_default_printindex;
+# reset by xml and html
+$misc_element_label = \&t2h_default_misc_element_label;
+# set in html
+$init_out = \&t2h_default_init_out;
+# set in info and xml
+$paragraph_style_command = \&t2h_default_paragraph_style_command;
+# set in info
+$colon_command = \&t2h_default_colon_command;
+# set in docbook
+$quotation_prepend_text = \&t2h_default_quotation_prepend_text;
+# set in info
+$copying_comment = \&t2h_default_copying_comment;
+
+# set in html and info
+$print_section = \&T2H_DEFAULT_print_section;
+
+# set in docbook and xml
+%colon_command_punctuation_characters = (
+ '.' => '.',
+ ':' => ':',
+ '?' => '?',
+ '!' => '!'
+);
+
+
+
+# in info
+$footnote_texi = undef;
+$begin_paragraph_texi = undef;
+$begin_style_texi = undef;
+$begin_special_region = undef;
+$end_special_region = undef;
+$empty_preformatted = undef;
+
+%line_command_map = (
+ 'title' => '',
+ 'subtitle' => '',
+ 'author' => '',
+);
+
+%format_in_paragraph = (
+);
+# map mapping css specification to style
+
+%css_map =
+ (
+ );
+
address@hidden = ();
address@hidden = ();
address@hidden = ();
address@hidden = ();
+
+%region_formats_kept = ();
+
+%style_map_texi = ();
+t2h_default_copy_style_map (\%default_style_map_texi, \%style_map_texi);
+
+# reset in info
+%simple_map_texi = %default_simple_map;
+
+# modified in docbook
+%special_accents = (
+ 'ringaccent' => 'aA',
+ "'" => 'aeiouyAEIOUY',
+ ',' => 'cC',
+ '^' => 'aeiouAEIOU',
+ '`' => 'aeiouAEIOU',
+ '~' => 'nNaoAO',
+ '"' => 'aeiouyAEIOU',
+# according to http://www2.lib.virginia.edu/small/vhp/download/ISO.txt
+# however this doesn't seems to work in firefox
+# 'ogonek' => 'aeiuAEIU',
+);
+
+# modified by info, xml, docbook
+# %no_paragraph_commands should not be reset since it has been
+# filled with defaults for many other commands.
+
+# FIXME this prevents the user from setting those entries.
+$no_paragraph_commands{'cindex'} = 1;
+$no_paragraph_commands{'float'} = 1;
+delete $no_paragraph_commands{'anchor'};
+
+# modified in docbook and xml
+%stop_paragraph_command = (
+ 'titlefont' => 1,
+ 'insertcopying' => 1,
+ 'sp' => 1,
+ 'verbatiminclude' => 1,
+ 'page' => 1,
+# FIXME they also stop preformatted, so cannot be here.
+# 'printindex' => 1,
+# 'listoffloats' => 1
+);
+
+}
+
+sub t2h_default_raw_text_load()
+{
+ set_default('SPLIT', '');
+ # extension for nodes files when NODE_FILES is true
+ set_default('NODE_FILE_EXTENSION', 'txt');
+
+ # extension
+ set_default('EXTENSION', 'txt');
+ @T2H_FORMAT_EXPAND = ('plaintext');
+ set_default('USE_TITLEPAGE_FOR_TITLE', 0);
+ set_default('HEADERS', 0);
+ set_default('SIMPLE_MENU', 1);
+ set_default('INLINE_INSERTCOPYING', 0);
+ # reset here, in case it was set to something else by another
+ # format.
+ set_default('TOP_NODE_FILE', undef);
+
+ %simple_map = %default_simple_map;
+ %simple_map_pre = %simple_map;
+
+ %things_map = %default_things_map;
+ %pre_map = %things_map;
+
+ %style_map = ();
+ %style_map_pre = ();
+ t2h_default_copy_style_map (\%default_style_map, \%style_map);
+ t2h_default_copy_style_map (\%default_style_map_pre, \%style_map_pre);
+
+ # could also be t2h_default_set_iso_symbols()
+ t2h_remove_text_substitutions("'", 1, 0, 0, 1);
+ t2h_remove_text_substitutions('`', 1, 0, 0, 1);
+ set_default('OPEN_QUOTE_SYMBOL', '`');
+ set_default('CLOSE_QUOTE_SYMBOL', "'");
+
+ $BEFORE_OVERVIEW = "";
+ $AFTER_OVERVIEW = "";
+
+ $BEFORE_TOC_LINES = "";
+ $AFTER_TOC_LINES = "";
+
+
+ foreach my $complex_format ('example', 'smallexample', 'display',
+ 'smalldisplay', 'lisp', 'smalllisp', 'format', 'smallformat',
+ 'menu', 'detailmenu', 'direntry', 'menu_comment')
+ {
+ $complex_format_map{$complex_format}->{'begin'} = '';
+ $complex_format_map{$complex_format}->{'end'} = '';
+ }
+
+ %format_map = (
+# 'quotation' => 'blockquote',
+ # lists
+# 'itemize' => 'ul',
+ 'enumerate' => '',
+# 'multitable' => 'table',
+ 'table' => '',
+ 'vtable' => '',
+ 'ftable' => '',
+ 'group' => '',
+ 'raggedright' => '',
+# 'detailmenu' => '',
+ );
+
+ #
+ # Controls the layout
+ #
+
+ $print_page_head = \&T2H_DEFAULT_print_page_head;
+ $contents = \&T2H_DEFAULT_contents;
+ $shortcontents = \&T2H_DEFAULT_shortcontents;
+ $one_section = \&T2H_DEFAULT_one_section;
+ $print_Top = \&T2H_DEFAULT_print_Top;
+ $print_Top_footer = \&T2H_DEFAULT_print_Top_footer;
+ $print_misc_header = \&T2H_DEFAULT_print_misc_header;
+ $print_misc_footer = \&T2H_DEFAULT_print_misc_footer;
+ $print_section_footer = \&T2H_DEFAULT_print_section_footer;
+ $print_chapter_header = \&T2H_DEFAULT_print_chapter_header;
+ $print_section_header = \&T2H_DEFAULT_print_section_header;
+ $print_chapter_footer = \&T2H_DEFAULT_print_chapter_footer;
+ $print_page_foot = \&T2H_DEFAULT_print_page_foot;
+ $print_head_navigation = \&T2H_DEFAULT_print_head_navigation;
+ $print_foot_navigation = \&T2H_DEFAULT_print_foot_navigation;
+ $end_section = \&T2H_DEFAULT_end_section;
+ # changed in info
+ $print_Footnotes = \&T2H_DEFAULT_print_Footnotes;
+ # used if split
+ $about_body = \&T2H_DEFAULT_about_body;
+ $print_navigation = \&T2H_DEFAULT_print_navigation;
+
+ #
+ # Controls the formatting
+ #
+
+ $empty_line = \&t2h_default_empty_line;
+ $anchor = \&t2h_default_anchor;
+ $anchor_label = \&t2h_default_anchor_label;
+ $image = \&t2h_default_image;
+ $heading = \&t2h_default_heading;
+ $heading_text = \&t2h_default_heading_text;
+ $heading_text_preformatted = \&t2h_default_heading_text_preformatted;
+ $element_label = \&t2h_default_element_label;
+ $index_entry_label = \&t2h_default_index_entry_label;
+ #$menu_command = \&t2h_default_menu_command;
+ $menu_link = \&t2h_default_menu_link;
+ #$menu_description = \&t2h_default_menu_description;
+ $paragraph = \&t2h_default_paragraph;
+ $preformatted = \&t2h_default_preformatted;
+ $protect_text = \&t2h_default_protect_text;
+ $normal_text = \&t2h_default_normal_text;
+ $acronym_like = \&t2h_default_acronym_like;
+ $sp = \&t2h_default_sp;
+ $quotation = \&t2h_default_quotation;
+ $table_list = \&t2h_default_table_list;
+ $list_item = \&t2h_default_list_item;
+ $table_line = \&t2h_default_table_line;
+ $table_item = \&t2h_default_table_item;
+ $cell = \&t2h_default_cell;
+ $row = \&t2h_default_row;
+ $def_item = \&t2h_default_def_item;
+ $def = \&t2h_default_def;
+ $def_line = \&t2h_default_def_line;
+ $cartouche = \&t2h_default_cartouche;
+ $raw = \&t2h_default_raw;
+ $format_list_item_texi = \&t2h_default_format_list_item_texi;
+ $print_index = \&t2h_default_print_index;
+ $index_summary = \&t2h_default_index_summary;
+ $index_entry = \&t2h_default_index_entry;
+ $index_letter = \&t2h_default_index_letter;
+ $foot_line_and_ref = \&t2h_default_foot_line_and_ref;
+ $foot_section = \&t2h_default_foot_section;
+ $tab_item_texi = \&t2h_default_tab_item_texi;
+ $listoffloats = \&t2h_default_listoffloats;
+ $listoffloats_entry = \&t2h_default_listoffloats_entry;
+ $float = \&t2h_default_float;
+
+ t2h_default_set_variables_default();
+}
+
+my %things_map_xml;
+my %pre_map_xml;
+
+sub t2h_default_set_variables_xml()
+{
+ t2h_default_set_variables_default();
+ set_default('ENABLE_ENCODING_USE_ENTITY', 1);
+ set_default('EXTENSION', 'xml');
+ t2h_default_set_iso_symbols(1);
+
+ $empty_line = \&t2h_default_empty_line;
+ $comment = \&xml_default_comment;
+ $line_command = \&xml_default_line_command;
+
+ %things_map = %things_map_xml;
+ %pre_map = %pre_map_xml;
+ %simple_format_texi_map = %pre_map;
+
+ %simple_format_style_map_texi = ();
+ t2h_default_copy_style_map (\%default_style_map_texi,
\%simple_format_style_map_texi);
+ foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
+ {
+# $simple_format_style_map_texi{$accent_command}->{'args'} = ['normal'];
+ $simple_format_style_map_texi{$accent_command}->{'function'} =
\&xml_default_accent;
+ }
+}
+
+sub t2h_default_set_variables_texi2html()
+{
+ set_default('USE_SETFILENAME', 0);
+ set_default('USE_SETFILENAME_EXTENSION', 0);
+ set_default('footnotestyle', 'separate');
+ set_default('INLINE_CONTENTS', 0);
+ set_default('FORCE', 1);
+ set_default('AVOID_MENU_REDUNDANCY', 1);
+ set_default('TOP_HEADING_AT_BEGINNING', 1);
+ set_default('TOP_FILE', '');
+ set_default('USE_ACCESSKEY', 0);
+ set_default('NODE_NAME_IN_MENU', 0);
+ set_default('OVERVIEW_LINK_TO_TOC', 0);
+ set_default('USE_UP_FOR_ADJACENT_NODES', 1);
+ set_default('USE_REL_REV', 0);
+ set_default('USE_LINKS', 0);
+ set_default('USE_NODES', undef);
+ set_default('USE_SECTIONS', 1);
+ set_default('NODE_FILENAMES', 0);
+ set_default('USE_NUMERIC_ENTITY', 1);
+ set_default('SPLIT', '');
+ set_default('SPLIT_INDEX', 100);
+ set_default('PROGRAM_NAME_IN_FOOTER', 1);
+ set_default('HEADER_IN_TABLE', 1);
+ set_default('SHORT_REF', 0);
+ set_default('USE_TITLEPAGE_FOR_TITLE', 1);
+ $MENU_ENTRY_COLON = '';
+ $INDEX_ENTRY_COLON = '';
+
+ set_default('ENABLE_ENCODING_USE_ENTITY', 1);
+}
+
+# specify in this array which "buttons" should appear in which order
+# in the navigation panel for sections; use ' ' for empty buttons (space)
address@hidden =
+ (
+ 'FastBack', 'Back', 'Up', 'Forward', 'FastForward',
+ ' ', ' ', ' ', ' ',
+ 'Top', 'Contents', 'Index', 'About',
+ );
+
+# buttons for misc stuff
address@hidden = ('Top', 'Contents', 'Index', 'About');
+
address@hidden = ( 'Back', 'Forward', ' ','Contents', 'Index', 'About');
address@hidden = ('Top', 'Contents', 'Index', 'About');
+
+
+# buttons for chapter file footers
+# (and headers but only if HEADERS is false)
address@hidden =
+ (
+ 'FastBack', 'FastForward', ' ',
+ ' ', ' ', ' ', ' ',
+ 'Top', 'Contents', 'Index', 'About',
+ );
+
+# buttons for section file footers
address@hidden =
+ (
+ 'FastBack', 'Back', 'Up', 'Forward', 'FastForward',
+ );
+
address@hidden = @SECTION_BUTTONS;
+
address@hidden =
+ (
+ 'Top', 'Index', 'Contents', 'About', 'Up', 'NextFile', 'PrevFile'
+ );
+
+
+# insert here name of icon images for buttons
+# Icons are used, if ICONS and resp. value are set
+%ACTIVE_ICONS =
+ (
+ 'Top', '',
+ 'Contents', '',
+ 'Overview', '',
+ 'Index', '',
+ 'This', '',
+ 'Back', '',
+ 'FastBack', '',
+ 'Prev', '',
+ 'Up', '',
+ 'Next', '',
+ 'NodeUp', '',
+ 'NodeNext', '',
+ 'NodePrev', '',
+ 'NodeForward', '',
+ 'NodeBack', '',
+ 'Forward', '',
+ 'FastForward', '',
+ 'About' , '',
+ 'First', '',
+ 'Last', '',
+ 'NextFile', '',
+ 'PrevFile', '',
+ ' ', '',
+ );
+
+# insert here name of icon images for these, if button is inactive
+%PASSIVE_ICONS =
+ (
+ 'Top', '',
+ 'Contents', '',
+ 'Overview', '',
+ 'Index', '',
+ 'This', '',
+ 'Back', '',
+ 'FastBack', '',
+ 'Prev', '',
+ 'Up', '',
+ 'Next', '',
+ 'NodeUp', '',
+ 'NodeNext', '',
+ 'NodePrev', '',
+ 'NodeForward', '',
+ 'NodeBack', '',
+ 'Forward', '',
+ 'FastForward', '',
+ 'About', '',
+ 'First', '',
+ 'Last', '',
+ 'NextFile', '',
+ 'PrevFile', '',
+ );
+
+%misc_pages_targets = (
+ 'Overview' => 'SEC_Overview',
+ 'Contents' => 'SEC_Contents',
+ 'Footnotes' => 'SEC_Foot',
+ 'About' => 'SEC_About'
+);
+
+# determine the null devices
+my $default_null_device = File::Spec->devnull();
+%null_device_file = (
+ $default_null_device => 1
+);
+# special case, djgpp recognizes both null devices
+if ($Config{osname} eq 'dos' and $Config{osvers} eq 'djgpp')
+{
+ $null_device_file{'/dev/null'} = 1;
+ $null_device_file{'NUL'} = 1;
+}
+
+%texi2dvi_formats = (
+ 'dvi' => 1,
+ 'pdf' => 1,
+ 'ps' => 1
+);
+
+$finish_out = \&t2h_default_finish_out;
+$translate_names = \&t2h_default_translate_names;
+
+sub t2h_default_translate_names()
+{
+# Names of text as alternative for icons
+# FIXME maybe get those in simple_format?
+ %NAVIGATION_TEXT =
+ (
+ 'Top', gdt('Top'),
+ 'Contents', gdt('Contents'),
+ 'Overview', gdt('Overview'),
+ 'Index', gdt('Index'),
+ ' ', ' ',
+ 'This', gdt('Current'),
+ 'Back', ' < ',
+ 'FastBack', ' << ',
+ 'Prev', gdt('Previous'),
+ 'Up', gdt('Up'),
+ 'Next', gdt('Next'),
+ 'NodeUp', gdt('Up'),
+ 'NodeNext', gdt('Next'),
+ 'NodePrev', gdt('Previous'),
+ 'NodeForward', gdt('Forward node'),
+ 'NodeBack', gdt('Back node'),
+ 'Forward', ' > ',
+ 'FastForward', ' >> ',
+ 'About', ' ? ',
+ 'First', ' |< ',
+ 'Last', ' >| ',
+ 'NextFile', gdt('Next file'),
+ 'PrevFile', gdt('Previous file'),
+ );
+ %BUTTONS_TEXT = %NAVIGATION_TEXT;
+
+ %BUTTONS_GOTO =
+ (
+ 'Top', gdt('Cover (top) of document'),
+ 'Contents', gdt('Table of contents'),
+ 'Overview', gdt('Short table of contents'),
+ 'Index', gdt('Index'),
+ 'This', gdt('Current section'),
+ 'Back', gdt('Previous section in reading order'),
+ 'FastBack', gdt('Beginning of this chapter or previous chapter'),
+ 'Prev', gdt('Previous section on same level'),
+ 'Up', gdt('Up section'),
+ 'Next', gdt('Next section on same level'),
+ 'NodeUp', gdt('Up node'),
+ 'NodeNext', gdt('Next node'),
+ 'NodePrev', gdt('Previous node'),
+ 'NodeForward', gdt('Next node in node reading order'),
+ 'NodeBack', gdt('Previous node in node reading order'),
+ 'Forward', gdt('Next section in reading order'),
+ 'FastForward', gdt('Next chapter'),
+ 'About' , gdt('About (help)'),
+ 'First', gdt('First section in reading order'),
+ 'Last', gdt('Last section in reading order'),
+ 'NextFile', gdt('Forward section in next file'),
+ 'PrevFile', gdt('Back section in previous file'),
+ );
+
+ %BUTTONS_NAME =
+ (
+ 'Top', gdt('Top'),
+ 'Contents', gdt('Contents'),
+ 'Overview', gdt('Overview'),
+ 'Index', gdt('Index'),
+ ' ', ' ',
+ 'This', gdt('This'),
+ 'Back', gdt('Back'),
+ 'FastBack', gdt('FastBack'),
+ 'Prev', gdt('Prev'),
+ 'Up', gdt('Up'),
+ 'Next', gdt('Next'),
+ 'NodeUp', gdt('NodeUp'),
+ 'NodeNext', gdt('NodeNext'),
+ 'NodePrev', gdt('NodePrev'),
+ 'NodeForward', gdt('NodeForward'),
+ 'NodeBack', gdt('NodeBack'),
+ 'Forward', gdt('Forward'),
+ 'FastForward', gdt('FastForward'),
+ 'About', gdt('About'),
+ 'First', gdt('First'),
+ 'Last', gdt('Last'),
+ 'NextFile', gdt('NextFile'),
+ 'PrevFile', gdt('PrevFile'),
+ );
+
+}
+
+sub t2h_default_set_iso_symbols($;$$)
+{
+ my $value = shift;
+ my $from_cmd_line = shift;
+ my $from_document = shift;
+ if ($from_cmd_line)
+ {
+ main::set_from_cmdline('USE_ISO', $value);
+ }
+ elsif ($from_document)
+ {
+ set_from_document('USE_ISO', $value);
+ }
+ else
+ {
+ set_default('USE_ISO', $value);
+ }
+ my ($open_quote, $close_quote);
+ if ($value)
+ {
+ foreach my $association ([\%things_map, \%things_map_xml],
+ [\%pre_map, \%pre_map_xml],
+ [\%simple_format_simple_map_texi, \%pre_map_xml])
+ {
+ foreach my $thing (keys(%{$association->[0]}))
+ {
+ if (defined($association->[0]->{$thing}) and
$association->[0]->{$thing} !~ /^\&\w+\;$/ and
defined($association->[1]->{$thing}) and $association->[1]->{$thing} =~
/^\&\w+\;$/)
+ {
+ $association->[0]->{$thing} = $association->[1]->{$thing};
+ }
+ }
+ }
+ t2h_add_text_substitutions(["'", '’'], 1, 0, 0, 1);
+ t2h_add_text_substitutions(['`', '‘'], 1, 0, 0, 1);
+ $open_quote = '‘';
+ $close_quote = '’';
+ }
+ else
+ {
+ foreach my $association ([\%things_map, \%default_things_map],
+ [\%pre_map, \%default_things_map],
+ [\%simple_format_simple_map_texi,
\%default_things_map])
+ {
+ foreach my $thing (keys(%{$association->[0]}))
+ {
+ if (defined($association->[0]->{$thing}) and
$association->[0]->{$thing} =~ /^\&\w+\;$/ and
defined($association->[1]->{$thing}) and $association->[1]->{$thing} !~
/^\&\w+\;$/)
+ {
+ $association->[0]->{$thing} =
&$protect_text($association->[1]->{$thing});
+ }
+ }
+ }
+ t2h_remove_text_substitutions("'", 1, 0, 0, 1);
+ t2h_remove_text_substitutions('`', 1, 0, 0, 1);
+ $open_quote = '`';
+ $close_quote = "'";
+ }
+ if ($from_cmd_line)
+ {
+ main::set_from_cmdline('OPEN_QUOTE_SYMBOL', $open_quote);
+ main::set_from_cmdline('CLOSE_QUOTE_SYMBOL', $close_quote);
+ }
+ elsif ($from_document)
+ {
+ main::set_from_document('OPEN_QUOTE_SYMBOL', $open_quote);
+ main::set_from_document('CLOSE_QUOTE_SYMBOL', $close_quote);
+ }
+ else
+ {
+ set_default('OPEN_QUOTE_SYMBOL', $open_quote);
+ set_default('CLOSE_QUOTE_SYMBOL', $close_quote);
+ }
+
+}
+
+# is used in main program for dumping texi too.
+sub t2h_default_set_out_encoding()
+{
+ # set in reverse order of precedence, such that later setting
+ # override the first settings.
+ my $out_encoding_from_documentencoding = main::encoding_alias
(get_conf('documentencoding'), undef, 'determining encoding from
documentencoding');
+ set_from_document('OUT_ENCODING', $out_encoding_from_documentencoding) if
(defined($out_encoding_from_documentencoding));
+ set_from_document('OUT_ENCODING', get_conf('IN_ENCODING')) if
(defined(get_conf('IN_ENCODING')));
+ my $out_encoding_from_encoding_name = main::encoding_alias
(get_conf('ENCODING_NAME'), undef, 'determining encoding from default
encoding');
+ set_from_document('OUT_ENCODING', $out_encoding_from_encoding_name) if
(defined($out_encoding_from_encoding_name));
+
+ main::document_warn (__("Document encoding is utf8, but there is no
unicode support")) if (defined(get_conf('OUT_ENCODING')) and
get_conf('OUT_ENCODING') eq 'utf-8' and !get_conf('USE_UNICODE'));
+
+ set_from_document('ENCODING_NAME', 'us-ascii');
+ set_from_document('ENCODING_NAME',
$perl_charset_to_html{get_conf('DEFAULT_ENCODING')}) if
(defined(get_conf('DEFAULT_ENCODING')) and
defined($perl_charset_to_html{get_conf('DEFAULT_ENCODING')}));
+ set_from_document('ENCODING_NAME', get_conf('documentencoding')) if
(defined(get_conf('documentencoding')));
+ set_from_document('ENCODING_NAME', get_conf('IN_ENCODING')) if
(defined(get_conf('IN_ENCODING')));
+ set_from_document('ENCODING_NAME', get_conf('OUT_ENCODING')) if
(defined(get_conf('OUT_ENCODING')));
+ set_from_document('ENCODING_NAME',
$perl_charset_to_html{get_conf('documentencoding')}) if
(defined(get_conf('documentencoding')) and
defined($perl_charset_to_html{get_conf('documentencoding')}));
+ set_from_document('ENCODING_NAME',
$perl_charset_to_html{get_conf('IN_ENCODING')}) if
(defined(get_conf('IN_ENCODING')) and
defined($perl_charset_to_html{get_conf('IN_ENCODING')}));
+ set_from_document('ENCODING_NAME',
$perl_charset_to_html{get_conf('OUT_ENCODING')}) if
(defined(get_conf('OUT_ENCODING')) and
defined($perl_charset_to_html{get_conf('OUT_ENCODING')}));
+
+
+ if (get_conf('VERBOSE'))
+ {
+ # verbose output
+ my $out_encoding = get_conf('OUT_ENCODING');
+ $out_encoding = 'UNDEF' if (!defined($out_encoding));
+ my $in_encoding = get_conf('IN_ENCODING');
+ $in_encoding = 'UNDEF' if (!defined($in_encoding));
+ my $document_encoding = get_conf('documentencoding');
+ $document_encoding = 'UNDEF' if (!defined($document_encoding));
+ my $encoding_name = get_conf('ENCODING_NAME');
+ print STDERR "# Encodings: doc $document_encoding, in $in_encoding out
$out_encoding, name $encoding_name\n";
+ }
+}
+
+sub t2h_default_init_out()
+{
+ &$translate_names;
+ # set external cross ref splitting like splitting.
+ if (get_conf('SPLIT'))
+ {
+ set_from_document('EXTERNAL_CROSSREF_SPLIT', 1);
+ }
+ else
+ {
+ set_from_document('EXTERNAL_CROSSREF_SPLIT', 0);
+ }
+}
+
+my %t2h_default_formats_load_table = (
+ 'html' => \&html_default_load,
+ 'info' => \&info_default_load,
+ 'docbook' => \&docbook_default_load,
+ 'xml' => \&xml_default_load,
+ 'plaintext' => \&plaintext_default_load,
+ 'raw-text' => \&t2h_default_raw_text_load,
+);
+
+sub t2h_default_load_format($;$)
+{
+ my $format = shift;
+ my $from_command_line = shift;
+ if (defined($t2h_default_formats_load_table{$format}) or
$texi2dvi_formats{$format})
+ {
+ $OUTPUT_FORMAT = $format;
+ &{$t2h_default_formats_load_table{$format}}($from_command_line) unless
($texi2dvi_formats{$format});
+ $Texi2HTML::THISDOC{'format_from_command_line'} = $format if
($from_command_line);
+ return 1;
+ }
+ else
+ {
+ return 0;
+ }
+}
+
+sub t2h_encoding_is_entity($)
+{
+ my $text = shift;
+ return 0 if (!get_conf('ENABLE_ENCODING_USE_ENTITY'));
+ return 1 if ($text =~ /^&/ and $text =~ /;$/);
+}
+
+# this is for info.pm
+use vars qw(%t2h_enable_encoding_default_accent);
+my @t2h_enable_encoding_accents_stack;
+my %t2h_enable_encoding_default_commands;
+
+sub t2h_enable_encoding_load()
+{
+ t2h_default_push_handler(\&t2h_enable_encoding_init, address@hidden);
+ t2h_default_push_handler(\&t2h_enable_encoding_finish, address@hidden);
+ #push @command_handler_process, \&t2h_enable_encoding_init;
+ #push @command_handler_finish, \&t2h_enable_encoding_finish;
+ foreach my $key (keys(%unicode_accents), 'dotless')
+ {
+ $t2h_enable_encoding_default_accent{'normal'}->{$key} =
$style_map{$key}->{'function'};
+ $t2h_enable_encoding_default_accent{'texi'}->{$key} =
$style_map_texi{$key}->{'function'};
+ $t2h_enable_encoding_default_accent{'pre'}->{$key} =
$style_map_pre{$key}->{'function'};
+ $style_map{$key}->{'function'} = \&t2h_enable_encoding_normal_accent;
+ $style_map_texi{$key}->{'function'} = \&t2h_enable_encoding_texi_accent;
+ $style_map_pre{$key}->{'function'} = \&t2h_enable_encoding_pre_accent;
+ }
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+ $t2h_enable_encoding_default_commands{'normal'}->{$key} =
$things_map{$key};
+ $t2h_enable_encoding_default_commands{'texi'}->{$key} = $texi_map{$key};
+ $t2h_enable_encoding_default_commands{'sorting'}->{$key} =
$sorting_things_map{$key};
+ $t2h_enable_encoding_default_commands{'pre'}->{$key} = $pre_map{$key};
+ }
+ }
+}
+
+sub t2h_enable_encoding_finish()
+{
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+ $things_map{$key} =
$t2h_enable_encoding_default_commands{'normal'}->{$key};
+ $texi_map{$key} = $t2h_enable_encoding_default_commands{'texi'}->{$key};
+ $sorting_things_map{$key} =
$t2h_enable_encoding_default_commands{'sorting'}->{$key};
+ $pre_map{$key} = $t2h_enable_encoding_default_commands{'pre'}->{$key};
+ }
+ }
+}
+
+sub t2h_enable_encoding_init()
+{
+ if (get_conf('ENCODING_NAME') eq 'utf-8')
+ {
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+ $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
+ $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
+ $sorting_things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($sorting_things_map{$key}));
+ $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
+ }
+ }
+ }
+ elsif (exists($makeinfo_encoding_to_map{get_conf('ENCODING_NAME')}))
+ {
+ my $enc_map = $makeinfo_encoding_to_map{get_conf('ENCODING_NAME')};
+
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne '') and
+ exists($makeinfo_unicode_to_eight_bit{$enc_map}->{$unicode_map{$key}}))
+ { # we let perl handle the conversion
+ $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
+ $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
+ $sorting_things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($sorting_things_map{$key}));
+ $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
+ }
+ }
+ @t2h_enable_encoding_accents_stack = ();
+ }
+}
+
+sub t2h_default_string_width($)
+{
+ my $string = shift;
+ if (get_conf('USE_UNICODE'))
+ {
+ my $width = 0;
+ foreach my $character(split '', $string)
+ {
+ if ($character =~ /\p{Unicode::EastAsianWidth::InFullwidth}/)
+ {
+ $width += 2;
+ }
+ else
+ {
+ $width += 1;
+ }
+ }
+ return $width;
+ }
+ else
+ {
+ return length($string);
+ }
+}
+
+sub t2h_default_finish_out()
+{
+}
+
+
+########################################################################
+# Control of Page layout:
+# You can make changes of the Page layout at two levels:
+# 1.) For small changes, it is often enough to change the value of
+# some global string/hash/array variables
+# 2.) For larger changes, reimplement one of the T2H_DEFAULT_<fnc>* routines,
+# give them another name, and assign them to the respective
+# $<fnc> variable.
+
+# As a general interface, the hashes Texi2HTML::HREF, Texi2HTML::NAME,
Texi2HTML::NODE, Texi2HTML::NO_TEXI, Texi2HTML::SIMPLE_TEXT hold
+# href, html-name, node-name, name after removal of texi commands of
+# This -- current section (resp. html page)
+# Top -- top element
+# Contents -- Table of contents element
+# Overview -- Short table of contents element
+# Index -- Index page element
+# About -- page which explain "navigation buttons" element
+# First -- first node element
+# Last -- last node element
+#
+# Whether or not the following hash values are set, depends on the context
+# (all values are w.r.t. 'This' section)
+# Next -- next element of texinfo
+# Prev -- previous element of texinfo
+# NodeUp -- up node of texinfo
+# NodeForward -- next node in node reading order, taking menu into account
+# NodeBack -- previous node in node reading order, taking menu into account
+# Forward -- next node in reading order
+# Back -- previous node in reading order
+# Up -- parent given by sectioning commands
+# FastForward -- if leave node, up and next, else next node
+# FastBack -- if leave node, up and prev, else prev node
+#
+# Furthermore, the following global variabels are set:
+# $Texi2HTML::THISDOC{'title'} -- title as set by @title...
+# $Texi2HTML::THISDOC{'title_no_texi'} -- title without texi (without html
elements)
+# $Texi2HTML::THISDOC{'title_texi'} -- title with texinfo @-commands
+# $Texi2HTML::THISDOC{'fulltitle'} -- full title as set by @title...
+# $Texi2HTML::THISDOC{'subtitle'} -- subtitle as set by @subtitle
+# $Texi2HTML::THISDOC{'author'} -- author as set by @author
+# $Texi2HTML::THISDOC{'copying_comment'} -- text of @copying and @end copying
in comment
+#
+# $Texi2HTML::THISDOC{'program'} -- name of program generating the
output
+# $Texi2HTML::THISDOC{'program_homepage'} -- homepage of program
+# $Texi2HTML::THISDOC{'toc_file} -- table of contents file
+# $Texi2HTML::THISDOC{'file_base_name'} -- base name of the texinfo manual
file
+# $Texi2HTML::THISDOC{'input_file_name'} -- name of the texinfo manual file
+# $Texi2HTML::THISDOC{'destination_directory'}
+ # -- directory for the resulting files
+# $Texi2HTML::THISDOC{'css_import_lines'} -- ref on @import lines in css files
+# $Texi2HTML::THISDOC{'css_rule_lines'} -- ref on css rules lines
+#
+# and pointer to arrays of lines which need to be printed by main::print_lines
+# $Texi2HTML::THIS_SECTION -- lines of 'This' section
+# $Texi2HTML::OVERVIEW -- lines of short table of contents
+# $Texi2HTML::TOC_LINES -- lines of table of contents
+# $Texi2HTML::TITLEPAGE -- lines of title page
+#
+# $Texi2HTML::THIS_ELEMENT holds the element reference.
+
+# most of the functions are either reset when switching format, in
+# t2h_default_set_variables_default, or set in format, the simplest
+# one being setup above in t2h_default_raw_text_load
+
+#
+# The following generic subs control the layout:
+#
+# misc element formatting functions. They are rather generic,
+# their call is controlled by other variables (separate or not
+# footnotes, about_body, handling of table of contents...).
+# print_Footnotes is the only to be redefined, in info
+$print_Toc = \&T2H_DEFAULT_print_Toc;
+$print_Overview = \&T2H_DEFAULT_print_Overview;
+$print_About = \&T2H_DEFAULT_print_About;
+$print_misc = \&T2H_DEFAULT_print_misc;
+# generic enough (call print_page_head if needed)
+$print_Top_header = \&T2H_DEFAULT_print_Top_header;
+
+# the following are less generic, but in case a specific format
+# doesn't redefine them, the raw text functions are always defined.
+$print_page_head = \&T2H_DEFAULT_print_page_head;
+$contents = \&T2H_DEFAULT_contents;
+$shortcontents = \&T2H_DEFAULT_shortcontents;
+$one_section = \&T2H_DEFAULT_one_section;
+$print_Top = \&T2H_DEFAULT_print_Top;
+$print_Top_footer = \&T2H_DEFAULT_print_Top_footer;
+$print_misc_header = \&T2H_DEFAULT_print_misc_header;
+$print_misc_footer = \&T2H_DEFAULT_print_misc_footer;
+$print_section_footer = \&T2H_DEFAULT_print_section_footer;
+$print_chapter_header = \&T2H_DEFAULT_print_chapter_header;
+$print_section_header = \&T2H_DEFAULT_print_section_header;
+$print_chapter_footer = \&T2H_DEFAULT_print_chapter_footer;
+$print_page_foot = \&T2H_DEFAULT_print_page_foot;
+$print_head_navigation = \&T2H_DEFAULT_print_head_navigation;
+$print_foot_navigation = \&T2H_DEFAULT_print_foot_navigation;
+$end_section = \&T2H_DEFAULT_end_section;
+# changed in info
+$print_Footnotes = \&T2H_DEFAULT_print_Footnotes;
+# used if split
+$about_body = \&T2H_DEFAULT_about_body;
+$print_navigation = \&T2H_DEFAULT_print_navigation;
+
+#
+# generic formatting functions
+#
+
+$button_icon_img = \&T2H_DEFAULT_button_icon_img;
+# not really needed nor relevant except for html
+$print_frame = \&T2H_DEFAULT_print_frame;
+$print_toc_frame = \&T2H_DEFAULT_print_toc_frame;
+# generic
+$titlepage = \&T2H_DEFAULT_titlepage;
+$css_lines = \&T2H_DEFAULT_css_lines;
+$print_redirection_page = \&T2H_DEFAULT_print_redirection_page;
+$node_file_name = \&T2H_DEFAULT_node_file_name;
+$inline_contents = \&T2H_DEFAULT_inline_contents;
+$program_string = \&T2H_DEFAULT_program_string;
+$element_file_name = \&t2h_default_element_file_name;
+
+########################################################################
+# Layout for every sections
+#
+
+sub T2H_DEFAULT_print_section($$$$)
+{
+ my $fh = shift;
+ my $first_in_page = shift;
+ my $previous_is_top = shift;
+ my $element = shift;
+
+ my $nw = main::print_lines($fh);
+}
+
+sub T2H_DEFAULT_one_section($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ main::print_lines($fh);
+ &$print_page_foot($fh);
+}
+
+###################################################################
+# Layout of top-page. It is possible to use @ifnothtml, @ifhtml,
+# @html within the Top texinfo node to specify content of top-level
+# page.
+#
+sub T2H_DEFAULT_print_Top_header($$)
+{
+ my $fh = shift;
+ my $do_page_head = shift;
+ &$print_page_head($fh) if ($do_page_head);
+}
+sub T2H_DEFAULT_print_Top_footer($$$)
+{
+ my $fh = shift;
+ my $end_page = shift;
+ my $element = shift;
+ if ($end_page)
+ {
+ &$print_page_foot($fh);
+ }
+}
+
+sub T2H_DEFAULT_print_Top($$$)
+{
+ my $fh = shift;
+ my $has_top_heading = shift;
+ my $element = shift;
+
+ if (get_conf('setshortcontentsaftertitlepage'))
+ {
+ my $shortcontents = &$inline_contents($fh, 'shortcontents');
+ print $fh "".join('',@$shortcontents) if (defined($shortcontents));
+ }
+ if (get_conf('setcontentsaftertitlepage'))
+ {
+ my $contents = &$inline_contents($fh, 'contents');
+ print $fh "".join('',@$contents) if (defined($contents));
+ }
+
+ main::print_lines($fh, $Texi2HTML::THIS_SECTION);
+}
+
+###################################################################
+# Layout of Toc, Overview, and Footnotes pages
+# By default, we use "normal" layout
+# Texi2HTML::HREF of Next, Prev, Up, Forward, Back, etc are not defined
+# redefine address@hidden to change the navigation
+sub T2H_DEFAULT_print_Toc
+{
+ return &$print_misc(@_);
+}
+sub T2H_DEFAULT_print_Overview
+{
+ return &$print_misc(@_);
+}
+sub T2H_DEFAULT_print_Footnotes
+{
+ return &$print_misc(@_);
+}
+sub T2H_DEFAULT_print_About
+{
+ return &$print_misc(@_);
+}
+
+sub T2H_DEFAULT_print_misc_header($$$$)
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $new_file = shift;
+ my $misc_page = shift;
+ &$print_page_head($fh) if ($new_file);
+}
+
+sub T2H_DEFAULT_print_misc_footer($$$)
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $new_file = shift;
+ if ($new_file)
+ {
+ &$print_page_foot($fh);
+ }
+}
+
+use vars qw(
+%t2h_default_underline_symbol
+);
+
+%t2h_default_underline_symbol = (
+ 0 => '*',
+ 1 => '*',
+ 2 => '=',
+ 3 => '-',
+ 4 => '.'
+);
+
+sub t2h_default_heading_text($$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $level = shift;
+
+ return '' if ($text !~ /\S/);
+ my $result = $text ."\n";
+ # as seen in encodings/nodetest_utf8_no_unicode, the length can be in
+ # bytes (certainly) when there hasn't been a require Encode
+ #$result .=($t2h_default_underline_symbol{$level} x length($text))."\n";
+ $result .=($t2h_default_underline_symbol{$level} x
t2h_default_string_width($text))."\n";
+ return $result;
+}
+
+sub t2h_default_heading_text_preformatted($$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $level = shift;
+
+ return t2h_default_heading_text($command, $text, $level);
+}
+
+sub T2H_DEFAULT_print_misc($$$)
+{
+ my $fh = shift;
+ my $new_file = shift;
+ my $misc_page = shift;
+ my $buttons = address@hidden;
+ &$print_misc_header($fh, $buttons, $new_file, $misc_page);
+ print $fh "".&$heading_text('misc heading', $Texi2HTML::NAME{This}, 1) .
"\n";
+ main::print_lines($fh);
+ &$print_misc_footer($fh, $buttons, $new_file);
+}
+##################################################################
+# section_footer is only called if SPLIT eq 'section'
+# section_footer: after print_section of last section, before print_page_foot
+#
+
+sub T2H_DEFAULT_print_section_footer
+{
+ my $fh = shift;
+ my $element = shift;
+}
+
+###################################################################
+# chapter_header and chapter_footer are only called if
+# SPLIT eq 'chapter'
+# chapter_header: after print_page_head, before print_section
+# chapter_footer: after print_section of last section, before print_page_foot
+
+sub T2H_DEFAULT_print_chapter_header($$)
+{
+ my $fh = shift;
+ my $element = shift;
+}
+
+sub T2H_DEFAULT_print_chapter_footer($$)
+{
+ my $fh = shift;
+ my $element = shift;
+}
+
+sub T2H_DEFAULT_print_section_header($$)
+{
+ my $fh = shift;
+ my $element = shift;
+}
+
+
+###################################################################
+# Layout of standard header and footer
+#
+
+sub T2H_DEFAULT_print_page_head($)
+{
+ my $fh = shift;
+}
+
+sub T2H_DEFAULT_program_string()
+{
+ my $date = get_conf('today');
+ $date = '' if (!defined($date));
+ if ($date ne '')
+ {
+ return gdt('This document was generated on @emph{{date}} using
@uref{{program_homepage}, @emph{{program}}}.', {
+ 'date' => $date, 'program_homepage' =>
$Texi2HTML::THISDOC{'program_homepage'}, 'program' =>
$Texi2HTML::THISDOC{'program_and_version'} },{'duplicate'=>1});
+ }
+ return gdt('This document was generated using @uref{{program_homepage},
@emph{{program}}}.', {
+ 'program_homepage' => $Texi2HTML::THISDOC{'program_homepage'}, 'program'
+=> $Texi2HTML::THISDOC{'program_and_version'} },{'duplicate'=>1});
+}
+
+sub T2H_DEFAULT_end_section($$$)
+{
+ my $fh = shift;
+ my $misc_or_top_and_section_separation = shift;
+ my $element = shift;
+}
+
+sub T2H_DEFAULT_print_page_foot($)
+{
+ my $fh = shift;
+}
+
+###################################################################
+# Layout of navigation panel
+
+sub T2H_DEFAULT_print_head_navigation($$$$$)
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $first_in_page = shift;
+ my $previous_is_top = shift;
+ my $element = shift;
+
+ return '';
+}
+
+sub T2H_DEFAULT_print_foot_navigation($$$$$;$)
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $rule = shift;
+ my $print_navigation_panel = shift;
+ my $element = shift;
+ my $maybe_in_page = shift;
+
+ $rule = '' if (!defined($rule));
+ print $fh "$rule\n" if ($rule ne '');
+}
+
+######################################################################
+# navigation panel
+#
+# how to create IMG tag
+# this is only used in html, and only if ICONS is set and the button
+# is active.
+sub T2H_DEFAULT_button_icon_img
+{
+ my $button = shift;
+ my $icon = shift;
+ my $name = shift;
+ return '' if (!defined($icon));
+ $button = "" if (!defined ($button));
+ $name = '' if (!defined($name));
+ my $alt = '';
+ if ($name ne '')
+ {
+ if ($button ne '')
+ {
+ $alt = "$button: $name";
+ }
+ else
+ {
+ $alt = $name;
+ }
+ }
+ else
+ {
+ $alt = $button;
+ }
+ return "$icon $alt";
+}
+
+sub T2H_DEFAULT_print_navigation
+{
+ my $buttons = shift;
+ my $vertical = shift;
+
+ return '';
+}
+
+######################################################################
+# Frames: this is from "Richard Y. Kim" <address@hidden>
+# Should be improved to be more conforming to other _print* functions
+# toc_file and main_file passed as args are relative to the texinfo manual
+# location, and therefore are not used.
+
+# no-ops in the default case, doesn't really make sense if output is
+# not html
+
+sub T2H_DEFAULT_print_frame
+{
+ my $fh = shift;
+ my $toc_file = shift;
+ my $main_file = shift;
+ $main_file = $Texi2HTML::THISDOC{'filename'}->{'top'};
+ $toc_file = $Texi2HTML::THISDOC{'filename'}->{'toc_frame'};
+}
+
+sub T2H_DEFAULT_print_toc_frame
+{
+ my $fh = shift;
+ my $stoc_lines = shift;
+}
+
+# This subroutine is intended to fill @Texi2HTML::TOC_LINES and
+# @Texi2HTML::OVERVIEW with the table of contents and short table of
+# contents.
+#
+# arguments:
+# ref on an array containing all the elements
+
+# each element is a reference on a hash. The following keys might be of
+# use:
+# 'top': true if this is the top element
+# 'toc_level': level of the element in the table of content. Highest level
+# is 1 for the @top element and for chapters, appendix and so on,
+# 2 for section, unnumberedsec and so on...
+# 'tocid': label used for reference linking to the element in table of
+# contents
+# 'file': the file containing the element, usefull to do href to that file
+# in case the document is split.
+# 'text': text of the element, with section number
+# 'text_nonumber': text of the element, without section number
+
+# Relevant configuration variables are:
+# $NO_BULLET_LIST_ATTRIBUTE: usefull in case a list is used
+# $FRAMES: @Texi2HTML::OVERVIEW is used in one of the frames.
+# $BEFORE_OVERVIEW
+# $AFTER_OVERVIEW
+# $BEFORE_TOC_LINES
+# $AFTER_TOC_LINES
+# get_conf('contents')
+# get_conf('shortcontents')
+
+sub T2H_DEFAULT_contents($$)
+{
+ my $elements = shift;
+ my $toc_file = shift;
+ my @result;
+ return unless (get_conf('contents'));
+ foreach my $element (@$elements)
+ {
+ my $level = $element->{'toc_level'};
+ $level = 1 if ($level < 1);
+ my $text = $element->{'text'};
+ my $result = (' ' x ($level - 1)) . $text ."\n";
+ push @result, $result;
+ }
+ if (@result)
+ {
+ unshift @result, $BEFORE_TOC_LINES;
+ push @result, $AFTER_TOC_LINES;
+ }
+ return address@hidden;
+}
+
+sub T2H_DEFAULT_shortcontents($$)
+{
+ my $elements = shift;
+ my $stoc_file = shift;
+ my @result;
+ return unless (get_conf('shortcontents'));
+ foreach my $element (@$elements)
+ {
+ my $level = $element->{'toc_level'};
+ next if ($level > 1);
+ $level = 1 if ($level < 1);
+ my $text = $element->{'text'};
+ push @result, $text ."\n";
+ }
+ if (@result)
+ {
+ unshift @result, $BEFORE_OVERVIEW;
+ push @result, $AFTER_OVERVIEW;
+ }
+ return address@hidden;
+}
+
+sub T2H_DEFAULT_print_title()
+{
+ my $element = shift;
+ return undef unless (get_conf('SHOW_TITLE'));
+ if (get_conf('USE_TITLEPAGE_FOR_TITLE'))
+ {
+ my ($titlepage_text, $titlepage_no_texi, $titlepage_simple_format) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
+
+ &$titlepage([],$titlepage_text, $titlepage_no_texi,
$titlepage_simple_format);
+ return $Texi2HTML::TITLEPAGE;
+ }
+ else
+ {
+ my $title = '';
+ $title = $Texi2HTML::THISDOC{'simpletitle'} if
(defined($Texi2HTML::THISDOC{'simpletitle'}) and
$Texi2HTML::THISDOC{'simpletitle'} !~ /^\s*$/);
+ if ($title ne '')
+ {
+ return &$heading_text('@settitle', $title, 0) . "\n";
+ }
+ }
+}
+
+sub T2H_DEFAULT_toc_body($)
+{
+ my $elements_list = shift;
+ my $toc_lines = &$contents($elements_list,
$Texi2HTML::THISDOC{'toc_file'});
+ @{$Texi2HTML::TOC_LINES} = @$toc_lines if ($toc_lines);
+ my $stoc_lines = &$shortcontents($elements_list,
$Texi2HTML::THISDOC{'stoc_file'});
+ @{$Texi2HTML::OVERVIEW} = @$stoc_lines if ($stoc_lines);
+}
+
+# element and elements_list may not be undef when called from the
+# main program, but may be if called from other customization function,
+# for example, here, print_Top.
+sub T2H_DEFAULT_inline_contents($$$$)
+{
+ my $fh = shift;
+ my $command = shift;
+ my $element = shift;
+ my $elements_list = shift;
+ my $name;
+ my $lines;
+
+ my $toc_file;
+ $toc_file = $element->{'file'} if (defined($element));
+
+ my $result = undef;
+
+ if ($command eq 'contents')
+ {
+ $name = $Texi2HTML::NAME{'Contents'};
+ $toc_file = $Texi2HTML::THISDOC{'toc_file'} if (!defined($toc_file));
+ if (defined($elements_list))
+ {
+ $lines = &$contents($elements_list, $toc_file);
+ }
+ else
+ {
+ $lines = $Texi2HTML::TOC_LINES;
+ }
+ }
+ else
+ {
+ $name = $Texi2HTML::NAME{'Overview'};
+ $toc_file = $Texi2HTML::THISDOC{'stoc_file'} if (!defined($toc_file));
+ if (defined($elements_list))
+ {
+ $lines = &$shortcontents($elements_list, $toc_file);
+ }
+ else
+ {
+ $lines = $Texi2HTML::OVERVIEW;
+ }
+ }
+ if ($lines and @{$lines})
+ {
+ $result = [ &$heading_text("address@hidden", $name, 1), "\n" ];
+ my $contents_anchor = &$anchor($element->{'id'});
+ if (defined($contents_anchor) and $contents_anchor =~ /\S/)
+ {
+ unshift @$result, $contents_anchor."\n";
+ }
+ push @$result, (@$lines, "\n");
+ }
+ return $result;
+}
+
+
+sub T2H_DEFAULT_css_lines ($$)
+{
+ my $import_lines = shift;
+ my $rule_lines = shift;
+ return if ((address@hidden and address@hidden and !keys(%css_map) and
address@hidden) or get_conf('NO_CSS'));
+ my $css_text = "<style type=\"text/css\">\n<!--\n";
+ $css_text .= join('',@$import_lines) . "\n" if (@$import_lines);
+ foreach my $css_rule (sort(keys(%css_map)))
+ {
+ next unless ($css_map{$css_rule});
+ $css_text .= "$css_rule {$css_map{$css_rule}}\n";
+ }
+ $css_text .= join('',@$rule_lines) . "\n" if (@$rule_lines);
+ $css_text .= "-->\n</style>\n";
+ foreach my $ref (@CSS_REFS)
+ {
+ $css_text .= "<link rel=\"stylesheet\" type=\"text/css\"
href=\"$ref\">\n";
+ }
+ set_from_document('CSS_LINES', $css_text);
+}
+
+######################################################################
+# About page
+#
+
+# PRE_ABOUT can be a function reference or a scalar.
+# Note that if it is a scalar, T2H_InitGlobals has not been called,
+# and all global variables like $ADDRESS are not available.
+$PRE_ABOUT = sub
+{
+ return ' ' . &$program_string() . "\n";
+};
+
+# If customizing $AFTER_ABOUT, be sure to put the content inside <p></p>.
+$AFTER_ABOUT = '';
+
+%BUTTONS_EXAMPLE =
+ (
+ 'Top', ' ',
+ 'Contents', ' ',
+ 'Overview', ' ',
+ 'Index', ' ',
+ 'This', '1.2.3',
+ 'Back', '1.2.2',
+ 'FastBack', '1',
+ 'Prev', '1.2.2',
+ 'Up', '1.2',
+ 'Next', '1.2.4',
+ 'NodeUp', '1.2',
+ 'NodeNext', '1.2.4',
+ 'NodePrev', '1.2.2',
+ 'NodeForward', '1.2.4',
+ 'NodeBack', '1.2.2',
+ 'Forward', '1.2.4',
+ 'FastForward', '2',
+ 'About', ' ',
+ 'First', '1.',
+ 'Last', '1.2.4',
+ 'NextFile', ' ',
+ 'PrevFile', ' ',
+ );
+
+sub T2H_DEFAULT_about_body
+{
+ my $about = "";
+ if (ref($PRE_ABOUT) eq 'CODE')
+ {
+ $about .= &$PRE_ABOUT();
+ }
+ else
+ {
+ $about .= $PRE_ABOUT;
+ }
+ return $about;
+}
+
+# return value is currently ignored
+sub T2H_DEFAULT_titlepage($$$$)
+{
+ my $titlepage_lines = shift;
+ my $titlepage_text = shift;
+ my $titlepage_no_texi = shift;
+ my $titlepage_simple_format = shift;
+
+ $Texi2HTML::TITLEPAGE = $titlepage_text;
+ if ($titlepage_text eq '')
+ {
+ my $title = '';
+ $title = $Texi2HTML::THISDOC{'simpletitle'} if
(defined($Texi2HTML::THISDOC{'simpletitle'}) and
$Texi2HTML::THISDOC{'simpletitle'} !~ /^\s*$/);
+ if ($title ne '')
+ {
+ $Texi2HTML::TITLEPAGE = &$heading_text('@settitle', $title, 0);
+ $Texi2HTML::TITLEPAGE .= "$DEFAULT_RULE\n";
+ }
+ }
+ else
+ {
+ $Texi2HTML::TITLEPAGE .= "$DEFAULT_RULE\n";
+ }
+
+ if (get_conf('setcontentsaftertitlepage') and
(defined($Texi2HTML::THISDOC{'inline_contents'}->{'contents'})) and
@{$Texi2HTML::THISDOC{'inline_contents'}->{'contents'}})
+ {
+ foreach my
$line(@{$Texi2HTML::THISDOC{'inline_contents'}->{'contents'}})
+ {
+ $Texi2HTML::TITLEPAGE .= $line;
+ }
+ $Texi2HTML::TITLEPAGE .= "$DEFAULT_RULE\n";
+ }
+ if (get_conf('setshortcontentsaftertitlepage') and
(defined($Texi2HTML::THISDOC{'inline_contents'}->{'shortcontents'})) and
@{$Texi2HTML::THISDOC{'inline_contents'}->{'shortcontents'}})
+ {
+ foreach my
$line(@{$Texi2HTML::THISDOC{'inline_contents'}->{'shortcontents'}})
+ {
+ $Texi2HTML::TITLEPAGE .= $line;
+ }
+ $Texi2HTML::TITLEPAGE .= "$DEFAULT_RULE\n";
+ }
+ return $Texi2HTML::TITLEPAGE;
+}
+
+
+sub T2H_DEFAULT_print_redirection_page()
+{
+ #return "Redirection files are not of use for the current format.\n";
+ return undef;
+}
+
+sub T2H_DEFAULT_node_file_name($$)
+{
+ my $node = shift;
+ my $type = shift;
+ return undef if ($node->{'external_node'}
+ or ($type eq 'top' and !get_conf('NEW_CROSSREF_STYLE')));
+ my $node_file_base;
+ if ($type eq 'top' and defined(get_conf('TOP_NODE_FILE')))
+ {
+ $node_file_base = get_conf('TOP_NODE_FILE');
+ }
+ elsif (get_conf('NEW_CROSSREF_STYLE'))
+ {
+ if (get_conf('TRANSLITERATE_FILE_NAMES'))
+ {
+ $node_file_base = $node->{'cross_manual_file'};
+ }
+ else
+ {
+ $node_file_base = $node->{'cross_manual_target'};
+ }
+ }
+ else
+ {
+ $node_file_base = main::remove_texi($node->{'texi'});
+ $node_file_base =~ s/[^\w\.\-]/-/g;
+ }
+ if (defined(get_conf('NODE_FILE_EXTENSION')) and
get_conf('NODE_FILE_EXTENSION') ne '')
+ {
+ return ($node_file_base . '.' . get_conf('NODE_FILE_EXTENSION'));
+ }
+ return $node_file_base;
+}
+
+########################################################################
+# Control of formatting:
+# 1.) For some changes, it is often enough to change the value of
+# some global map. It might necessitate building a little
+# function along with the change in hash, if the change is the use
+# of another function (in style_map).
+# 2.) For other changes, reimplement one of the t2h_default_<fnc>* routines,
+# give them another name, and assign them to the respective
+# $<fnc> variable (below).
+
+%deprecated_commands = (
+ 'ctrl' => '',
+ 'allow-recursion' => N__('recursion is always allowed'),
+ 'quote-arg' => N__('arguments are quoted by default'),
+);
+
+#
+# This hash should have keys corresponding with the nonletter command accent
+# whose following character is considered to be the argument
+# This hash associates an accent macro to the ISO name for the accent if any.
+# The customary use of this map is to find the ISO name appearing in html
+# entity (like é) associated with a texinfo accent macro.
+#
+# The keys of the hash are
+# ": umlaut
+# ~: tilda accent
+# ^: circumflex accent
+# `: grave accent
+# ': acute accent
+# =: macron accent
+%accent_map = (
+ '"', 'uml',
+ '~', 'tilde',
+ '^', 'circ',
+ '`', 'grave',
+ "'", 'acute',
+ ",", 'cedil',
+ '=', '',
+ 'ringaccent', 'ring',
+ 'H', '',
+ 'dotaccent', '',
+ 'u', '',
+ 'ubaraccent', '',
+ 'udotaccent', '',
+ 'v', '',
+ 'ogonek', 'ogon',
+ );
+
+#
+# ascii representation of texinfo "simple things" @-commands
+%default_simple_map = (
+ '*', "\n",
+ ' ', ' ',
+ "\t", ' ',
+ "\n", ' ',
+ '-', '', # hyphenation hint
+ '|', '', # used in formatting commands @evenfooting and friends
+ '/', '',
+ ':', '',
+ '!', '!',
+ '?', '?',
+ '.', '.',
+ '@', '@',
+ '}', '}',
+ '{', '{',
+);
+
+# texinfo "simple things" @-commands
+%simple_map = %default_simple_map;
+
+# this map is used in preformatted text
+%simple_map_pre = %simple_map;
+
+# This map is used when texi elements are removed and replaced
+# by simple text
+%simple_map_texi = %default_simple_map;
+
+# maps for the math specific commands
+%simple_map_math = (
+ '\\', '\\'
+ );
+
+#%simple_map_pre_math = %simple_map_math;
+#%simple_map_texi_math = %simple_map_math;
+
+$punctuation_characters = '.?!';
+$after_punctuation_characters = '"\')]';
+
+
+%default_things_map = (
+ 'TeX' => 'TeX',
+ 'LaTeX' => 'LaTeX',
+ 'bullet' => '*',
+ 'copyright' => '(C)',
+ 'registeredsymbol' => '(R)',
+ 'dots' => '...',
+ 'enddots' => '...',
+ 'equiv' => '==',
+# FIXME i18n
+ 'error' => 'error-->',
+ 'expansion' => '==>',
+ 'arrow' => '->',
+ 'minus' => '-',
+ 'point' => '-!-',
+ 'print' => '-|',
+ 'result' => '=>',
+ 'today' => '',
+ 'aa' => 'aa',
+ 'AA' => 'AA',
+ 'ae' => 'ae',
+ 'oe' => 'oe',
+ 'AE' => 'AE',
+ 'OE' => 'OE',
+ 'o' => '/o',
+ 'O' => '/O',
+ 'ss' => 'ss',
+ 'l' => '/l',
+ 'L' => '/L',
+ 'DH' => 'D',
+ 'dh' => 'd',
+ 'TH' => 'TH', #
http://www.evertype.com/standards/wynnyogh/thorn.html
+
+ 'th' => 'th',
+ 'exclamdown' => '!',
+ 'questiondown' => '?',
+ 'pounds' => '#',
+ 'ordf' => 'a',
+ 'ordm' => 'o',
+ 'comma' => ',',
+ 'euro' => 'Euro',
+ 'geq' => '>=',
+ 'leq' => '<=',
+ 'tie' => ' ',
+ 'textdegree' => 'o',
+ 'quotedblleft' => '``',
+ 'quotedblright' => "''",
+ 'quoteleft' => '`',
+ 'quoteright' => "'",
+ 'quotedblbase' => ',,',
+ 'quotesinglbase' => ',',
+ 'guillemetleft' => '<<',
+ 'guillemetright' => '>>',
+ 'guillemotleft' => '<<',
+ 'guillemotright' => '>>',
+ 'guilsinglleft' => '<',
+ 'guilsinglright' => '>',
+);
+
+%things_map = %default_things_map;
+
+# This map is used in preformatted environments
+%pre_map = %things_map;
+
+# used in math. If not found, pre_map is used.
+%math_map = ();
+
+# text replacing macros when texi commands are removed and plain text is
+# produced.
+%texi_map = %default_things_map;
+
+# used for index sorting.
+%sorting_things_map = %default_things_map;
+foreach my $accent_letter ('o','O','l','L')
+{
+ $sorting_things_map{$accent_letter} = $accent_letter;
+}
+$sorting_things_map{'copyright'} = 'C';
+$sorting_things_map{'registeredsymbol'} = 'R';
+$sorting_things_map{'today'} = 't';
+
+%default_texi_map = %texi_map;
+
+#
+# texinfo "things" (@foo{}) to XML ones
+#
+%things_map_xml = (
+ 'TeX' => 'TeX',
+ 'LaTeX' => 'LaTeX',
+# pertusus: unknown by makeinfo, not in texinfo manual (@* is the right thing)
+# 'br', '<br>', # paragraph break
+ 'bullet' => '•',
+# #'copyright' => '(C)',
+ 'copyright' => '©',
+ 'registeredsymbol' => '®',
+ 'dots' => '…',
+ 'enddots' => '...',
+ 'equiv' => '≡',
+# FIXME i18n
+ 'error' => 'error-->',
+ 'expansion' => '→',
+ 'arrow' => '→',
+ 'minus' => '-',
+ 'point' => '∗',
+ 'print' => '-|',
+ 'result' => '⇒',
+ # set in code using the language
+ # 'today', &pretty_date,
+ 'today' => '',
+ 'aa' => 'å',
+ 'AA' => 'Å',
+ 'ae' => 'æ',
+ 'oe' => 'œ', #pertusus: also œ. œ
not in html 3.2
+ 'AE' => 'Æ',
+ 'OE' => 'Œ', #pertusus: also Œ. Œ
not in html 3.2
+ 'o' => 'ø',
+ 'O' => 'Ø',
+ 'ss' => 'ß',
+ 'DH' => 'Ð',
+ 'dh' => 'ð',
+ 'TH' => 'Þ',
+ 'th' => 'þ',
+ 'l' => 'ł',
+ 'L' => 'Ł',
+ 'exclamdown' => '¡',
+ 'questiondown' => '¿',
+ 'pounds' => '£',
+ 'ordf' => 'ª',
+ 'ordm' => 'º',
+ 'comma' => ',',
+ 'euro' => '€',
+ 'geq' => '≥',
+ 'leq' => '≤',
+ 'tie' => ' ',
+ 'textdegree' => '°',
+ 'quotedblleft' => '“',
+ 'quotedblright' => '”',
+ 'quoteleft' => '‘',
+ 'quoteright' => '’',
+ 'quotedblbase' => '„',
+ 'quotesinglbase' => '‚',
+ 'guillemetleft' => '«',
+ 'guillemetright' => '»',
+ 'guillemotleft' => '«',
+ 'guillemotright' => '»',
+ 'guilsinglleft' => '‹',
+ 'guilsinglright' => '›',
+ );
+
+# This map is used in preformatted environments
+%pre_map_xml = %things_map_xml;
+
+# taken from
+#Latin extended additionnal
+#http://www.alanwood.net/unicode/latin_extended_additional.html
+#C1 Controls and Latin-1 Supplement
+#http://www.alanwood.net/unicode/latin_1_supplement.html
+#Latin Extended-A
+#http://www.alanwood.net/unicode/latin_extended_a.html
+#Latin Extended-B
+#http://www.alanwood.net/unicode/latin_extended_b.html
+#dotless i: 0131
+
+#http://www.alanwood.net/unicode/arrows.html 21**
+#http://www.alanwood.net/unicode/general_punctuation.html 20**
+#http://www.alanwood.net/unicode/mathematical_operators.html 22**
+
+%unicode_map = (
+ 'bullet' => '2022',
+ 'copyright' => '00A9',
+ 'registeredsymbol' => '00AE',
+ 'dots' => '2026',
+ 'enddots' => '',
+ 'equiv' => '2261',
+ 'error' => '',
+ 'expansion' => '2192',
+ 'arrow' => '2192',
+ 'minus' => '2212', # in mathematical operators
+# 'minus' => '002D', # in latin1
+ 'point' => '2605',
+ 'print' => '22A3',
+ 'result' => '21D2',
+ 'today' => '',
+ 'aa' => '00E5',
+ 'AA' => '00C5',
+ 'ae' => '00E6',
+ 'oe' => '0153',
+ 'AE' => '00C6',
+ 'OE' => '0152',
+ 'o' => '00F8',
+ 'O' => '00D8',
+ 'ss' => '00DF',
+ 'DH' => '00D0',
+ 'dh' => '00F0',
+ 'TH' => '00DE',
+ 'th' => '00FE',
+ 'l' => '0142',
+ 'L' => '0141',
+ 'exclamdown' => '00A1',
+ 'questiondown' => '00BF',
+ 'pounds' => '00A3',
+ 'ordf' => '00AA',
+ 'ordm' => '00BA',
+ 'comma' => '002C',
+ 'euro' => '20AC',
+ 'geq' => '2265',
+ 'leq' => '2264',
+ 'tie' => '',
+# 'tie' => '0020',
+ 'textdegree' => '00B0',
+ 'quotedblleft' => '201C',
+ 'quotedblright' => '201D',
+ 'quoteleft' => '2018',
+ 'quoteright' => '2019',
+ 'quotedblbase' => '201E',
+ 'quotesinglbase' => '201A',
+ 'guillemetleft' => '00AB',
+ 'guillemetright' => '00BB',
+ 'guillemotleft' => '00AB',
+ 'guillemotright' => '00BB',
+ 'guilsinglleft' => '2039',
+ 'guilsinglright' => '203A',
+ );
+
+%makeinfo_encoding_to_map = (
+ "iso-8859-1", 'iso8859_1',
+ "iso-8859-2", 'iso8859_2',
+ "iso-8859-15", 'iso8859_15',
+ "koi8-r", 'koi8',
+ "koi8-u", 'koi8',
+);
+
+foreach my $encoding (keys(%makeinfo_encoding_to_map))
+{
+ $t2h_encoding_aliases{$encoding} = $encoding;
+ $t2h_encoding_aliases{$makeinfo_encoding_to_map{$encoding}} = $encoding;
+}
+
+# cut and pasted from eigth_bit_makeinfo_maps.pl, in turn generated with
+# ./parse_8bit_makeinfo_maps.pl
+
+%makeinfo_unicode_to_eight_bit = (
+ 'iso8859_1' => {
+ '00A0' => 'A0',
+ '00A1' => 'A1',
+ '00A2' => 'A2',
+ '00A3' => 'A3',
+ '00A4' => 'A4',
+ '00A5' => 'A5',
+ '00A6' => 'A6',
+ '00A7' => 'A7',
+ '00A8' => 'A8',
+ '00A9' => 'A9',
+ '00AA' => 'AA',
+ '00AB' => 'AB',
+ '00AC' => 'AC',
+ '00AD' => 'AD',
+ '00AE' => 'AE',
+ '00AF' => 'AF',
+ '00B0' => 'B0',
+ '00B1' => 'B1',
+ '00B2' => 'B2',
+ '00B3' => 'B3',
+ '00B4' => 'B4',
+ '00B5' => 'B5',
+ '00B6' => 'B6',
+ '00B7' => 'B7',
+ '00B8' => 'B8',
+ '00B9' => 'B9',
+ '00BA' => 'BA',
+ '00BB' => 'BB',
+ '00BC' => 'BC',
+ '00BD' => 'BD',
+ '00BE' => 'BE',
+ '00BF' => 'BF',
+ '00C0' => 'C0',
+ '00C1' => 'C1',
+ '00C2' => 'C2',
+ '00C3' => 'C3',
+ '00C4' => 'C4',
+ '00C5' => 'C5',
+ '00C6' => 'C6',
+ '00C7' => 'C7',
+ '00C7' => 'C7',
+ '00C8' => 'C8',
+ '00C9' => 'C9',
+ '00CA' => 'CA',
+ '00CB' => 'CB',
+ '00CC' => 'CC',
+ '00CD' => 'CD',
+ '00CE' => 'CE',
+ '00CF' => 'CF',
+ '00D0' => 'D0',
+ '00D1' => 'D1',
+ '00D2' => 'D2',
+ '00D3' => 'D3',
+ '00D4' => 'D4',
+ '00D5' => 'D5',
+ '00D6' => 'D6',
+ '00D7' => 'D7',
+ '00D8' => 'D8',
+ '00D9' => 'D9',
+ '00DA' => 'DA',
+ '00DB' => 'DB',
+ '00DC' => 'DC',
+ '00DD' => 'DD',
+ '00DE' => 'DE',
+ '00DF' => 'DF',
+ '00E0' => 'E0',
+ '00E1' => 'E1',
+ '00E2' => 'E2',
+ '00E3' => 'E3',
+ '00E4' => 'E4',
+ '00E5' => 'E5',
+ '00E6' => 'E6',
+ '00E7' => 'E7',
+ '00E8' => 'E8',
+ '00E9' => 'E9',
+ '00EA' => 'EA',
+ '00EB' => 'EB',
+ '00EC' => 'EC',
+ '00ED' => 'ED',
+ '00EE' => 'EE',
+ '00EF' => 'EF',
+ '00F0' => 'F0',
+ '00F1' => 'F1',
+ '00F2' => 'F2',
+ '00F3' => 'F3',
+ '00F4' => 'F4',
+ '00F5' => 'F5',
+ '00F6' => 'F6',
+ '00F7' => 'F7',
+ '00F8' => 'F8',
+ '00F9' => 'F9',
+ '00FA' => 'FA',
+ '00FB' => 'FB',
+ '00FC' => 'FC',
+ '00FD' => 'FD',
+ '00FE' => 'FE',
+ '00FF' => 'FF',
+ },
+ 'iso8859_15' => {
+ '00A0' => 'A0',
+ '00A1' => 'A1',
+ '00A2' => 'A2',
+ '00A3' => 'A3',
+ '20AC' => 'A4',
+ '00A5' => 'A5',
+ '0160' => 'A6',
+ '00A7' => 'A7',
+ '0161' => 'A8',
+ '00A9' => 'A9',
+ '00AA' => 'AA',
+ '00AB' => 'AB',
+ '00AC' => 'AC',
+ '00AD' => 'AD',
+ '00AE' => 'AE',
+ '00AF' => 'AF',
+ '00B0' => 'B0',
+ '00B1' => 'B1',
+ '00B2' => 'B2',
+ '00B3' => 'B3',
+ '017D' => 'B4',
+ '00B5' => 'B5',
+ '00B6' => 'B6',
+ '00B7' => 'B7',
+ '017E' => 'B8',
+ '00B9' => 'B9',
+ '00BA' => 'BA',
+ '00BB' => 'BB',
+ '0152' => 'BC',
+ '0153' => 'BD',
+ '0178' => 'BE',
+ '00BF' => 'BF',
+ '00C0' => 'C0',
+ '00C1' => 'C1',
+ '00C2' => 'C2',
+ '00C3' => 'C3',
+ '00C4' => 'C4',
+ '00C5' => 'C5',
+ '00C6' => 'C6',
+ '00C7' => 'C7',
+ '00C8' => 'C8',
+ '00C9' => 'C9',
+ '00CA' => 'CA',
+ '00CB' => 'CB',
+ '00CC' => 'CC',
+ '00CD' => 'CD',
+ '00CE' => 'CE',
+ '00CF' => 'CF',
+ '00D0' => 'D0',
+ '00D1' => 'D1',
+ '00D2' => 'D2',
+ '00D3' => 'D3',
+ '00D4' => 'D4',
+ '00D5' => 'D5',
+ '00D6' => 'D6',
+ '00D7' => 'D7',
+ '00D8' => 'D8',
+ '00D9' => 'D9',
+ '00DA' => 'DA',
+ '00DB' => 'DB',
+ '00DC' => 'DC',
+ '00DD' => 'DD',
+ '00DE' => 'DE',
+ '00DF' => 'DF',
+ '00E0' => 'E0',
+ '00E1' => 'E1',
+ '00E2' => 'E2',
+ '00E3' => 'E3',
+ '00E4' => 'E4',
+ '00E5' => 'E5',
+ '00E6' => 'E6',
+ '00E7' => 'E7',
+ '00E8' => 'E8',
+ '00E9' => 'E9',
+ '00EA' => 'EA',
+ '00EB' => 'EB',
+ '00EC' => 'EC',
+ '00ED' => 'ED',
+ '00EE' => 'EE',
+ '00EF' => 'EF',
+ '00F0' => 'F0',
+ '00F1' => 'F1',
+ '00F2' => 'F2',
+ '00F3' => 'F3',
+ '00F4' => 'F4',
+ '00F5' => 'F5',
+ '00F6' => 'F6',
+ '00F7' => 'F7',
+ '00F8' => 'F8',
+ '00F9' => 'F9',
+ '00FA' => 'FA',
+ '00FB' => 'FB',
+ '00FC' => 'FC',
+ '00FD' => 'FD',
+ '00FE' => 'FE',
+ '00FF' => 'FF',
+ },
+ 'iso8859_2' => {
+ '00A0' => 'A0',
+ '0104' => 'A1',
+ '02D8' => 'A2',
+ '0141' => 'A3',
+ '00A4' => 'A4',
+ '013D' => 'A5',
+ '015A' => 'A6',
+ '00A7' => 'A7',
+ '00A8' => 'A8',
+ '015E' => 'AA',
+ '0164' => 'AB',
+ '0179' => 'AC',
+ '00AD' => 'AD',
+ '017D' => 'AE',
+ '017B' => 'AF',
+ '00B0' => 'B0',
+ '0105' => 'B1',
+ '02DB' => 'B2',
+ '0142' => 'B3',
+ '00B4' => 'B4',
+ '013E' => 'B5',
+ '015B' => 'B6',
+ '02C7' => 'B7',
+ '00B8' => 'B8',
+ '0161' => 'B9',
+ '015F' => 'BA',
+ '0165' => 'BB',
+ '017A' => 'BC',
+ '02DD' => 'BD',
+ '017E' => 'BE',
+ '017C' => 'BF',
+ '0154' => 'C0',
+ '00C1' => 'C1',
+ '00C2' => 'C2',
+ '0102' => 'C3',
+ '00C4' => 'C4',
+ '0139' => 'C5',
+ '0106' => 'C6',
+ '00C7' => 'C7',
+ '010C' => 'C8',
+ '00C9' => 'C9',
+ '0118' => 'CA',
+ '00CB' => 'CB',
+ '011A' => 'CC',
+ '00CD' => 'CD',
+ '00CE' => 'CE',
+ '010E' => 'CF',
+ '0110' => 'D0',
+ '0143' => 'D1',
+ '0147' => 'D2',
+ '00D3' => 'D3',
+ '00D4' => 'D4',
+ '0150' => 'D5',
+ '00D6' => 'D6',
+ '00D7' => 'D7',
+ '0158' => 'D8',
+ '016E' => 'D9',
+ '00DA' => 'DA',
+ '0170' => 'DB',
+ '00DC' => 'DC',
+ '00DD' => 'DD',
+ '0162' => 'DE',
+ '00DF' => 'DF',
+ '0155' => 'E0',
+ '00E1' => 'E1',
+ '00E2' => 'E2',
+ '0103' => 'E3',
+ '00E4' => 'E4',
+ '013A' => 'E5',
+ '0107' => 'E6',
+ '00E7' => 'E7',
+ '010D' => 'E8',
+ '00E9' => 'E9',
+ '0119' => 'EA',
+ '00EB' => 'EB',
+ '011B' => 'EC',
+ '00ED' => 'ED',
+ '00EE' => 'EE',
+ '010F' => 'EF',
+ '0111' => 'F0',
+ '0144' => 'F1',
+ '0148' => 'F2',
+ '00F3' => 'F3',
+ '00F4' => 'F4',
+ '0151' => 'F5',
+ '00F6' => 'F6',
+ '00F7' => 'F7',
+ '0159' => 'F8',
+ '016F' => 'F9',
+ '00FA' => 'FA',
+ '0171' => 'FB',
+ '00FC' => 'FC',
+ '00FD' => 'FD',
+ '0163' => 'FE',
+ '02D9' => 'FF',
+ },
+ 'koi8' => {
+ '0415' => 'A3',
+ '0454' => 'A4',
+ '0456' => 'A6',
+ '0457' => 'A7',
+ '04D7' => 'B3',
+ '0404' => 'B4',
+ '0406' => 'B6',
+ '0407' => 'B7',
+ '042E' => 'C0',
+ '0430' => 'C1',
+ '0431' => 'C2',
+ '0446' => 'C3',
+ '0434' => 'C4',
+ '0435' => 'C5',
+ '0444' => 'C6',
+ '0433' => 'C7',
+ '0445' => 'C8',
+ '0438' => 'C9',
+ '0439' => 'CA',
+ '043A' => 'CB',
+ '043B' => 'CC',
+ '043C' => 'CD',
+ '043D' => 'CE',
+ '043E' => 'CF',
+ '043F' => 'D0',
+ '044F' => 'D1',
+ '0440' => 'D2',
+ '0441' => 'D3',
+ '0442' => 'D4',
+ '0443' => 'D5',
+ '0436' => 'D6',
+ '0432' => 'D7',
+ '044C' => 'D8',
+ '044B' => 'D9',
+ '0437' => 'DA',
+ '0448' => 'DB',
+ '044D' => 'DC',
+ '0449' => 'DD',
+ '0447' => 'DE',
+ '044A' => 'DF',
+ '042D' => 'E0',
+ '0410' => 'E1',
+ '0411' => 'E2',
+ '0426' => 'E3',
+ '0414' => 'E4',
+ '0415' => 'E5',
+ '0424' => 'E6',
+ '0413' => 'E7',
+ '0425' => 'E8',
+ '0418' => 'E9',
+ '0419' => 'EA',
+ '041A' => 'EB',
+ '041B' => 'EC',
+ '041C' => 'ED',
+ '041D' => 'EE',
+ '041E' => 'EF',
+ '041F' => 'F0',
+ '042F' => 'F1',
+ '0420' => 'F2',
+ '0421' => 'F3',
+ '0422' => 'F4',
+ '0423' => 'F5',
+ '0416' => 'F6',
+ '0412' => 'F7',
+ '042C' => 'F8',
+ '042B' => 'F9',
+ '0417' => 'FA',
+ '0428' => 'FB',
+ '042D' => 'FC',
+ '0429' => 'FD',
+ '0427' => 'FE',
+ '042A' => 'FF',
+ },
+);
+
+%eight_bit_to_unicode = ();
+foreach my $encoding (keys(%makeinfo_encoding_to_map))
+{
+ my $unicode_to_eight =
$makeinfo_unicode_to_eight_bit{$makeinfo_encoding_to_map{$encoding}};
+#print STDERR "$encoding, $makeinfo_encoding_to_map{$encoding},
$unicode_to_eight\n";
+ foreach my $utf8_key (keys(%{$unicode_to_eight}))
+ {
+ $eight_bit_to_unicode{$encoding}->{$unicode_to_eight->{$utf8_key}} =
+ $utf8_key;
+ }
+}
+
+# currently unused
+my %makeinfo_transliterate_map = (
+ '0416' => 'ZH',
+ '0447' => 'ch',
+ '00EB' => 'e',
+ '0414' => 'D',
+ '0159' => 'r',
+ '00E6' => 'ae',
+ '042B' => 'Y',
+ '00FA' => 'u',
+ '043B' => 'l',
+ '00DE' => 'TH',
+ '00D9' => 'U',
+ '00C4' => 'A',
+ '0148' => 'n',
+ '00F6' => 'o',
+ '0434' => 'd',
+ '041E' => 'O',
+ '041B' => 'L',
+ '044B' => 'y',
+ '0107' => 'c',
+ '0415' => 'E',
+ '00C1' => 'A',
+ '00D3' => 'O',
+ '00DB' => 'U',
+ '016E' => 'U',
+ '013A' => 'l',
+ '017B' => 'Z',
+ '00F1' => 'n',
+ '0428' => 'SH',
+ '0153' => 'oe',
+ '00F4' => 'o',
+ '0144' => 'n',
+ '0404' => 'IE',
+ '0427' => 'CH',
+ '0162' => 'T',
+ '017A' => 'z',
+ '0448' => 'sh',
+ '0436' => 'zh',
+ '00F9' => 'u',
+ '0406' => 'I',
+ '0103' => 'a',
+ '0422' => 'T',
+ '0160' => 'S',
+ '0165' => 't',
+ '017E' => 'z',
+ '00F0' => 'd',
+ '043E' => 'o',
+ '043D' => 'n',
+ '013E' => 'l',
+ '0412' => 'V',
+ '0111' => 'd',
+ '0155' => 's',
+ '017C' => 'z',
+ '00CE' => 'I',
+ '042D' => 'E',
+ '00C8' => 'E',
+ '00F8' => 'oe',
+ '00F2' => 'o',
+ '00FF' => 'y',
+ '0420' => 'R',
+ '0119' => 'e',
+ '00D2' => 'O',
+ '043C' => 'm',
+ '00D0' => 'DH',
+ '0179' => 'Z',
+ '0110' => 'D',
+ '043F' => 'p',
+ '0170' => 'U',
+ '011A' => 'E',
+ '010C' => 'C',
+ '015A' => 'S',
+ '0433' => 'g',
+ '00E1' => 'a',
+ '010D' => 'c',
+ '00CC' => 'I',
+ '016F' => 'u',
+ '0457' => 'yi',
+ '00C2' => 'A',
+ '0438' => 'i',
+ '00E3' => 'a',
+ '0435' => 'e',
+ '0440' => 'r',
+ '042A' => 'W',
+ '0431' => 'b',
+ '00EE' => 'i',
+ '0150' => 'O',
+ '00E8' => 'e',
+ '0418' => 'I',
+ '00CF' => 'I',
+ '015F' => 's',
+ '0142' => 'l',
+ '0147' => 'N',
+ '00DF' => 'ss',
+ '00E5' => 'aa',
+ '00C3' => 'A',
+ '0106' => 'C',
+ '0141' => 'L',
+ '0164' => 'T',
+ '017D' => 'Z',
+ '00EC' => 'i',
+ '041C' => 'M',
+ '00C9' => 'E',
+ '00E0' => 'a',
+ '043A' => 'k',
+ '00F5' => 'o',
+ '042C' => 'X',
+ '0449' => 'shch',
+ '0444' => 'f',
+ '0139' => 'L',
+ '0158' => 'R',
+ '00F3' => 'o',
+ '00FB' => 'u',
+ '0424' => 'F',
+ '0446' => 'c',
+ '0423' => 'U',
+ '0442' => 't',
+ '00FD' => 'y',
+ '0102' => 'A',
+ '0104' => 'A',
+ '00CB' => 'E',
+ '0426' => 'C',
+ '00CD' => 'I',
+ '0437' => 'z',
+ '0178' => 'y',
+ '00D4' => 'O',
+ '044D' => 'e',
+ '0432' => 'v',
+ '013D' => 'L',
+ '0163' => 't',
+ '0456' => 'i',
+ '011B' => 'e',
+ '044F' => 'ya',
+ '0429' => 'SHCH',
+ '0411' => 'B',
+ '044A' => 'w',
+ '00C6' => 'AE',
+ '041D' => 'N',
+ '00DA' => 'U',
+ '00C0' => 'A',
+ '0152' => 'OE',
+ '00DD' => 'Y',
+ '0154' => 'R',
+ '00E9' => 'e',
+ '00D5' => 'O',
+ '041F' => 'P',
+ '0161' => 's',
+ '0430' => 'a',
+ '0445' => 'h',
+ '00E2' => 'a',
+ '00D6' => 'O',
+ '0407' => 'YI',
+ '00CA' => 'E',
+ '0439' => 'i',
+ '0171' => 'u',
+ '00DC' => 'U',
+ '042F' => 'YA',
+ '0425' => 'H',
+ '00FE' => 'th',
+ '00D1' => 'N',
+ '044C' => 'x',
+ '010F' => 'd',
+ '0410' => 'A',
+ '0443' => 'u',
+ '00EF' => 'i',
+ '0105' => 'a',
+ '00EA' => 'e',
+ '00E4' => 'a',
+ '015E' => 'S',
+ '0417' => 'Z',
+ '00ED' => 'i',
+ '00FC' => 'u',
+ '04D7' => 'IO',
+ '00D8' => 'OE',
+ '0419' => 'I',
+ '0421' => 'S',
+ '0143' => 'N',
+ '010E' => 'D',
+ '0413' => 'G',
+ '015B' => 's',
+ '0151' => 'o',
+ '00E7' => 'c',
+ '00C5' => 'AA',
+ '0441' => 's',
+ '0118' => 'E',
+ '00C7' => 'C',
+ '041A' => 'K',
+ '0454' => 'ie',
+ '042E' => 'yu',
+);
+
+
+%transliterate_map = (
+ '00C5' => 'AA',
+ '00E5' => 'aa',
+ '00D8' => 'O',
+ '00F8' => 'o',
+ '00E6' => 'ae',
+ '0153' => 'oe',
+ '00C6' => 'AE',
+ '0152' => 'OE',
+ '00DF' => 'ss',
+ '0141' => 'L',
+ '0142' => 'l',
+ '00D0' => 'D',
+ '00F0' => 'd',
+ '00DE' => 'TH',
+ '00FE' => 'th',
+ '0415' => 'E',
+ '0435' => 'e',
+ '0426' => 'C',
+ '042A' => 'W',
+ '044A' => 'w',
+ '042C' => 'X',
+ '044C' => 'x',
+ '042E' => 'yu',
+ '042F' => 'YA',
+ '044F' => 'ya',
+ '0433' => 'g',
+ '0446' => 'c',
+ '04D7' => 'IO',
+ '00DD' => 'Y', # unidecode gets this wrong ?
+ # following appears in tests, this is required to have
+ # the same output with and without unidecode
+ '4E2D' => 'Zhong',
+ '6587' => 'Wen',
+ '793A' => 'Shi',
+ '4F8B' => 'Li',
+ '7B2C' => 'Di',
+ '7AE0' => 'Zhang',
+ '53E6' => 'Ling',
+ '4E2A' => 'Ge',
+ # in http://www.cantonese.sheik.co.uk/dictionary/characters/7/
+ # unidecode certainly gets it wrong
+ '4E00' => 'Yi',
+ 'FF08' => '(',
+ 'FF09' => ')',
+ 'FF0C' => ',',
+ '5B66' => 'Xue',
+ '7FD2' => 'Xi',
+ '30DE' => 'ma',
+ '30CB' => 'ni',
+ '30E5' => 'yu',
+ '30A2' => 'a',
+ '30EB' => 'ru',
+ );
+
+foreach my $symbol(keys(%unicode_map))
+{
+ if ($unicode_map{$symbol} ne '' and !exists($transliterate_map{$symbol}))
+ {
+ $no_transliterate_map{$unicode_map{$symbol}} = 1;
+ }
+}
+
+%ascii_character_map = (
+ ' ' => '0020',
+ '!' => '0021',
+ '"' => '0022',
+ '#' => '0023',
+ '$' => '0024',
+ '%' => '0025',
+ '&' => '0026',
+ "'" => '0027',
+ '(' => '0028',
+ ')' => '0029',
+ '*' => '002A',
+ '+' => '002B',
+ ',' => '002C',
+ '-' => '002D',
+ '.' => '002E',
+ '/' => '002F',
+ ':' => '003A',
+ ';' => '003B',
+ '<' => '003C',
+ '=' => '003D',
+ '>' => '003E',
+ '?' => '003F',
+ '@' => '0040',
+ '[' => '005B',
+ '\\' => '005C',
+ ']' => '005D',
+ '^' => '005E',
+ '_' => '005F',
+ '`' => '0060',
+ '{' => '007B',
+ '|' => '007C',
+ '}' => '007D',
+ '~' => '007E',
+);
+
+%perl_charset_to_html = (
+ 'utf8' => 'utf-8',
+ 'utf-8-strict' => 'utf-8',
+ 'ascii' => 'us-ascii',
+ 'shiftjis' => 'shift_jis',
+);
+
+# encoding name normalization to html-compatible encoding names
+%t2h_encoding_aliases = (
+ 'latin1' => 'iso-8859-1',
+);
+
+foreach my $perl_charset (keys(%perl_charset_to_html))
+{
+ $t2h_encoding_aliases{$perl_charset} = $perl_charset_to_html{$perl_charset};
+ $t2h_encoding_aliases{$perl_charset_to_html{$perl_charset}} =
$perl_charset_to_html{$perl_charset};
+}
+
+# These are the encodings from the texinfo manual
+foreach my $canonical_encoding('us-ascii', 'utf-8', 'iso-8859-1',
+ 'iso-8859-15','iso-8859-2','koi8-r', 'koi8-u')
+{
+ $canonical_texinfo_encodings{$canonical_encoding} = 1;
+}
+
+# not used currently for html, but used in chm.pm
+%numeric_entity_map = ();
+
+foreach my $symbol (keys(%unicode_map))
+{
+ if ($symbol ne '')
+ {
+ $numeric_entity_map{$symbol} = '&#' . hex($unicode_map{$symbol}) . ';';
+ }
+}
+
+# When the value begins with & the function with that name is used to do the
+# html. The first argument is the text enclosed within {}, the second is the
+# style name (which is also the key of the hash)
+#
+# Otherwithe the value is the html element used to enclose the text, and if
+# there is a " the resulting text is also enclosed within `'
+my %old_style_map = (
+ 'acronym', '',
+ 'asis', '',
+ 'b', 'b',
+ 'cite', 'cite',
+ 'clicksequence', '',
+ 'code', 'code',
+ 'command', 'code',
+ 'ctrl', '&default_ctrl',
+ 'dfn', 'em',
+ 'dmn', '',
+ 'email', '&default_email',
+ 'emph', 'em',
+ 'env', 'code',
+ 'file', '"tt',
+ 'i', 'i',
+ 'kbd', 'kbd',
+ 'key', 'kbd',
+ 'math', 'em',
+ 'option', '"samp',
+ 'r', '',
+ 'samp', '"samp',
+ 'sc', '&default_sc',
+ 'strong', 'strong',
+ 't', 'tt',
+ 'uref', '&default_uref',
+ 'url', '&default_url',
+ 'var', 'var',
+ 'verb', 'tt',
+ 'titlefont', '&default_titlefont',
+ 'w', '',
+ );
+
+sub t2h_default_copy_style_map ($$;$)
+{
+ my $from = shift;
+ my $to = shift;
+ my $merge = shift;
+
+ foreach my $command (keys(%$from))
+ {
+ $to->{$command} = {} if (!exists($to->{$command}));
+ foreach my $key (keys(%{$from->{$command}}))
+ {
+ next if (exists($to->{$command}->{$key}) and $merge);
+ if ($key eq 'args')
+ {
+ $to->{$command}->{$key} = [ @{$from->{$command}->{$key}} ];
+ }
+ else
+ {
+ $to->{$command}->{$key} = $from->{$command}->{$key};
+ }
+ }
+ }
+}
+
+# default is {'args' => ['normal'], 'attribute' => ''},
+%style_map = (
+ 'asis', {},
+ 'b', {},
+ 'cite', {},
+ 'clicksequence', {},
+ 'click', {'function' => \&t2h_default_click_normal, 'type' =>
'simple_style'},
+ 'code', {'args' => ['code']},
+ 'command', {'args' => ['code']},
+ 'ctrl', {'function' => \&t2h_default_ctrl,'type' =>
'simple_style'},
+ 'dfn', {},
+ 'dmn', {'type' => 'simple_style'},
+ 'email', {'args' => ['code', 'normal'],
+ 'function' => \&t2h_default_email,
+ 'type' => 'simple_style'},
+ #'email', {'args' => ['normal', 'normal'],
+ # 'function' => \&t2h_default_email},
+ 'emph', {},
+ 'env', {'args' => ['code']},
+ 'file', {'args' => ['code'], 'quote' => '"'},
+ 'headitemfont', {},
+ 'i', {},
+ 'slanted', {},
+ 'sansserif', {},
+ 'kbd', {'args' => ['code'], },
+ 'key', {'args' => ['code'], 'begin' => '<', 'end' => '>'},
+ 'math', {'function' => \&t2h_default_math, 'args' => ['math'] },
+ 'option', {'args' => ['code'], 'quote' => '"'},
+ 'r', {},
+ 'samp', {'args' => ['code'], 'quote' => '"'},
+# 'sc', {'function' => \&t2h_default_sc},
+ 'sc', {},
+ 'strong', {},
+ 't', {},
+ 'uref', {'function' => \&t2h_default_uref,
+ 'args' => ['code', 'normal', 'normal'],
+ 'type' => 'simple_style' },
+ #'uref', {'function' => \&t2h_default_uref,
+ # 'args' => ['normal', 'normal', 'normal']},
+ 'url', {'function' => \&t2h_default_uref,
+ 'args' => ['code', 'normal', 'normal'],
+ 'type' => 'simple_style'},
+ 'indicateurl', {'args' => ['code'], 'begin' => '<', 'end' => '>','type'
=> 'simple_style'},
+ 'var', {},
+ 'verb', {'args' => ['code'], },
+ 'titlefont', {'function' => \&t2h_default_titlefont,
+ 'type' => 'simple_style'},
+ 'w', {},
+ 'hyphenation', {'function' => \&t2h_default_hyphenation, 'args' =>
['keep']},
+ );
+
+%command_type = ();
+
+foreach my $style (keys(%style_map))
+{
+ if (exists($style_map{$style}->{'type'}))
+ {
+ $command_type{$style} = $style_map{$style}->{'type'};
+ }
+ else
+ {
+ $command_type{$style} = 'style';
+ }
+}
+
+
+sub t2h_default_select_substitution($$$)
+{
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_simple = shift;
+
+ if ($in_raw_text)
+ {
+ return address@hidden;
+ }
+ elsif ($in_simple)
+ {
+ return address@hidden;
+ }
+ elsif ($in_preformatted)
+ {
+ return address@hidden;
+ }
+ else
+ {
+ return address@hidden;
+ }
+}
+
+sub t2h_text_substitutions($$$$)
+{
+ my $text = shift;
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_simple = shift;
+
+ my $substitutions = t2h_default_select_substitution($in_raw_text,
$in_preformatted, $in_simple);
+ foreach my $substitution_entry (@$substitutions)
+ {
+ my $from = quotemeta($substitution_entry->[0]);
+ my $to = $substitution_entry->[1];
+ $text =~ s/$from/$to/g;
+ }
+ return $text;
+}
+
+sub t2h_add_text_substitutions($$$$$)
+{
+ my $entry = shift;
+ my $in_normal = shift;
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_simple = shift;
+
+ my @formats_to_be_done = ($in_normal, $in_raw_text, $in_preformatted,
$in_simple);
+
+ for (my $index = 0; $index < scalar(@formats_to_be_done); $index++)
+ {
+ next unless ($formats_to_be_done[$index]);
+ my @args = (0, 0, 0);
+ my $found = 0;
+ $args[$index -1] = 1 if ($index > 0);
+ my $substitutions = &t2h_default_select_substitution(@args);
+ foreach my $substitution_entry (@$substitutions)
+ {
+ if ($substitution_entry->[0] eq $entry->[0])
+ {
+ $found = 1;
+ $substitution_entry->[1] = $entry->[1];
+ }
+ }
+ push @$substitutions, $entry unless ($found);
+ }
+}
+
+sub t2h_remove_text_substitutions($$$$$)
+{
+ my $entry = shift;
+ my $in_normal = shift;
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_simple = shift;
+
+ my @formats_to_be_done = ($in_normal, $in_raw_text, $in_preformatted,
$in_simple);
+
+ for (my $index = 0; $index < scalar(@formats_to_be_done); $index++)
+ {
+ next unless ($formats_to_be_done[$index]);
+ my @args = (0, 0, 0);
+ $args[$index -1] = 1 if ($index > 0);
+ my $substitutions = &t2h_default_select_substitution(@args);
+
+ @$substitutions = grep {$_->[0] ne $entry} @$substitutions;
+ }
+}
+
+
+%unicode_diacritical = (
+ 'H' => '030B',
+ 'ringaccent' => '030A',
+ "'" => '0301',
+ 'v' => '030C',
+ ',' => '0327',
+ '^' => '0302',
+ 'dotaccent' => '0307',
+ '`' => '0300',
+ '=' => '0304',
+ '~' => '0303',
+ '"' => '0308',
+ 'udotaccent' => '0323',
+ 'ubaraccent' => '0332',
+ 'u' => '0306',
+ 'tieaccent' => '0361',
+ 'ogonek' => '0328'
+);
+
+%unicode_accents = (
+ 'dotaccent' => { # dot above
+ 'A' => '0226', #C moz-1.2
+ 'a' => '0227', #c moz-1.2
+ 'B' => '1E02',
+ 'b' => '1E03',
+ 'C' => '010A',
+ 'c' => '010B',
+ 'D' => '1E0A',
+ 'd' => '1E0B',
+ 'E' => '0116',
+ 'e' => '0117',
+ 'F' => '1E1E',
+ 'f' => '1E1F',
+ 'G' => '0120',
+ 'g' => '0121',
+ 'H' => '1E22',
+ 'h' => '1E23',
+ 'i' => '0069',
+ 'I' => '0130',
+ 'N' => '1E44',
+ 'n' => '1E45',
+ 'O' => '022E', #Y moz-1.2
+ 'o' => '022F', #v moz-1.2
+ 'P' => '1E56',
+ 'p' => '1E57',
+ 'R' => '1E58',
+ 'r' => '1E59',
+ 'S' => '1E60',
+ 's' => '1E61',
+ 'T' => '1E6A',
+ 't' => '1E6B',
+ 'W' => '1E86',
+ 'w' => '1E87',
+ 'X' => '1E8A',
+ 'x' => '1E8B',
+ 'Y' => '1E8E',
+ 'y' => '1E8F',
+ 'Z' => '017B',
+ 'z' => '017C',
+ },
+ 'udotaccent' => { # dot below
+ 'A' => '1EA0',
+ 'a' => '1EA1',
+ 'B' => '1E04',
+ 'b' => '1E05',
+ 'D' => '1E0C',
+ 'd' => '1E0D',
+ 'E' => '1EB8',
+ 'e' => '1EB9',
+ 'H' => '1E24',
+ 'h' => '1E25',
+ 'I' => '1ECA',
+ 'i' => '1ECB',
+ 'K' => '1E32',
+ 'k' => '1E33',
+ 'L' => '1E36',
+ 'l' => '1E37',
+ 'M' => '1E42',
+ 'm' => '1E43',
+ 'N' => '1E46',
+ 'n' => '1E47',
+ 'O' => '1ECC',
+ 'o' => '1ECD',
+ 'R' => '1E5A',
+ 'r' => '1E5B',
+ 'S' => '1E62',
+ 's' => '1E63',
+ 'T' => '1E6C',
+ 't' => '1E6D',
+ 'U' => '1EE4',
+ 'u' => '1EE5',
+ 'V' => '1E7E',
+ 'v' => '1E7F',
+ 'W' => '1E88',
+ 'w' => '1E89',
+ 'Y' => '1EF4',
+ 'y' => '1EF5',
+ 'Z' => '1E92',
+ 'z' => '1E93',
+ },
+ 'ubaraccent' => { # line below
+ 'B' => '1E06',
+ 'b' => '1E07',
+ 'D' => '1E0E',
+ 'd' => '1E0F',
+ 'h' => '1E96',
+ 'K' => '1E34',
+ 'k' => '1E35',
+ 'L' => '1E3A',
+ 'l' => '1E3B',
+ 'N' => '1E48',
+ 'n' => '1E49',
+ 'R' => '1E5E',
+ 'r' => '1E5F',
+ 'T' => '1E6E',
+ 't' => '1E6F',
+ 'Z' => '1E94',
+ 'z' => '1E95',
+ },
+ ',' => { # cedilla
+ 'C' => '00C7',
+ 'c' => '00E7',
+ 'D' => '1E10',
+ 'd' => '1E11',
+ 'E' => '0228', #C moz-1.2
+ 'e' => '0229', #c moz-1.2
+ 'G' => '0122',
+ 'g' => '0123',
+ 'H' => '1E28',
+ 'h' => '1E29',
+ 'K' => '0136',
+ 'k' => '0137',
+ 'L' => '013B',
+ 'l' => '013C',
+ 'N' => '0145',
+ 'n' => '0146',
+ 'R' => '0156',
+ 'r' => '0157',
+ 'S' => '015E',
+ 's' => '015F',
+ 'T' => '0162',
+ 't' => '0163',
+ },
+ '=' => { # macron
+ 'A' => '0100',
+ 'a' => '0101',
+ 'E' => '0112',
+ 'e' => '0113',
+ 'I' => '012A',
+ 'i' => '012B',
+ 'G' => '1E20',
+ 'g' => '1E21',
+ 'O' => '014C',
+ 'o' => '014D',
+ 'U' => '016A',
+ 'u' => '016B',
+ 'Y' => '0232', #? moz-1.2
+ 'y' => '0233', #? moz-1.2
+ },
+ '"' => { # diaeresis
+ 'A' => '00C4',
+ 'a' => '00E4',
+ 'E' => '00CB',
+ 'e' => '00EB',
+ 'H' => '1E26',
+ 'h' => '1E27',
+ 'I' => '00CF',
+ 'i' => '00EF',
+ 'O' => '00D6',
+ 'o' => '00F6',
+ 't' => '1E97',
+ 'U' => '00DC',
+ 'u' => '00FC',
+ 'W' => '1E84',
+ 'w' => '1E85',
+ 'X' => '1E8C',
+ 'x' => '1E8D',
+ 'y' => '00FF',
+ 'Y' => '0178',
+ },
+ 'u' => { # breve
+ 'A' => '0102',
+ 'a' => '0103',
+ 'E' => '0114',
+ 'e' => '0115',
+ 'G' => '011E',
+ 'g' => '011F',
+ 'I' => '012C',
+ 'i' => '012D',
+ 'O' => '014E',
+ 'o' => '014F',
+ 'U' => '016C',
+ 'u' => '016D',
+ },
+ "'" => { # acute
+ 'A' => '00C1',
+ 'a' => '00E1',
+ 'C' => '0106',
+ 'c' => '0107',
+ 'E' => '00C9',
+ 'e' => '00E9',
+ 'G' => '01F4',
+ 'g' => '01F5',
+ 'I' => '00CD',
+ 'i' => '00ED',
+ 'K' => '1E30',
+ 'k' => '1E31',
+ 'L' => '0139',
+ 'l' => '013A',
+ 'M' => '1E3E',
+ 'm' => '1E3F',
+ 'N' => '0143',
+ 'n' => '0144',
+ 'O' => '00D3',
+ 'o' => '00F3',
+ 'P' => '1E54',
+ 'p' => '1E55',
+ 'R' => '0154',
+ 'r' => '0155',
+ 'S' => '015A',
+ 's' => '015B',
+ 'U' => '00DA',
+ 'u' => '00FA',
+ 'W' => '1E82',
+ 'w' => '1E83',
+ 'Y' => '00DD',
+ 'y' => '00FD',
+ 'Z' => '0179',
+ 'z' => '018A',
+ },
+ '~' => { # tilde
+ 'A' => '00C3',
+ 'a' => '00E3',
+ 'E' => '1EBC',
+ 'e' => '1EBD',
+ 'I' => '0128',
+ 'i' => '0129',
+ 'N' => '00D1',
+ 'n' => '00F1',
+ 'O' => '00D5',
+ 'o' => '00F5',
+ 'U' => '0168',
+ 'u' => '0169',
+ 'V' => '1E7C',
+ 'v' => '1E7D',
+ 'Y' => '1EF8',
+ 'y' => '1EF9',
+ },
+ '`' => { # grave
+ 'A' => '00C0',
+ 'a' => '00E0',
+ 'E' => '00C8',
+ 'e' => '00E8',
+ 'I' => '00CC',
+ 'i' => '00EC',
+ 'N' => '01F8',
+ 'n' => '01F9',
+ 'O' => '00D2',
+ 'o' => '00F2',
+ 'U' => '00D9',
+ 'u' => '00F9',
+ 'W' => '1E80',
+ 'w' => '1E81',
+ 'Y' => '1EF2',
+ 'y' => '1EF3',
+ },
+ '^' => { # circumflex
+ 'A' => '00C2',
+ 'a' => '00E2',
+ 'C' => '0108',
+ 'c' => '0109',
+ 'E' => '00CA',
+ 'e' => '00EA',
+ 'G' => '011C',
+ 'g' => '011D',
+ 'H' => '0124',
+ 'h' => '0125',
+ 'I' => '00CE',
+ 'i' => '00EE',
+ 'J' => '0134',
+ 'j' => '0135',
+ 'O' => '00D4',
+ 'o' => '00F4',
+ 'S' => '015C',
+ 's' => '015D',
+ 'U' => '00DB',
+ 'u' => '00FB',
+ 'W' => '0174',
+ 'w' => '0175',
+ 'Y' => '0176',
+ 'y' => '0177',
+ 'Z' => '1E90',
+ 'z' => '1E91',
+ },
+ 'ringaccent' => { # ring
+ 'A' => '00C5',
+ 'a' => '00E5',
+ 'U' => '016E',
+ 'u' => '016F',
+ 'w' => '1E98',
+ 'y' => '1E99',
+ },
+ 'v' => { # caron
+ 'A' => '01CD',
+ 'a' => '01CE',
+ 'C' => '010C',
+ 'c' => '010D',
+ 'D' => '010E',
+ 'd' => '010F',
+ 'E' => '011A',
+ 'e' => '011B',
+ 'G' => '01E6',
+ 'g' => '01E7',
+ 'H' => '021E', #K with moz-1.2
+ 'h' => '021F', #k with moz-1.2
+ 'I' => '01CF',
+ 'i' => '01D0',
+ 'K' => '01E8',
+ 'k' => '01E9',
+ 'L' => '013D', #L' with moz-1.2
+ 'l' => '013E', #l' with moz-1.2
+ 'N' => '0147',
+ 'n' => '0148',
+ 'O' => '01D1',
+ 'o' => '01D2',
+ 'R' => '0158',
+ 'r' => '0159',
+ 'S' => '0160',
+ 's' => '0161',
+ 'T' => '0164',
+ 't' => '0165',
+ 'U' => '01D3',
+ 'u' => '01D4',
+ 'Z' => '017D',
+ 'z' => '017E',
+ },
+ 'H' => { # double acute
+ 'O' => '0150',
+ 'o' => '0151',
+ 'U' => '0170',
+ 'u' => '0171',
+ },
+ 'ogonek' => {
+ 'A' => '0104',
+ 'a' => '0105',
+ 'E' => '0118',
+ 'e' => '0119',
+ 'I' => '012E',
+ 'i' => '012F',
+ 'U' => '0172',
+ 'u' => '0173',
+ 'O' => '01EA',
+ 'o' => '01EB',
+ },
+);
+
+foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
+{
+ $style_map{$accent_command} = { 'function' => \&t2h_default_accent };
+ $old_style_map{$accent_command} = '&default_accent';
+ $style_map_texi{$accent_command} = { 'function' => \&t2h_default_accent };
+}
+
+
+%transliterate_accent_map = ();
+foreach my $command (keys(%unicode_accents))
+{
+ foreach my $letter(keys (%{$unicode_accents{$command}}))
+ {
+ $transliterate_accent_map{$unicode_accents{$command}->{$letter}}
+ = $letter
+ unless
(exists($transliterate_map{$unicode_accents{$command}->{$letter}}));
+ }
+}
+
+sub default_accent($$)
+{
+ my $text = shift;
+ my $accent = shift;
+ return "&${text}$accent_map{$accent};" if (defined($accent_map{$accent})
and defined($special_accents{$accent}) and ($text =~
/^[$special_accents{$accent}]$/));
+ return '&' . $text . 'ring;' if (($accent eq 'ringaccent') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
+ return $text . '<' if ($accent eq 'v');
+ return ascii_accents($text, $accent);
+}
+
+sub t2h_default_accent($$)
+{
+ my $accent = shift;
+ my $args = shift;
+
+ my $text = $args->[0];
+
+ return ascii_accents($text, $accent);
+}
+
+####################################################################
+# special accent/encoding commands
+#
+# Some functions used to override normal formatting functions in specific
+# cases. The user shouldn't want to change them, but can use them.
+#
+
+sub ascii_accents($$)
+{
+ my $text = shift;
+ my $accent = shift;
+ return $text if ($accent eq 'dotless');
+ return $text . "''" if ($accent eq 'H');
+ return $text . '.' if ($accent eq 'dotaccent');
+ return $text . '*' if ($accent eq 'ringaccent');
+ return $text . '[' if ($accent eq 'tieaccent');
+ return $text . '(' if ($accent eq 'u');
+ return $text . '_' if ($accent eq 'ubaraccent');
+ return '.' . $text if ($accent eq 'udotaccent');
+ return $text . '<' if ($accent eq 'v');
+ return $text . ';' if ($accent eq 'ogonek');
+ return $text . $accent if (defined($accent_map{$accent}));
+}
+
+sub xml_default_accent($$)
+{
+ my $accent = shift;
+ my $args = shift;
+
+ my $text = $args->[0];
+
+ return "&${text}$accent_map{$accent};" if (defined($accent_map{$accent})
and defined($special_accents{$accent}) and ($text =~
/^[$special_accents{$accent}]$/));
+ return '&' . $text . 'ring;' if (($accent eq 'ringaccent') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
+ return $text . '<' if ($accent eq 'v');
+# FIXME here there could be a conversion to the character in the right
+# encoding, like
+# if (get_conf('USE_UNICODE') and defined($OUT_ENCODING) and $OUT_ENCODING
ne ''
+# and exists($unicode_accents{$accent}) and
exists($unicode_accents{$accent}->{$text}))
+# {
+# my $encoded_char = Encode::encode($OUT_ENCODING,
chr(hex($unicode_map{$thing})), Encode::FB_QUIET);
+# return $encoded_char if ($encoded_char ne '');
+# }
+ if (get_conf('USE_NUMERIC_ENTITY'))
+ {
+ if (exists($unicode_accents{$accent}) and
exists($unicode_accents{$accent}->{$text}))
+ {
+ return ('&#' . hex($unicode_accents{$accent}->{$text}) . ';');
+ }
+ }
+ return ascii_accents($text, $accent);
+}
+
+# used to utf8 encode the result
+sub t2h_utf8_accent($$$)
+{
+ my $accent = shift;
+ my $args = shift;
+ my $style_stack = shift;
+
+ my $text = $args->[0];
+ #print STDERR "$accent\[".scalar(@$style_stack) ."\] (@$style_stack)\n";
+
+ # special handling of @dotless{i}
+ if ($accent eq 'dotless')
+ {
+ if (($text eq 'i') and (!defined($style_stack->[-1]) or
(!defined($unicode_accents{$style_stack->[-1]})) or ($style_stack->[-1] eq
'tieaccent')))
+ {
+ return "\x{0131}";
+ }
+ #return "\x{}" if ($text eq 'j'); # not found !
+ return $text;
+ }
+
+ # FIXME \x{0131}\x{0308} for @dotless{i} @" doesn't lead to NFC 00ef.
+ return Unicode::Normalize::NFC($text .
chr(hex($unicode_diacritical{$accent})))
+ if (defined($unicode_diacritical{$accent}));
+ return ascii_accents($text, $accent);
+}
+
+sub t2h_utf8_normal_text($$$$$$$;$)
+{
+ my $text = shift;
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ $text = &$protect_text($text) unless($in_raw_text);
+ $text = uc($text) if (in_small_caps($style_stack));
+
+ if (!$in_code and !$in_preformatted)
+ {
+ $text =~ s/---/\x{2014}/g;
+ $text =~ s/--/\x{2013}/g;
+ $text =~ s/``/\x{201C}/g;
+ $text =~ s/''/\x{201D}/g;
+ }
+ $text = t2h_text_substitutions($text, $in_raw_text, ($in_preformatted or
$in_code), $in_simple);
+ return Unicode::Normalize::NFC($text);
+}
+
+sub t2h_enable_encoding_normal_accent($$$)
+{
+ return t2h_enable_encoding_accent ('normal', @_);
+}
+sub t2h_enable_encoding_texi_accent($$$)
+{
+ return t2h_enable_encoding_accent ('texi', @_);
+}
+sub t2h_enable_encoding_pre_accent($$$)
+{
+ return t2h_enable_encoding_accent ('pre', @_);
+}
+
+sub t2h_enable_encoding_accent($$$$)
+{
+ my $context = shift;
+ my @other_args = @_;
+
+ my $accent = shift;
+ my $args = shift;
+ my $style_stack = shift;
+ my $text = $args->[0];
+
+#print STDERR "enable_encoding_accent called($context) $accent
(@$style_stack)\n";
+
+ # in case ENCODING_NAME is not known, the accent functions saved previously
+ # are used.
+ # This should happen rarely, like during @setfilename parsing.
+ return
&{$t2h_enable_encoding_default_accent{$context}->{$accent}}(@other_args) if
(!defined(get_conf('ENCODING_NAME')));
+
+ return t2h_utf8_accent($accent,[$text],$style_stack) if
(get_conf('ENCODING_NAME') eq 'utf-8');
+
+ # use the saved default handling if this is not a known 8 bit encoding
+ return
&{$t2h_enable_encoding_default_accent{$context}->{$accent}}(@other_args) if
(!exists($makeinfo_encoding_to_map{get_conf('ENCODING_NAME')}));
+
+ # the following is for the handling of known 8 bit encodings.
+ if (scalar(@t2h_enable_encoding_accents_stack))
+ {
+ # in that case, we already have a result ready that corresponds with the
+ # formatting of a part of the stack mapped to
+ # t2h_enable_encoding_accents_stack, so it is emptied and the innermost
+ # $text is returned as is, such that the unmodified already formatted
+ # innermost formatted accented text is returned.
+
+ #print STDERR " doing nothing, still in stack
(@t2h_enable_encoding_accents_stack), accent: $accent";
+ my $stack_accent = shift @t2h_enable_encoding_accents_stack;
+ #print STDERR " stack_accent $stack_accent\n";
+ return $text;
+ }
+
+ # in that case there is no t2h_enable_encoding_accents_stack, so we are
+ # at the closing of the innermost accented command. We will try to format
+ # all the stack in reverse(@$style_stack) that coresponds with
+ # accent commands
+ my @accents_stack = ();
+ my @styles = reverse(@$style_stack);
+
+ # accents are formatted and the intermediate results are kept, such
+ # that we can return the maximum of multiaccented letters that can be
+ # rendered with a given eight bit formatting.
+
+ # first put the letter in the stack
+ my @utf8_partial_results = { 'result' => $text,
+ 'accents_stack' => [ @accents_stack ]};
+
+ # then the accent that is associated with the function call
+ my $current_accent = t2h_utf8_accent($accent,[$text],$style_stack);
+ @accents_stack = ($accent);
+ push @utf8_partial_results, { 'result' => $current_accent,
+ 'accents_stack' => [ @accents_stack ]};
+
+ # and then all the other accents on the stack
+ while (scalar(@styles) and (defined($unicode_accents{$styles[0]}) or
$styles[0] eq 'dotless'))
+ {
+ my $next_style = shift @styles;
+ my @new_stack = reverse(@styles);
+ $current_accent =
t2h_utf8_accent($next_style,[$current_accent],address@hidden);
+ push @accents_stack, $next_style;
+ push @utf8_partial_results, { 'result' => $current_accent,
+ 'accents_stack' => [ @accents_stack ]}
+ ;
+ }
+
+ my $enc_map = $makeinfo_encoding_to_map{get_conf('ENCODING_NAME')};
+ my $eight_bit;
+ my $result;
+ # At this point we have the utf8 encoded results for the accent
+ # commands stack, with all the intermediate results.
+ # For each one we'll check if it is possible to encode it in the
+ # current eight bit output encoding table
+ foreach my $partial_result (@utf8_partial_results)
+ {
+ my $char = $partial_result->{'result'};
+ my $new_eight_bit = '';
+ my $new_codepoint;
+
+ if (ord($char) <= 128)
+ {
+ $new_eight_bit = uc(sprintf("%02x",ord($char)));
+ $new_codepoint = uc(sprintf("%04x",ord($char)));
+ }
+ elsif (ord($char) <= hex(0xFFFF))
+ {
+ $new_codepoint = uc(sprintf("%04x",ord($char)));
+ if (exists($makeinfo_unicode_to_eight_bit{$enc_map}->{$new_codepoint}))
+ {
+ $new_eight_bit =
$makeinfo_unicode_to_eight_bit{$enc_map}->{$new_codepoint};
+ }
+ }
+ #my $eight_bit_txt = 'undef';
+ #$eight_bit_txt = $eight_bit if (defined($eight_bit));
+ #print STDERR "" . Encode::encode('utf8', "$char") . "
(@{$partial_result->{'accents_stack'}}), new_codepoint: $new_codepoint 8bit:
$new_eight_bit old:$eight_bit_txt\n";
+ # no corresponding eight bit character found
+ last if ($new_eight_bit eq '');
+
+ # in that case, the new eight bit character is the same than the one
+ # found with one less character (and it isnt a @dotless{i}). It may
+ # mean 2 things
+ # -> there are 2 characters in accent. This could happen, for example
+ # if an accent that cannot be rendered is found and it leads to
+ # appending or prepending a character. For example this happens for
+ # @={@,address@hidden, where @,address@hidden is expanded to a 2
character:
+ # n with a tilde, followed by a ,
+ # In nthat case, the additional utf8 accent is prepended, which
+ # means that it is composed with the , and leaves n with a tilde
+ # untouched.
+ # -> ord(char) leads to the same for the more inner character.
+ # this, for example, happens for @ubaraccent{a}, where ord(a) is
+ # the same than ord(a with underbar).
+ last if (defined($eight_bit) and (($new_eight_bit eq $eight_bit)
+ and !($partial_result->{'accents_stack'}[0] eq 'dotless' and $char eq
'i')));
+ $result = $partial_result;
+ $eight_bit = $new_eight_bit;
+ }
+ if (defined($result) and scalar(@{$result->{'accents_stack'}}))
+ {
+ # we got a result, return it and put in t2h_enable_encoding_accents_stack
+ # the stack of accent commands that were processed. They wont be used
+ # further, but only unshifted.
+
+ #print STDERR "Result: ".Encode::encode('utf8', $result->{'result'}) ."
'$eight_bit' (@{$result->{'accents_stack'}})\n" if defined($result);
+ @t2h_enable_encoding_accents_stack = @{$result->{'accents_stack'}};
+ # remove the first, it is the accent being processed
+ shift @t2h_enable_encoding_accents_stack;
+ # it should be noted that we return the 'utf8' accent (which is really
+ # a codepoint, and not the eight bit representation, we leave the
+ # conversion to perl, which should handle it fine
+ return $result->{'result'};
+ }
+
+ return
&{$t2h_enable_encoding_default_accent{$context}->{$accent}}(@other_args);
+}
+
+# end special accent/encoding commands
+####################################################################
+
+####################################################################
+# TeX/LaTeX, that can especially be used in @math
+# To load the appropriate hash, use
+# default_load_tex_math
+
+my %tex_default_simple_map_math = (
+ '{' => '\{',
+ '}' => '\}',
+ '\\' => '\\'
+);
+
+my %tex_default_math_things_map = %default_things_map;
+
+$tex_default_math_things_map{'bullet'} = '\bullet';
+$tex_default_math_things_map{'copyright'} = '\copyright';
+$tex_default_math_things_map{'registeredsymbol'} = '\circledR';
+$tex_default_math_things_map{'dots'} = '\dots';
+$tex_default_math_things_map{'endots'} = '\dots';
+$tex_default_math_things_map{'equiv'} = '\equiv';
+$tex_default_math_things_map{'expansion'} = '\mapsto';
+$tex_default_math_things_map{'arrow'} = '\rightarrow';
+$tex_default_math_things_map{'point'} = '\star';
+$tex_default_math_things_map{'print'} = '\dashv';
+$tex_default_math_things_map{'result'} = '\Rightarrow';
+$tex_default_math_things_map{'pounds'} = '\pounds';
+$tex_default_math_things_map{'geq'} = '\geq';
+$tex_default_math_things_map{'leq'} = '\leq';
+$tex_default_math_things_map{'textdegree'} = '^\circ';
+
+my %latex_default_math_things_map = %tex_default_math_things_map;
+
+$latex_default_math_things_map{'aa'} = '\mathring{a}';
+$latex_default_math_things_map{'AA'} = '\mathring{A}';
+
+# FIXME Maybe this should not be there since it is not for math but
+# more for a completly separate format.
+my %latex_default_things_map;
+
+foreach my $thing (keys(%default_things_map))
+{
+ $latex_default_things_map{$thing} = '\\'.$thing;
+}
+
+$latex_default_things_map{'error'} = '\fbox{error}';
+$latex_default_things_map{'enddots'} = '\dots\@';
+$latex_default_things_map{'exclamdown'} = '\textexclamdown';
+$latex_default_things_map{'questiondown'} = '\textquestiondown';
+$latex_default_things_map{'tie'} = '~';
+$latex_default_things_map{'registeredsymbol'} = '\textregistered';
+$latex_default_things_map{'ordf'} = '\textordfeminine';
+$latex_default_things_map{'ordm'} = '\textordmasculine';
+$latex_default_things_map{'guillemetleft'} = '\guillemotleft';
+$latex_default_things_map{'guillemetright'} = '\guillemotright';
+
+foreach my $text_prefixed_symbols ('bullet', 'exclamdown', 'questiondown',
+ 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright')
+{
+ $latex_default_things_map{$text_prefixed_symbols} =
'\text'.$text_prefixed_symbols;
+}
+
+foreach my $math_only ('equiv', 'expansion', 'arrow', 'minus', 'point',
+ 'print', 'result', 'geq', 'leq')
+{
+ $latex_default_things_map{$math_only} =
'$'.$latex_default_math_things_map{$math_only}.'$';
+}
+
+
+# End TeX/LaTeX
+#############################################################
+
+sub default_sc($$)
+{
+ return uc($_[0]);
+}
+
+sub default_ctrl($$)
+{
+ return "^$_[0]";
+}
+
+# obsolete, no warning, but noop
+sub t2h_default_ctrl($$$)
+{
+ shift;
+ my $args = shift;
+ #return "^$args->[0]";
+ return "$args->[0]";
+}
+
+sub default_sc_pre($$)
+{
+ return uc($_[0]);
+}
+
+sub default_titlefont($$)
+{
+ return "<h1 class=\"titlefont\">$_[0]</h1>" if ($_[0] =~ /\S/);
+ return '';
+}
+
+# Return nothing if the text is empty
+sub t2h_default_titlefont($$$)
+{
+ shift;
+ my $args = shift;
+ my $heading = $args->[0];
+ return '' unless ($heading =~ /\S/);
+ return &$heading_text('@titlefont', $heading, 0);
+}
+
+# At some point in time (before 4.7?) according to the texinfo
+# manual, url shouldn't lead to a link but rather be formatted
+# like text. It is now what indicateurl do, url is the same that
+# uref with one arg. If we did like makeinfo did it would have been
+#sub url($$)
+#{
+# return '<<code>' . $_[0] . '</code>>';
+#}
+#
+# This is unused, t2h_default_uref is used instead
+sub t2h_default_url ($$)
+{
+ shift;
+ my $args = shift;
+ my $url = shift @$args;
+ $url = main::normalise_space($url);
+ return '' unless ($url =~ /\S/);
+ return t2h_default_url_and_text($url);
+}
+
+sub default_url ($$)
+{
+ my $url = shift;
+ my $command = shift;
+ $url =~ s/\s*$//;
+ $url =~ s/^\s*//;
+ return t2h_default_url_and_text($url);
+}
+
+sub default_uref($$)
+{
+ my $arg = shift;
+ my $command = shift;
+ my ($url, $text, $replacement);
+ ($url, $text, $replacement) = split /,\s*/, $arg;
+ $url =~ s/\s*$//;
+ $url =~ s/^\s*//;
+ $text = $replacement if (defined($replacement));
+ return t2h_default_url_and_text($url, $text);
+}
+
+sub t2h_default_uref($$)
+{
+ shift;
+ my $args = shift;
+ my $url = shift @$args;
+ my $text = shift @$args;
+ my $replacement = shift @$args;
+ $url = main::normalise_space($url);
+ $replacement = '' if (!defined($replacement));
+ $replacement = main::normalise_space($replacement);
+ $text = '' if (!defined($text));
+ $text = main::normalise_space($text);
+ $text = $replacement if ($replacement ne '');
+ return t2h_default_url_and_text($url, $text);
+}
+
+sub t2h_default_math($$)
+{
+ shift;
+ my $args = shift;
+ my $text = shift @$args;
+ return "$text";
+}
+
+sub default_email($$)
+{
+ my $arg = shift;
+ my $command = shift;
+ my ($mail, $text);
+ ($mail, $text) = split /,\s*/, $arg;
+ $mail =~ s/\s*$//;
+ $mail =~ s/^\s*//;
+ return t2h_default_url_and_text("mailto:$mail";, $text);
+}
+
+sub t2h_default_email($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $mail = shift @$args;
+ my $text = shift @$args;
+ $mail = main::normalise_space($mail);
+ if (defined($text))
+ {
+ $text = main::normalise_space($text);
+ }
+ my $mailto = '';
+ $mailto = "mailto:$mail"; if ($mail ne '');
+ return t2h_default_url_and_text($mailto, $text);
+}
+
+sub t2h_default_click_normal($$$)
+{
+ return t2h_default_click('normal', @_);
+}
+
+sub t2h_default_click_pre($$$)
+{
+ return t2h_default_click('pre', @_);
+}
+
+sub t2h_default_click_texi($$$)
+{
+ return t2h_default_click('texi', @_);
+}
+
+sub t2h_default_click($$$$$)
+{
+ my $context = shift;
+ my $command = shift;
+ my $args = shift;
+ my $arg = shift @$args;
+ my $cmd = get_conf('clickstyle');
+ $cmd = 'arrow' if (!defined($cmd) or ($cmd eq ''));
+
+ my $hash = \%things_map;
+ if ($context eq 'pre')
+ {
+ $hash = \%pre_map;
+ }
+ elsif ($context eq 'texi')
+ {
+ $hash = \%texi_map;
+ }
+ return $hash->{$cmd} . $arg if (exists($hash->{$cmd}));
+ return $arg;
+}
+
+sub t2h_default_hyphenation($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $text = shift @$args;
+ $text =~ s/^\s*//;
+ $text =~ s/\s*$//;
+ my @list = split /\s+/, $text;
+ foreach my $entry (@list)
+ {
+ my $word = $entry;
+ $word =~ s/-//g;
+ $Texi2HTML::THISDOC{'hyphenation'}->{$word} = $entry;
+ }
+}
+
+sub t2h_default_no_texi_email
+{
+ my $command = shift;
+ my $args = shift;
+ my $mail = shift @$args;
+ my $text = shift @$args;
+ $mail = main::normalise_space($mail);
+ if (defined($text))
+ {
+ $text = main::normalise_space($text);
+ }
+ return $text if (defined($text) and ($text ne ''));
+ return $mail;
+}
+
+sub t2h_default_no_texi_image($$$$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $file = $args->[0];
+ $file = main::trim_around_spaces($file);
+ return main::substitute_line($file, "address@hidden", {'remove_texi' => 1,
'code_style' => 1});
+}
+
+sub t2h_default_no_texi_acronym_like($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $acronym_texi = $args->[0];
+ return (main::remove_texi($acronym_texi));
+}
+
+sub t2h_remove_command($$$$)
+{
+ return '';
+}
+
+# This is used for style in preformatted sections
+my %old_style_map_pre = %old_style_map;
+$old_style_map_pre{'sc'} = '&default_sc_pre';
+$old_style_map_pre{'titlefont'} = '';
+
+foreach my $command (keys(%style_map))
+{
+ $style_map_texi{$command} = {} if (!exists($style_map_texi{$command}));
+ $style_map_texi{$command}->{'args'} = [ @{$style_map{$command}->{'args'}} ]
+ if (exists($style_map{$command}->{'args'}));
+ #print STDERR "COMMAND $command";
+}
+
+%style_map_pre = ();
+
+t2h_default_copy_style_map(\%style_map, \%style_map_pre);
+
+$style_map_pre{'sc'} = {};
+$style_map_pre{'titlefont'} = {};
+$style_map_pre{'click'}->{'function'} = \&t2h_default_click_pre;
+
+$style_map_texi{'sc'} = {};
+$style_map_texi{'email'}->{'function'} = \&t2h_default_no_texi_email;
+$style_map_texi{'click'}->{'function'} = \&t2h_default_click_texi;
+
+####### special styles. You shouldn't need to change them
+%special_style = (
+ #'xref' => ['keep','normal','normal','keep','normal'],
+ 'xref' => { 'args' => ['keep','keep','keep','keep','keep'],
+ 'function' => \&main::do_xref },
+ 'ref' => { 'args' => ['keep','keep','keep','keep','keep'],
+ 'function' => \&main::do_xref },
+ 'pxref' => { 'args' => ['keep','keep','keep','keep','keep'],
+ 'function' => \&main::do_xref },
+ 'inforef' => { 'args' => ['keep','keep','keep'],
+ 'function' => \&main::do_xref },
+ 'image' => { 'args' => ['keep','keep','keep','keep','keep'],
'function' => \&main::do_image },
+ 'anchor' => { 'args' => ['keep'], 'function' =>
\&main::do_anchor_label },
+ 'footnote' => { 'args' => ['keep'], 'function' =>
\&main::do_footnote },
+ 'shortcaption' => { 'args' => ['keep'], 'function' =>
\&main::do_caption_shortcaption },
+ 'caption' => { 'args' => ['keep'], 'function' =>
\&main::do_caption_shortcaption },
+ 'acronym', {'args' => ['keep','keep'], 'function' =>
\&main::do_acronym_like},
+ 'abbr', {'args' => ['keep','keep'], 'function' =>
\&main::do_acronym_like},
+);
+
+# @image is replaced by the first arg in strings
+$style_map_texi{'image'} = { 'args' => ['keep','keep','keep','keep','keep'],
+ 'function' => \&t2h_default_no_texi_image };
+
+$style_map_texi{'acronym'} = { 'args' => ['keep','keep'],
+ 'function' => \&t2h_default_no_texi_acronym_like };
+$style_map_texi{'abbr'} = { 'args' => ['keep','keep'],
+ 'function' => \&t2h_default_no_texi_acronym_like };
+
+foreach my $special (keys(%special_style))
+{
+ $style_map{$special} = $special_style{$special}
+ unless (defined($style_map{$special}));
+ $style_map_pre{$special} = $special_style{$special}
+ unless (defined($style_map_pre{$special}));
+ $style_map_texi{$special} = { 'args' => ['keep'],
+ 'function' => \&t2h_remove_command }
+ unless (defined($style_map_texi{$special}));
+}
+####### end special styles.
+
+
+#foreach my $command (keys(%style_map))
+#{
+# print STDERR "STYLE_MAP_TEXI $command($style_map_texi{$command}) ";
+# print STDERR "ARGS $style_map_texi{$command}->{'args'} " if
(defined($style_map_texi{$command}->{'args'}));
+# print STDERR "FUN $style_map_texi{$command}->{'function'} " if
(defined($style_map_texi{$command}->{'function'}));
+# print STDERR "\n";
+#}
+
+# uncomment to use the old interface
+#%style_map = %old_style_map;
+#%style_map_pre = %old_style_map_pre;
+
+%simple_format_simple_map_texi = %simple_map_pre;
+%simple_format_texi_map = %pre_map;
+%simple_format_style_map_texi = ();
+
+t2h_default_copy_style_map(\%style_map_texi, \%simple_format_style_map_texi);
+
+foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
+{
+# $simple_format_style_map_texi{$accent_command}->{'args'} = ['normal'];
+ $simple_format_style_map_texi{$accent_command}->{'function'} =
\&t2h_default_accent;
+}
+
+foreach my $hash (\%style_map, \%style_map_pre, \%style_map_texi,
\%simple_format_style_map_texi)
+{
+ foreach my $style (keys(%{$hash}))
+ {
+ $hash->{$style}->{'args'} = ['normal'] if
(!exists($hash->{$style}->{'args'}));
+ }
+}
+
+%default_style_map = ();
+%default_style_map_pre = ();
+%default_style_map_texi = ();
+%default_simple_format_style_map_texi = ();
+
+t2h_default_copy_style_map(\%style_map, \%default_style_map);
+t2h_default_copy_style_map(\%style_map_pre, \%default_style_map_pre);
+t2h_default_copy_style_map(\%style_map_texi, \%default_style_map_texi);
+t2h_default_copy_style_map(\%simple_format_style_map_texi,
\%default_simple_format_style_map_texi);
+
+# called here because %default_style_map_texi is used.
+t2h_default_set_variables_default();
+
+#################################################################
+# TeX/LaTeX styles, that can be used in math
+
+my %default_style_tex_map;
+my %default_style_latex_map;
+
+t2h_default_copy_style_map(\%default_style_map, \%default_style_tex_map);
+t2h_default_copy_style_map(\%default_style_map, \%default_style_latex_map);
+
+# common in TeX and LaTeX and both for math and normal text
+
+$default_style_latex_map{'w'}->{'inline_begin'} = '\mbox{';
+$default_style_tex_map{'w'}->{'inline_begin'} = '\mbox{';
+$default_style_latex_map{'dmn'}->{'inline_begin'} = '{\thinspace ';
+$default_style_tex_map{'dmn'}->{'inline_begin'} = '{\thinspace ';
+
+my %default_style_latex_math_map;
+
+t2h_default_copy_style_map(\%default_style_latex_map,
\%default_style_latex_math_map);
+
+my %default_tex_latex_map = (
+ 'bf' => [ 'b', 'strong' ],
+ 'tt' => [ 'code', 'command', 'env', 'file', 'option', 'samp', 't' ],
+ 'it' => [ 'i', 'var', 'emph' ],
+ 'sf' => [ 'sanserif' ],
+ 'rm' => [ 'r' ],
+ 'sl' => [ 'dfn', 'slanted' ],
+);
+
+foreach my $style (keys (%default_tex_latex_map))
+{
+ foreach my $command (@{$default_tex_latex_map{$style}})
+ {
+ $default_style_tex_map{$command}->{'inline_begin'} = '{\\' . $style .' ';
+ $default_style_latex_map{$command}->{'inline_begin'} = '\text' . $style
.'{';
+ $style = 'normal' if ($style eq 'sl');
+ $default_style_latex_math_map{$command}->{'inline_begin'} = '\math' .
$style .'{';
+ }
+}
+
+# only in text
+
+$default_style_latex_map{'emph'}->{'inline_begin'} = '\emph{';
+$default_style_latex_map{'var'}->{'inline_begin'} = '\emph{';
+$default_style_latex_map{'sc'}->{'inline_begin'} = '\textsc{';
+
+foreach my $hash (\%default_style_tex_map, \%default_style_latex_map,
\%default_style_latex_math_map)
+{
+ foreach my $command (keys(%$hash))
+ {
+ $hash->{$command}->{'inline_end'} = '}' if
($hash->{$command}->{'inline_begin'});
+ }
+}
+
+# no kbd key sc in math
+# 'kbd' - ?
+# 'key' - ?
+
+my %default_style_tex_math_map;
+
+t2h_default_copy_style_map(\%default_style_tex_map,
\%default_style_tex_math_map);
+
+# We don't want to override special commands in math mode for now, as long
+# as they are not handled especially. Also we don't want to modify the math
+# function, it is called to close the @math command and we don't want
+# it to be the turned to the default one when calling
+# FIXME maybe it would be even better not to duplicate default styles in
+# math, like 'email', 'uref'....
+foreach my $command (keys(%special_style), 'math')
+{
+ delete $default_style_tex_math_map{$command};
+ delete $default_style_latex_math_map{$command};
+}
+
+foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
+{
+ $default_style_latex_map{$accent_command} = { 'function' =>
\&default_tex_accent };
+ $default_style_tex_map{$accent_command} = { 'function' =>
\&default_tex_accent };
+ $default_style_tex_math_map{$accent_command} = { 'function' =>
\&default_tex_math_accent };
+ $default_style_latex_math_map{$accent_command} = { 'function' =>
\&default_latex_math_accent };
+}
+
+my %tex_text_accent_map = (
+ ',' => 'c',
+ 'ringaccent' => 'r',
+ 'dotaccent' => '.',
+ 'ubaraccent' => 'b',
+ 'udotaccent' => 'd',
+ 'ogonek' => 'k',
+ 'tieaccent' => 'tie',
+);
+
+sub default_tex_accent($$)
+{
+ my $text = shift;
+ my $accent = shift;
+ return "\\$tex_text_accent_map{$accent}\{$text\}" if
($tex_text_accent_map{$accent});
+ if ($accent eq 'dotless')
+ {
+ return "\\$text" if ($text eq 'i' or $text eq 'j');
+ return $text;
+ }
+ return "\\$accent\{$text\}";
+}
+
+my %tex_math_accent_map = (
+ "'" => 'acute',
+ '^' => 'hat',
+ '`' => 'grave',
+ '~' => 'tilde',
+ '"' => 'ddot',
+ '=' => 'bar',
+ 'dotaccent' => 'dot',
+ 'u' => 'breve',
+ 'ubaraccent' => 'underline',
+);
+
+sub default_latex_math_accent($$)
+{
+ my $text = shift;
+ my $accent = shift;
+ return '\mathring{'.$text.'}' if ($accent eq 'ringaccent');
+ return default_tex_math_accent($text, $accent);
+}
+
+sub default_tex_math_accent($$)
+{
+ my $text = shift;
+ my $accent = shift;
+ return "\\$tex_text_accent_map{$accent}\{$text\}" if
($tex_text_accent_map{$accent});
+ if ($accent eq 'dotless')
+ {
+ return "\\${text}math" if ($text eq 'i' or $text eq 'j');
+ return $text;
+ }
+ return ascii_accent($text, $accent);
+}
+
+my $kept_normal_text;
+
+# We assume that in @math the TeX characters have already been
+# rightly protected and so don't protect once more.
+sub default_tex_normal_math_text($$$$$$$;$)
+{
+ my @initial_args = @_;
+ my $text = shift;
+ my $in_raw_text = shift; # remove_texi
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ # Don't protect text in math
+ if ($in_math)
+ {
+ $text = uc($text) if (in_cmd($style_stack, 'sc'));
+ return $text;
+ }
+ return &kept_normal_text(@initial_args);
+}
+
+# This is the entry point to be used by users.
+sub default_load_tex_math(;$)
+{
+ my $style = shift;
+ $style = 'latex' if (!defined($style));
+ %simple_map_math = %tex_default_simple_map_math;
+ if ($style eq 'tex')
+ {
+ %math_map = %tex_default_math_things_map;
+ t2h_default_copy_style_map(\%default_style_tex_math_map,
\%style_map_math);
+ }
+ else
+ {
+ %math_map = %latex_default_math_things_map;
+ t2h_default_copy_style_map(\%default_style_latex_math_map,
\%style_map_math);
+ }
+ $kept_normal_text = $normal_text;
+ $normal_text = \&default_tex_normal_math_text;
+}
+
+# End TeX/LaTeX styles
+#################################################################
+
+# regions expanded or not depending on the value of this hash.
+# @EXPAND sets entries in this hash, and you should better use
+# @EXPAND unless you know what you are doing.
+%texi_formats_map = (
+ 'iftex' => 0,
+ 'ignore' => 0,
+ 'menu' => 0,
+ 'ifplaintext' => 0,
+ 'ifinfo' => 0,
+ 'ifxml' => 0,
+ 'ifhtml' => 0,
+ 'ifdocbook' => 0,
+# 'html' => 0,
+# 'tex' => 0,
+# 'xml' => 0,
+# 'docbook' => 0,
+ 'titlepage' => 1,
+ 'documentdescription' => 1,
+ 'copying' => 1,
+ 'ifnothtml' => 1,
+ 'ifnottex' => 1,
+ 'ifnotplaintext' => 1,
+ 'ifnotinfo' => 1,
+ 'ifnotxml' => 1,
+ 'ifnotdocbook' => 1,
+ 'direntry' => 'normal',
+ 'verbatim' => 'raw',
+ 'macro' => 'raw',
+ 'ifclear' => 'value',
+ 'ifset' => 'value' ,
+ );
+
+%format_map = (
+# 'quotation' => 'blockquote',
+ # lists
+# 'itemize' => 'ul',
+ 'enumerate' => '',
+# 'multitable' => 'table',
+ 'table' => '',
+ 'vtable' => '',
+ 'ftable' => '',
+ 'group' => '',
+ 'raggedright' => '',
+# 'detailmenu' => '',
+ );
+
+%special_list_commands = (
+ 'table' => {},
+ 'vtable' => {},
+ 'ftable' => {},
+# 'itemize' => { 'bullet' => '' }
+ 'itemize' => {},
+ );
+
+%inter_item_commands = (
+ 'c' => 1,
+ 'comment' => 1,
+ 'cindex' => 1
+);
+#
+# texinfo format to align attribute of paragraphs
+#
+
+%paragraph_style = (
+ 'center' => 'center',
+ 'flushleft' => 'left',
+ 'flushright' => 'right',
+ );
+
+# complex formats (preformatted)
+%complex_format_map = ();
+foreach my $complex_format ('example', 'smallexample', 'display',
+ 'smalldisplay', 'lisp', 'smalllisp', 'format', 'smallformat',
+ 'menu', 'detailmenu', 'direntry', 'menu_comment')
+{
+ $complex_format_map{$complex_format} = { 'begin' => '', 'end' => '' };
+}
+foreach my $code_complex_format ('example', 'smallexample', 'lisp',
'smalllisp')
+{
+ $complex_format_map{$code_complex_format}->{'style'} = 'code';
+}
+
+# not in code_style, according to post on bug-texinfo
+foreach my $format ('menu', 'detailmenu', 'direntry')
+{
+ $complex_format_map{$format}->{'class'} = 'menu-preformatted';
+}
+
+# not in code_style, according to post on bug-texinfo
+$complex_format_map{'menu_comment'}->{'class'} = 'menu-comment';
+
+%def_map = (
+ # basic commands
+ 'deffn', [ 'f', 'category', 'name', 'arg' ],
+ 'defvr', [ 'v', 'category', 'name' ],
+ 'deftypefn', [ 'f', 'category', 'type', 'name', 'argtype' ],
+ 'deftypeop', [ 'f', 'category', 'class' , 'type', 'name', 'argtype' ],
+ 'deftypevr', [ 'v', 'category', 'type', 'name' ],
+ 'defcv', [ 'v', 'category', 'class' , 'name' ],
+ 'deftypecv', [ 'v', 'category', 'class' , 'type', 'name' ],
+ 'defop', [ 'f', 'category', 'class' , 'name', 'arg' ],
+ 'deftp', [ 't', 'category', 'name', 'argtype' ],
+ # shortcuts
+ # FIXME i18n
+ 'defun', 'deffn Function',
+ 'defmac', 'deffn Macro',
+ 'defspec', 'deffn {Special Form}',
+ 'defvar', 'defvr Variable',
+ 'defopt', 'defvr {User Option}',
+ 'deftypefun', 'deftypefn {Function}',
+ 'deftypevar', 'deftypevr Variable',
+ 'defivar', 'defcv {Instance Variable}',
+ 'deftypeivar', 'deftypecv {Instance Variable}',
+ 'defmethod', 'defop Method',
+ 'deftypemethod', 'deftypeop Method',
+ );
+
+$def_always_delimiters = "()[]";
+$def_in_type_delimiters = ",;";
+$def_argument_separator_delimiters = "()[],";
+
+$warn_var_character_quoted = quotemeta("()[],");
+
+# basic x commands
+foreach my $key (keys(%def_map))
+{
+ $def_map{$key . 'x'} = $def_map{$key};
+}
+
+#
+# miscalleneous commands
+#
+# Depending on the value, the command arg or spaces following the command
+# are handled differently:
+#
+# the value is a reference on a hash.
+# the hash keys are
+# 'arg' if the value is 'line' then the remaining of the line is the arg
+# if it is a number it is the number of args (separated by spaces)
+# 'skip' if the value is 'line' then the remaining of the line is skipped
+# if the value is 'space' space but no newline is skipped
+# if the value is 'whitespace' space is skipped
+# if the value is 'linewhitespace' space is skipped if there are
+# only spaces remaining on the line
+# if the value is 'linespace' space but no newline is skipped if
+# there are only spaces remaining on the line
+# 'keep' if true the args and the macro are kept, otherwise the macro
+# args and skipped stuffs are removed
+%misc_command = (
+ 'bye' => {'skip' => 'line'}, # no arg
+ # set, clear
+ #'set' => {'skip' => 'line'}, # special arg
+ 'set' => {'arg' => 'line'}, # special arg
+ #'clear' => {'skip' => 'line'}, # special arg
+ 'clear' => {'arg' => 1, 'skip' => 'line'}, # special arg
+ 'alias' => {'args' => 3, 'skip' => 'line'}, # special arg
+ # comments
+ 'comment' => {'arg' => 'line'},
+ 'c' => {'arg' => 'line'},
+
+ # not needed for formatting
+ 'raisesections' => {'skip' => 'line'}, # no arg
+ 'lowersections' => {'skip' => 'line'}, # no arg
+ 'contents' => {}, # no arg
+ 'shortcontents' => {}, # no arg
+ 'summarycontents'=> {}, # no arg
+ 'setcontentsaftertitlepage' => {}, # no arg
+ 'setshortcontentsaftertitlepage' => {}, # no arg
+ #'clickstyle' => {'skip' => 'line'}, # arg should be an @-command
+ 'clickstyle' => {'arg' => 'line'}, # arg should be an @-command
+ # in preamble
+ 'novalidate' => {}, # no arg
+ 'dircategory'=> {'arg' => 'line'}, # line. Position with regard
+ # with direntry is significant
+ 'pagesizes' => {'skip' => 'line', 'arg' => 'line'}, # can have 2 args
+ # or one? 200mm,150mm 11.5in
+ 'finalout' => {'skip' => 'line'}, # no arg
+ 'paragraphindent' => {'skip' => 'line', 'arg' => 1}, # arg none asis
+ # or a number and forbids anything else on the
line
+ 'firstparagraphindent' => {'skip' => 'line', 'arg' => 1}, # none insert
+ 'frenchspacing' => {'arg' => 1, 'skip' => 'line'}, # on off
+ # not so sure about 'skip' => 'line'
+ 'fonttextsize' => {'arg' => 1}, # 10 11
+ 'allowcodebreaks' => {'arg' => 1, 'skip' => 'line'}, # false or true
+ 'exampleindent' => {'skip' => 'line', 'arg' => 1}, # asis or a number
+ 'footnotestyle'=> {'skip' => 'line', 'arg' => 1}, # end and separate
+ # and nothing else on the line
+ 'afourpaper' => {'skip' => 'line'}, # no arg
+ 'afivepaper' => {'skip' => 'line'}, # no arg
+ 'afourlatex' => {'skip' => 'line'}, # no arg
+ 'afourwide' => {'skip' => 'line'}, # no arg
+ 'headings'=> {'skip' => 'line', 'arg' => 1},
+ #off on single double singleafter doubleafter
+ # interacts with setchapternewpage
+ 'setchapternewpage' => {'skip' => 'line', 'arg' => 1}, # off on odd
+ 'everyheading' => {'arg' => 'line'},
+ 'everyfooting' => {'arg' => 'line'},
+ 'evenheading' => {'arg' => 'line'},
+ 'evenfooting' => {'arg' => 'line'},
+ 'oddheading' => {'arg' => 'line'},
+ 'oddfooting' => {'arg' => 'line'},
+ 'smallbook' => {'skip' => 'line'}, # no arg
+ 'setfilename' => {'arg' => 'line'},
+ 'definfoenclose' => {'arg' => 'line'},
+ #'shorttitle' => {'arg' => 'line', 'texi' => 1},
+ #'shorttitlepage' => {'arg' => 'line', 'texi' => 1},
+ #'settitle' => {'arg' => 'line', 'texi' => 1},
+ #'author' => {'arg' => 'line', 'texi' => 1},
+ #'subtitle' => {'arg' => 'line', 'texi' => 1},
+ #'title' => {'arg' => 'line', 'texi' => 1},
+ 'shorttitle' => {'arg' => 'line'},
+ 'shorttitlepage' => {'arg' => 'line'},
+ 'settitle' => {'arg' => 'line'},
+ 'author' => {'arg' => 'line'},
+ 'subtitle' => {'arg' => 'line'},
+ 'title' => {'arg' => 'line'},
+ 'syncodeindex' => {'skip' => 'line', 'arg' => 2},
+ # args are index identifiers
+ 'synindex' => {'skip' => 'line', 'arg' => 2},
+ 'defindex' => {'skip' => 'line', 'arg' => 1}, # one identifier arg
+ 'defcodeindex' => {'skip' => 'line', 'arg' => 1}, # one identifier arg
+ #'documentlanguage' => {'skip' => 'whitespace', 'arg' => 1},
+ 'documentlanguage' => {'skip' => 'line', 'arg' => 1},
+ # language code arg
+ 'kbdinputstyle' => {'skip' => 'whitespace', 'arg' => 1}, # code
+ #example distinct
+ 'everyheadingmarks' => {'skip' => 'line', 'arg' => 1}, # top bottom
+ 'everyfootingmarks' => {'skip' => 'whitespace', 'arg' => 1},
+ 'evenheadingmarks' => {'skip' => 'whitespace', 'arg' => 1},
+ 'oddheadingmarks' => {'skip' => 'whitespace', 'arg' => 1},
+ 'evenfootingmarks' => {'skip' => 'whitespace', 'arg' => 1},
+ 'oddfootingmarks' => {'skip' => 'whitespace', 'arg' => 1},
+ 'sp' => {'skip' => 'line', 'arg' => 1}, # no arg
+ # at the end of line or a numerical arg
+ # formatting
+ 'page' => {}, # no arg (pagebreak)
+ 'refill' => {}, # no arg (obsolete, to be ignored)
+ 'noindent' => {'skip' => 'whitespace'}, # no arg
+ 'indent' => {'skip' => 'whitespace'},
+ 'need' => {'skip' => 'line', 'arg' => 1}, # one numerical/real arg
+ 'exdent' => {'skip' => 'space'},
+ # not valid for info (should be in @iftex)
+ 'vskip' => {'arg' => 'line'}, # arg line in TeX
+ 'cropmarks' => {}, # no arg
+ # miscalleneous
+ 'verbatiminclude'=> {'arg' => 'line'},
+ 'documentencoding' => {'arg' => 1, 'skip' => 'line'},
+ # obsolete @-commands. Remove spaces and end of lines after the
+ # commands? If no, they can lead to empty lines
+ 'quote-arg' => {'skip' => 'line'},
+ 'allow-recursion' => {'skip' => 'line'},
+ );
+
+my %misc_command_old = (
+ # not needed for formatting
+ 'raisesections', 'line', # no arg
+ 'lowersections', 'line', # no arg
+ 'contents', 1, # no arg
+ 'shortcontents', 1, # no arg
+ 'summarycontents', 1, # no arg
+ 'detailmenu', 'whitespace', # no arg
+ 'end detailmenu', 'whitespace', # no arg
+ #'end detailmenu', 1, # no arg
+ 'novalidate', 1, # no arg
+ 'bye', 'line', # no arg
+ # comments
+ 'comment', 'line',
+ 'c', 'line',
+ # in preamble
+ 'dircategory', 'line', # line. Position with regard with direntry is
+ # significant
+ 'pagesizes', 'line arg2', # can have 2 args
+ 'finalout', 1, # no arg
+ 'paragraphindent', 'line arg1', # in fact accepts only none asis
+ # or a number and forbids anything else on the
line
+ 'firstparagraphindent', 'line arg1', # in fact accepts only none insert
+ 'exampleindent', 'line arg1', # in fact accepts only asis or a number
+ 'footnotestyle', 'line arg1', # in fact accepts only end and separate
+ # and nothing else on the line
+ 'afourpaper', 'line', # no arg
+ 'afourlatex', 'line', # no arg
+ 'afourwide', 'line', # no arg
+ 'headings', 'line', # one arg, possibilities are
+ #off on single double singleafter doubleafter
+ # interacts with setchapternewpage
+ 'setchapternewpage', 'line', # no arg
+ 'everyheading', 'line',
+ 'everyfooting', 'line',
+ 'evenheading', 'line',
+ 'evenfooting', 'line',
+ 'oddheading', 'line',
+ 'oddfooting', 'line',
+ 'smallbook', 'line', # no arg
+ 'setfilename', 'line',
+ 'shorttitle', 'linetexi',
+ 'shorttitlepage', 'linetexi',
+ 'settitle', 'linetexi',
+ 'author', 'linetexi',
+ 'subtitle', 'linetexi',
+ 'title','linetexi',
+ 'syncodeindex','linespace arg2', # args are
+ 'synindex','linespace arg2',
+ 'defindex', 'line arg1', # one identifier arg
+ 'defcodeindex', 'line arg1', # one identifier arg
+ 'documentlanguage', 'whitespace arg1', # one language code arg
+ 'kbdinputstyle', 'whitespace arg1', # one arg within
+ #code example distnct
+ 'sp', 'whitespace arg1', # no arg at the en of line or a numerical arg
+ # formatting
+ 'page', 1, # no arg (pagebreak)
+ 'refill', 1, # no arg (obsolete, to be ignored))
+ 'noindent', 'space', # no arg
+ 'need', 'line arg1', # one numerical/real arg
+ 'exdent', 'space',
+ # not valid for info (should be in @iftex)
+ 'vskip', 'line', # arg line in TeX
+ 'cropmarks', 1, # no arg
+ # miscalleneous
+ 'verbatiminclude', 'line',
+ 'documentencoding', 'arg1',
+ );
+
+# The command_handler arrays are for commands formatted externally.
+# The function references in @command_handler_init are called
+# before the second pass, before the @-commands text collection.
+# Those in @command_handler_process are called between the second pass
+# and the third pass, after collection of @-commands text and before their
+# expansion.
+# Those in @command_handler_process are called after the third pass,
+# after the document generation.
address@hidden = ();
address@hidden = ();
address@hidden = ();
address@hidden = ();
address@hidden = ();
address@hidden = ();
+
+
+sub t2h_default_push_handler($$)
+{
+ my $function = shift;
+ my $handlers = shift;
+ push @$handlers, $function unless (grep {$_ eq $function} @$handlers);
+}
+
+# the keys of %command_handler are @-command names and the value
+# is a hash reference with the following keys:
+# 'init' function reference used to collect the @-command text
+# 'expand' function reference used when expanding the @-command text
+%command_handler = ();
+
+
+# formatting functions
+
+$anchor = \&t2h_default_anchor;
+$def_item = \&t2h_default_def_item;
+$def = \&t2h_default_def;
+$menu_command = \&t2h_default_menu_command;
+$menu_link = \&t2h_default_menu_link;
+#$menu_comment = \&t2h_default_menu_comment;
+$menu_description = \&t2h_default_menu_description;
+#$simple_menu_link = \&t2h_default_simple_menu_link;
+$table_item = \&t2h_default_table_item;
+$table_line = \&t2h_default_table_line;
+$table_list = \&t2h_default_table_list;
+$row = \&t2h_default_row;
+$cell = \&t2h_default_cell;
+$list_item = \&t2h_default_list_item;
+$comment = \&t2h_default_comment;
+$def_line = \&t2h_default_def_line;
+$def_line_no_texi = \&t2h_default_def_line_no_texi;
+$raw = \&t2h_default_raw;
+$raw_no_texi = \&t2h_default_raw_no_texi;
+$heading = \&t2h_default_heading;
+$heading_text = \&t2h_default_heading_text;
+$heading_text_preformatted = \&t2h_default_heading_text_preformatted;
+$element_heading = \&t2h_default_element_heading;
+$heading_no_texi = \&t2h_default_heading_no_texi;
+$external_href = \&t2h_default_external_href;
+$paragraph = \&t2h_default_paragraph;
+$preformatted = \&t2h_default_preformatted;
+$foot_line_and_ref = \&t2h_default_foot_line_and_ref;
+$foot_section = \&t2h_default_foot_section;
+$image_files = \&t2h_default_image_files;
+$image = \&t2h_default_image;
+$index_entry_label = \&t2h_default_index_entry_label;
+$index_summary = \&t2h_default_index_summary;
+$summary_letter = \&t2h_default_summary_letter;
+$index_entry = \&t2h_default_index_entry;
+$index_entry_command = \&t2h_default_index_entry_command;
+$index_letter = \&t2h_default_index_letter;
+#$printindex = \&t2h_default_printindex;
+$print_index = \&t2h_default_print_index;
+$protect_text = \&t2h_default_protect_text;
+$normal_text = \&t2h_default_normal_text;
+$cartouche = \&t2h_default_cartouche;
+$sp = \&t2h_default_sp;
+$definition_category = \&t2h_default_definition_category;
+$definition_index_entry = \&t2h_default_definition_index_entry;
+$copying_comment = \&t2h_default_copying_comment;
+$documentdescription = \&t2h_default_documentdescription;
+$index_summary_file_entry = \&t2h_default_index_summary_file_entry;
+$index_summary_file_end = \&t2h_default_index_summary_file_end;
+$index_summary_file_begin = \&t2h_default_index_summary_file_begin;
+$empty_line = \&t2h_default_empty_line;
+$float = \&t2h_default_float;
+$listoffloats = \&t2h_default_listoffloats;
+$listoffloats_entry = \&t2h_default_listoffloats_entry;
+$listoffloats_caption = \&t2h_default_listoffloats_caption;
+$listoffloats_float_style = \&t2h_default_listoffloats_float_style;
+$listoffloats_style = \&t2h_default_listoffloats_style;
+$acronym_like = \&t2h_default_acronym_like;
+$quotation = \&t2h_default_quotation;
+$paragraph_style_command = \&t2h_default_paragraph_style_command;
+$heading_texi = \&t2h_default_heading_texi;
+$index_element_heading_texi = \&t2h_default_index_element_heading_texi;
+$element_label = \&t2h_default_element_label;
+$anchor_label = \&t2h_default_anchor_label;
+$preserve_misc_command = \&t2h_default_preserve_misc_command;
+$format_list_item_texi = \&t2h_default_format_list_item_texi;
+$begin_format_texi = \&t2h_default_begin_format_texi;
+$insertcopying = \&t2h_default_insertcopying;
+$simple_command = \&t2h_default_simple_command;
+$thing_command = \&t2h_default_thing_command;
+$line_command = \&t2h_default_line_command;
+$internal_links = \&t2h_default_internal_links;
+
+# address is not used anymore
+$address = \&t2h_default_address;
+
+# return the line after preserving things according to misc_command map.
+# You should not change it. It is here, nevertheless, to be used
+# in other function references if needed.
+sub t2h_default_preserve_misc_command($$)
+{
+ my $line = shift;
+ my $macro = shift;
+ my $text = '';
+ my $args = [];
+ my $skip_spec = '';
+ my $arg_spec = '';
+
+#print STDERR "HHHHHHHHH $line $macro\n";
+ $skip_spec = $misc_command{$macro}->{'skip'}
+ if (defined($misc_command{$macro}->{'skip'}));
+ $arg_spec = $misc_command{$macro}->{'arg'}
+ if (defined($misc_command{$macro}->{'arg'}));
+
+ if ($arg_spec eq 'line')
+ {
+ $text .= $line;
+ $args = [ $line ];
+ $line = '';
+ }
+ elsif ($arg_spec)
+ {
+ my $arg_nr = $misc_command{$macro}->{'arg'};
+ while ($arg_nr)
+ {
+ if ($line =~ s/^(\s+)(\S*)//o)
+ {
+ $text .= $1.$2;
+ my $argument = $2;
+ push @$args, $argument if ($argument ne '');
+ }
+ else
+ {
+ last;
+ }
+ $arg_nr--;
+ }
+# while ($arg_nr)
+# {
+# $line =~ s/(\s+\S*)//o;
+# my $argument = $1;
+# if (defined($argument))
+# {
+# $text .= $argument;
+# push @$args, $argument;
+# }
+# $arg_nr--;
+# }
+ }
+
+ if ($macro eq 'bye')
+ {
+ $line = '';
+ $text = "\n";
+ }
+ elsif ($skip_spec eq 'linespace')
+ {
+ if ($line =~ /^\s*$/o)
+ {
+ $line =~ s/^([ \t]*)//o;
+ $text .= $1;
+ }
+ }
+ elsif ($skip_spec eq 'linewhitespace')
+ {
+ if ($line =~ /^\s*$/o)
+ {
+ $text .= $line;
+ $line = '';
+ }
+ }
+ elsif ($skip_spec eq 'line')
+ {
+ $text .= $line;
+ $line = '';
+ }
+ elsif ($skip_spec eq 'whitespace')
+ {
+ $line =~ s/^(\s*)//o;
+ $text .= $1;
+ }
+ elsif ($skip_spec eq 'space')
+ {
+ $line =~ s/^([ \t]*)//o;
+ $text .= $1;
+ }
+ $line = '' if (!defined($line));
+ return ($line, $text, $args);
+}
+
+sub t2h_default_simple_command($$$$$)
+{
+ my $command = shift;
+ my $in_preformatted = shift;
+ my $in_math = shift;
+ my $line_nr = shift;
+ my $state = shift;
+
+ if ($in_math)
+ {
+ my $result = $simple_map_pre{$command};
+ $result = $simple_map_math{$command} if
(defined($simple_map_math{$command}));
+ return $result;
+ }
+ elsif ($in_preformatted)
+ {
+ return $simple_map_pre{$command};
+ }
+ else
+ {
+ return $simple_map{$command};
+ }
+}
+
+sub t2h_default_thing_command($$$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $in_preformatted = shift;
+ my $in_math = shift;
+ my $line_nr = shift;
+ my $state = shift;
+
+ my $result;
+ if ($in_math)
+ {
+ $result = $pre_map{$command};
+ $result = $math_map{$command} if (defined($math_map{$command}));
+ }
+ elsif ($in_preformatted)
+ {
+ $result = $pre_map{$command};
+ }
+ else
+ {
+ $result = $things_map{$command};
+ }
+ return $result . $text;
+}
+
+# this is called each time a format begins. Here it is used to keep a
+# record of the multitables to have a faithful count of the cell nr.
+sub t2h_default_begin_format_texi($$$)
+{
+ my $command = shift;
+ my $line = shift;
+ my $state = shift;
+
+ # remove space in front of center, unless it removes the end of line!
+ $line =~ s/^\s*// if ($command eq 'center' and $line =~ /\S/);
+ return $line;
+}
+
+# This function is called whenever a complex format is processed
+#
+# arguments:
+# name of the format
+# text appearing inside the format
+#
+# an eval of $complex_format->{format name}->{'begin'} should lead to the
+# beginning of the complex format, an eval of
+# $complex_format->{format name}->{'end'} should lead to the end of the
+# complex format.
+sub t2h_default_complex_format($$)
+{
+ my $name = shift;
+ my $text = shift;
+ return '' if ($text eq '');
+ return '' if ($name eq 'direntry');
+ my $beginning;
+ my $end;
+ # FIXME obsoleted in nov 2009
+ if (exists($complex_format_map->{$name}))
+ {
+ $beginning = eval "$complex_format_map->{$name}->{'begin'}";
+ if ($@ ne '')
+ {
+ main::msg_debug("Evaluation of
$complex_format_map->{$name}->{'begin'}: $@");
+ $beginning = '';
+
+ }
+ $end = eval "$complex_format_map->{$name}->{'end'}";
+ if ($@ ne '')
+ {
+ main::msg_debug("Evaluation of
$complex_format_map->{$name}->{'end'}: $@");
+ $end = '';
+ }
+ }
+ else
+ {
+ $beginning = $complex_format_map{$name}->{'begin'};
+ $beginning = '' if (!defined($beginning));
+ $end = $complex_format_map{$name}->{'end'};
+ $end = '' if (!defined($end));
+ }
+ return $beginning . $text . $end;
+}
+
+sub t2h_default_empty_line($$)
+{
+ my $text = shift;
+ my $state = shift;
+ #ignore the line if it just follows a deff
+ return '' if ($state->{'deff_line'});
+ return $text;
+}
+
+sub t2h_default_unknown($$$$$)
+{
+ my $macro = shift;
+ my $line = shift;
+ my $pass = shift;
+ my $stack = shift;
+ my $state = shift;
+
+ my ($result_line, $result, $result_text, $message);
+ return ($line, 0, undef, undef);
+}
+
+sub t2h_default_unknown_style($$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $state = shift;
+ my $no_close = shift;
+ my $no_open = shift;
+
+ my ($result, $result_text, $message);
+ return (0, undef, undef);
+}
+
+sub t2h_default_caption_shortcaption($)
+{
+ my $float = shift;
+ my $caption_lines;
+ my $shortcaption_lines;
+ my $style = $float->{'style_texi'};
+ if (defined($float->{'nr'}))
+ {
+ my $nr = $float->{'nr'};
+ if ($style ne '')
+ {
+ $style = gdt('{style} {number}', { 'style' => $style, 'number' =>
$nr});
+ }
+ else
+ {
+ $style = $nr;
+ }
+ }
+ my $empty_caption = 1;
+ if (defined($float->{'caption_texi'}) and @{$float->{'caption_texi'}})
+ {
+ @$caption_lines = @{$float->{'caption_texi'}};
+ $caption_lines->[0] =~ s/^\s*//;
+ if ($caption_lines->[0] =~ /\S/ or @$caption_lines > 2)
+ {
+ $empty_caption = 0;
+ }
+ }
+
+ if (!$empty_caption)
+ {
+ if (defined($style))
+ {
+ $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' . gdt('{style}:
{caption_first_line}', { 'style' => $style, 'caption_first_line' =>
$caption_lines->[0] });
+ }
+ else
+ {
+ $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
$caption_lines->[0];
+ }
+ push @$caption_lines, "}\n";
+ }
+ elsif (defined($style))
+ {
+ $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' . $style . '}' . "\n";
+ }
+
+ my $empty_shortcaption = 1;
+ if (defined($float->{'shortcaption_texi'}) and
@{$float->{'shortcaption_texi'}})
+ {
+ @$shortcaption_lines = @{$float->{'shortcaption_texi'}};
+ $shortcaption_lines->[0] =~ s/^\s*//;
+ if ($shortcaption_lines->[0] =~ /\S/ or @$shortcaption_lines > 1)
+ {
+ $empty_shortcaption = 0;
+ }
+ }
+
+ if (!$empty_shortcaption)
+ {
+ if (defined($style))
+ {
+ $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
gdt('{style}: {shortcaption_first_line}', { 'style' => $style,
'shortcaption_first_line' => $shortcaption_lines->[0] });
+ }
+ else
+ {
+ $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
$shortcaption_lines->[0];
+ }
+ push @$shortcaption_lines, "}\n";
+ }
+ elsif (defined($style))
+ {
+ $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' . $style . '}' .
"\n";
+ }
+ return ($caption_lines, $shortcaption_lines);
+}
+
+# everything is done in &$float
+sub t2h_default_caption_shortcaption_command($$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $texi_lines = shift;
+ my $float_element = shift;
+ return '';
+}
+
+sub t2h_default_float($$$$$)
+{
+ my $text = shift;
+ my $float = shift;
+ my $caption = shift;
+ my $shortcaption = shift;
+
+ my $label = '';
+ if (exists($float->{'id'}))
+ {
+ $label = &$anchor($float->{'id'});
+ }
+ my $caption_text = '';
+
+ if (defined($float->{'caption_texi'}))
+ {
+ $caption_text = $caption;
+ }
+ elsif (defined($float->{'shortcaption_texi'}))
+ {
+ $caption_text = $shortcaption;
+ }
+ elsif (defined($caption))
+ {
+ $caption_text = $caption;
+ }
+
+ return $text . "\n" . $caption_text;
+}
+
+sub t2h_default_listoffloats_style($)
+{
+ my $style_texi = shift;
+ return ($style_texi);
+}
+
+sub t2h_default_listoffloats_float_style($$)
+{
+ my $style_texi = shift;
+ my $float = shift;
+
+ my $style = $float->{'style_texi'};
+ #print STDERR "listoffloat/float style mismatch $style_texi $style\n" if
($style_texi ne $style);
+ if (defined($float->{'nr'}))
+ {
+ my $nr = $float->{'nr'};
+ if ($style ne '')
+ {
+ $style = gdt('{style} {number}', { 'style' => $style, 'number'
=> $nr});
+ }
+ else
+ {
+ $style = $nr;
+ }
+ }
+ return $style;
+}
+
+sub t2h_default_listoffloats_caption($)
+{
+ my $float = shift;
+ if (defined($float->{'shortcaption_texi'}))
+ {
+ return ([ @{$float->{'shortcaption_texi'}} ], 'shortcaption');
+ }
+ elsif (defined($float->{'caption_texi'}))
+ {
+ return ([ @{$float->{'caption_texi'}} ], 'caption');
+ }
+ return ([ ], undef);
+}
+
+sub t2h_default_listoffloats_entry($$$$)
+{
+ my $style_texi = shift;
+ my $float = shift;
+ my $float_style = shift;
+ my $caption = shift;
+ my $href = shift;
+
+ my @lines = split /^/, $caption;
+ $caption = $lines[0];
+ $caption = '' if (!defined($caption));
+ chomp ($caption);
+
+ $caption = $float->{'text'} if ($caption eq '' and
defined($float->{'text'}) and $float->{'text'} =~ /\S/);
+
+ return "* $float_style: ${caption}\n";
+}
+
+sub t2h_default_listoffloats($$$)
+{
+ my $style_texi = shift;
+ my $style = shift;
+ my $float_entries = shift;
+
+ my $result = "* List of $style:\n";
+ foreach my $float_entry (@$float_entries)
+ {
+ $result .= $float_entry;
+ }
+ return $result . "\n";
+}
+
+sub t2h_default_insertcopying($$$)
+{
+ my $text = shift;
+ my $comment = shift;
+ my $simple_text = shift;
+ return $text;
+}
+
+sub t2h_default_protect_text($)
+{
+ my $text = shift;
+ return $text;
+}
+
+# This function is used to protect characters which are special in xml
+# in inline text: &, ", <, and >.
+#
+# argument:
+# text to be protected
+sub xml_default_protect_text($)
+{
+ my $text = shift;
+ $text =~ s/&/&/g;
+ $text =~ s/</</g;
+ $text =~ s/>/>/g;
+ $text =~ s/\"/"/g;
+ return $text;
+}
+
+sub in_cmd($$)
+{
+ my $style_stack = shift;
+ my $command = shift;
+ my $result = 0;
+ if ($style_stack and scalar(@{$style_stack}))
+ {
+ my $level = $#$style_stack;
+ #print STDERR ":::$level ::@{$style_stack}\n";
+ while ($level >= 0)
+ {
+ if ($style_stack->[$level] eq $command)
+ {
+ $result = 1;
+ last;
+ }
+ $level--;
+ }
+ }
+ return $result;
+}
+#
+#
+
+sub in_small_caps($)
+{
+ my $style_stack = shift;
+ my $in_sc = 0;
+ if ($style_stack and scalar(@{$style_stack}))
+ {
+ my $level = $#$style_stack;
+ #print STDERR ":::$level ::@{$style_stack}\n";
+ while ($level >= 0)
+ {
+ if ($style_stack->[$level] eq 'sc')
+ {
+ $in_sc = 1;
+ last;
+ }
+ $level--;
+ }
+ }
+ return $in_sc;
+}
+#
+#
+sub t2h_default_normal_text($$$$$$$;$)
+{
+ my @initial_args = @_;
+ my $text = shift;
+ my $in_raw_text = shift; # remove_texi
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ # like utf8.pm
+ if (get_conf('ENABLE_ENCODING') and !get_conf('ENABLE_ENCODING_USE_ENTITY')
and defined(get_conf('ENCODING_NAME')) and get_conf('ENCODING_NAME') eq 'utf-8'
and get_conf('USE_UNICODE'))
+ {
+ return &t2h_utf8_normal_text(@initial_args);
+ }
+
+ $text = uc($text) if (in_cmd($style_stack, 'sc'));
+ if (! $in_code and !$in_preformatted)
+ {
+ $text =~ s/---/\x{1F}/g;
+ $text =~ s/--/-/g;
+ $text =~ s/\x{1F}/--/g;
+ $text =~ s/``/"/g;
+ $text =~ s/\'\'/"/g;
+ }
+ else
+ {
+ # to be like tex. This would be wrong, however.
+# my $special_code = 0;
+# $special_code = 1 if (in_cmd($style_stack, 'code') or
+# in_cmd($style_stack, 'example') or in_cmd($style_stack,
'verbatim'));
+# $text =~ s/'/\&rsquo\;/g unless ($special_code and
exists($main::value{'txicodequoteundirected'}));
+# $text =~ s/`/\&lsquo\;/g unless ($special_code and
exists($main::value{'txicodequotebacktick'}));
+ }
+ $text = t2h_text_substitutions($text, $in_raw_text, ($in_preformatted or
$in_code), $in_simple);
+ return $text;
+}
+
+sub t2h_default_url_and_text($;$)
+{
+ my $url = shift;
+ my $text = shift;
+ if (!defined($text) or $text eq '')
+ {
+ return "<$url>" if (defined($url) and $url ne '');
+ return '';
+ }
+ else
+ {
+ return $text if (!defined($url) or $url eq '');
+ return "$text <$url>";
+ }
+}
+
+# This function produces an anchor. This need is quite html specific.
+#
+# arguments:
+# $name : anchor name
+# $href : anchor href
+# text : text displayed
+# extra_attribs : added to anchor attributes list
+sub t2h_default_anchor($;$$$)
+{
+ my $name = shift;
+ my $href = shift;
+ my $text = shift;
+ my $attributes = shift;
+ return $text if (defined($text));
+ return '';
+}
+
+# This function is used to format the text associated with a @deff/@end deff
+#
+# argument:
+# text
+#
+# DEF_TABLE should be used to distinguish between @def formatted as table
+# and as definition lists.
+sub t2h_default_def_item($$$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $command = shift;
+ if ($text =~ /\S/)
+ {
+ return $text;
+ }
+ return '';
+}
+
+sub t2h_default_definition_category($$$$)
+{
+ my $name = shift;
+ my $class = shift;
+ my $style = shift;
+ my $command = shift;
+ return ($name) if (!defined($class) or $class =~ /^\s*$/);
+ if ($style eq 'f')
+ {
+ return gdt('{name} on {class}', { 'name' => $name, 'class' => $class
});
+ }
+ elsif ($style eq 'v')
+ {
+ return gdt('{name} of {class}', { 'name' => $name, 'class' => $class
});
+ }
+ else
+ {
+ return $name;
+ }
+}
+
+sub t2h_default_definition_index_entry($$$$)
+{
+ my $name = shift;
+ my $class = shift;
+ my $style = shift;
+ my $command = shift;
+ return ($name) if (!defined($class) or $class =~ /^\s*$/);
+ if ($style eq 'f')
+ {
+ return gdt('{name} on {class}', { 'name' => $name, 'class' => $class
});
+ }
+ elsif ($style eq 'v' and $command ne 'defcv')
+ {
+ return gdt('{name} of {class}', { 'name' => $name, 'class' => $class
});
+ }
+ else
+ {
+ return $name;
+ }
+}
+
+sub t2h_default_summary_letter($$$$$$$)
+{
+ my $letter = shift;
+ my $file = shift;
+ my $default_identifier = shift;
+ my $index_element_id = shift;
+ my $number = shift;
+ my $index_element = shift;
+ my $index_name = shift;
+
+ return '';
+}
+
+
+# format the container for the @deffn line and text
+#
+# argument
+# text of the whole @def, line and associated text.
+#
+# DEF_TABLE should be used.
+sub t2h_default_def($$)
+{
+ my $text = shift;
+ my $command = shift;
+ if ($text =~ /\S/)
+ {
+ return $text;
+ }
+ return '';
+
+}
+
+# a whole menu
+#
+# argument:
+# the whole menu text (entries and menu comments)
+#
+# argument:
+# whole menu text.
+# not used since menu is a normal preformatted command with SIMPLE_MENU
+sub t2h_default_menu_command($$$)
+{
+ my $format = shift;
+ my $text = shift;
+ my $in_preformatted = shift;
+ return "* Menu:\n".$text."\n";
+
+}
+
+# formats a menu entry link pointing to a node or section
+#
+# arguments:
+# the entry text
+# the state, a hash reference holding informations about the context, with a
+# usefull entry, 'preformatted', true if we are in a preformatted format
+# (a format keeping space between words). In that case a function
+# of the main program, main::do_preformatted($text, $state) might
+# be used to format the text with the current format style.
+# href is optionnal. It is the reference to the section or the node anchor
+# which should be used to make the link (typically it is the argument
+# of a href= attribute in a <a> element).
+sub t2h_default_menu_link($$$$$$$$)
+{
+ my $entry = shift;
+ my $state = shift;
+ my $href = shift;
+ my $node = shift;
+ my $title = shift;
+ my $ending = shift;
+ my $has_title = shift;
+ my $command_stack = shift;
+ my $preformatted = shift;
+
+ $title = '' unless ($has_title);
+ $title .= ':' if ($title ne '');
+ return "$MENU_SYMBOL$title$node$ending" if (get_conf('NODE_NAME_IN_MENU'));
+ return "$MENU_SYMBOL$title$entry$ending";
+}
+
+# formats a menu entry description, ie the text appearing after the node
+# specification in a menu entry an spanning until there is another
+# menu entry, an empty line or some text at the very beginning of the line
+# (we consider that text at the beginning of the line begins a menu comment)
+#
+# arguments:
+# the description text
+# the state. See menu_entry.
+# the heading of the element associated with the node.
+# not usd since in SIMPLE_MENU
+sub t2h_default_menu_description($$$$)
+{
+ my $text = shift;
+ my $state = shift;
+ my $element_text = shift;
+ my $command_stack = shift;
+ my $preformatted = shift;
+
+ return $text;
+}
+
+%htmlxref_entries = (
+ 'node' => [ 'node', 'section', 'chapter', 'mono' ],
+ 'section' => [ 'section', 'chapter','node', 'mono' ],
+ 'chapter' => [ 'chapter', 'section', 'node', 'mono' ],
+ 'mono' => [ 'mono', 'chapter', 'section', 'node' ],
+);
+
+
+# Construct a href to an external source of information.
+# node is the node with texinfo @-commands
+# node_id is the node transliterated and transformed as explained in the
+# texinfo manual
+# node_xhtml_id is the node transformed such that it is unique and can
+# be used to make an html cross ref as explained in the texinfo manual
+# file is the file in '(file)node'
+# This is used to construct href, so is likely to be ignored oustside of
+# html.
+sub t2h_default_external_href($$$)
+{
+ my $node = shift;
+ my $node_id = shift;
+ my $node_xhtml_id = shift;
+ my $file = shift;
+ $file = '' if (!defined($file));
+ my $default_target_split = get_conf('EXTERNAL_CROSSREF_SPLIT');
+ my $target_split;
+ #my $target_mono;
+ #my $href_split;
+ #my $href_mono;
+ if ($file ne '')
+ {
+ if (get_conf('NEW_CROSSREF_STYLE'))
+ {
+ $file =~ s/\.[^\.]*$//;
+ $file =~ s/^.*\///;
+ my $href;
+ my $document_split = get_conf('SPLIT');
+ $document_split = 'mono' if (!$document_split);
+ my $split_found;
+ if (exists($Texi2HTML::THISDOC{'htmlxref'}->{$file}))
+ {
+ foreach my $split_ordered
(@{$htmlxref_entries{$document_split}})
+ {
+ if
(defined($Texi2HTML::THISDOC{'htmlxref'}->{$file}->{$split_ordered}))
+ {
+ $split_found = $split_ordered;
+ $href =
$Texi2HTML::THISDOC{'htmlxref'}->{$file}->{$split_ordered};
+ last;
+ }
+ }
+ }
+ if (defined($split_found))
+ {
+ $target_split = 1 unless ($split_found eq 'mono');
+ }
+ else
+ { # nothing specified for that manual, use default
+ $target_split = $default_target_split;
+ }
+
+ if ($target_split)
+ {
+ if (defined($href))
+ {
+ $file = $href;
+ }
+ elsif (defined(get_conf('EXTERNAL_DIR')))
+ {
+ $file = get_conf('EXTERNAL_DIR')."/$file";
+ }
+ elsif (get_conf('SPLIT'))
+ {
+ $file = "../$file";
+ }
+ $file .= "/";
+ }
+ else
+ {# target not split
+ if (defined($href))
+ {
+ $file = $href;
+ }
+ else
+ {
+ if (defined(get_conf('EXTERNAL_DIR')))
+ {
+ $file = get_conf('EXTERNAL_DIR')."/$file";
+ }
+ elsif (get_conf('SPLIT'))
+ {
+ $file = "../$file";
+ }
+ $file .= "." . get_conf('NODE_FILE_EXTENSION');
+ }
+ }
+ }
+ else
+ {
+ $file .= "/";
+ if (defined(get_conf('EXTERNAL_DIR')))
+ {
+ $file = get_conf('EXTERNAL_DIR') . $file;
+ }
+ else
+ {
+ $file = '../' . $file;
+ }
+ }
+ }
+ else
+ {
+ $target_split = $default_target_split;
+ }
+ if ($node eq '')
+ {
+ if (get_conf('NEW_CROSSREF_STYLE'))
+ {
+ if ($target_split)
+ {
+ if (defined(get_conf('TOP_NODE_FILE_TARGET')))
+ {
+ return $file . get_conf('TOP_NODE_FILE_TARGET') . '.' .
get_conf('NODE_FILE_EXTENSION') . '#Top';
+ }
+ else
+ {
+ return $file . '#Top';
+ }
+ }
+ else
+ {
+ return $file . '#Top';
+ }
+ }
+ else
+ {
+ return $file;
+ }
+ }
+ my $target;
+ if (get_conf('NEW_CROSSREF_STYLE'))
+ {
+ $node = $node_id;
+ $target = $node_xhtml_id;
+ }
+ else
+ {
+ $node = main::remove_texi($node);
+ $node =~ s/[^\w\.\-]/-/g;
+ }
+ my $file_basename = $node;
+ $file_basename = get_conf('TOP_NODE_FILE_TARGET') if ($node =~ /^top$/i
and defined(get_conf('TOP_NODE_FILE_TARGET')));
+ if (get_conf('NEW_CROSSREF_STYLE'))
+ {
+ if ($target_split)
+ {
+ return $file . $file_basename .
'.'.get_conf('NODE_FILE_EXTENSION') . '#' . $target;
+ }
+ else
+ {
+ return $file . '#' . $target;
+ }
+ }
+ else
+ {
+ return $file . $file_basename . '.'.get_conf('NODE_FILE_EXTENSION');
+ }
+}
+
+# format a reference external to the generated manual. This produces a full
+# reference with introductive words and the reference itself.
+#
+# arguments:
+# type of the reference: xref (reference at the beginning of a sentence),
+# pxref (reference in a parenthesis),
+# section in the book. This might be undef.
+# book name.
+# manual file name
+# href linking to the html page containing the referenced node. A typical
+# use for this href is a href attribute in an <a> element
+# cross reference name
+# array of texi arguments of the reference
+# array of the formatted arguments of the reference
+# node name
+sub t2h_default_external_ref($$$$$$$$$)
+{
+ my $type = shift;
+ my $section = shift;
+ my $book = shift;
+ my $file = shift;
+ #my $file_node = shift;
+ my $href = shift;
+ my $cross_ref = shift;
+ my $args_texi = shift;
+ my $formatted_args = shift;
+ my $node = shift;
+
+ my $name = $section;
+ $name = $cross_ref if ($name eq '');
+ $name = $node if ($name eq '');
+
+ my $reference = $name;
+
+ if ($book eq '' and $file ne '')
+ {
+ $name = "($file)$name";
+ }
+ $reference = &$anchor('', $href, $name) if ($href ne '');
+
+ # Yes, this is ugly, yet this helps internationalization
+ if ($type eq 'pxref')
+ {
+ if (($book ne '') and ($href ne ''))
+ {
+ return gdt('see {reference} in @cite{{book}}', { 'reference' =>
$reference, 'book' => $book },{'duplicate'=>1});
+ }
+ elsif (($book ne '') and ($reference ne ''))
+ {
+ return gdt('see `{section}\' in @cite{{book}}', { 'section' =>
$reference, 'book' => $book },{'duplicate'=>1});
+ }
+ elsif ($book ne '')
+ { # should seldom or even never happen
+ return gdt('see @cite{{book}}', { 'book' => $book
},{'duplicate'=>1});
+ }
+ elsif ($href ne '')
+ {
+ return gdt('see {reference}', { 'reference' => $reference
},{'duplicate'=>1});
+ }
+ elsif ($reference ne '')
+ {
+ return gdt('see `{section}\'', { 'section' => $reference
},{'duplicate'=>1});
+ }
+ }
+ if ($type eq 'xref' or $type eq 'inforef')
+ {
+ if (($book ne '') and ($href ne ''))
+ {
+ return gdt('See {reference} in @cite{{book}}', { 'reference' =>
$reference, 'book' => $book },{'duplicate'=>1});
+ }
+ elsif (($book ne '') and ($reference ne ''))
+ {
+ return gdt('See `{section}\' in @cite{{book}}', { 'section' =>
$reference, 'book' => $book },{'duplicate'=>1});
+ }
+ elsif ($book ne '')
+ { # should seldom or even never happen
+ return gdt('See @cite{{book}}', { 'book' => $book
},{'duplicate'=>1});
+ }
+ elsif ($href ne '')
+ {
+ return gdt('See {reference}', { 'reference' => $reference
},{'duplicate'=>1});
+ }
+ elsif ($reference ne '')
+ {
+ return gdt('See `{section}\'', { 'section' => $reference
},{'duplicate'=>1});
+ }
+ }
+ if ($type eq 'ref')
+ {
+ if (($book ne '') and ($href ne ''))
+ {
+ return gdt('{reference} in @cite{{book}}', { 'reference' =>
$reference, 'book' => $book },{'duplicate'=>1});
+ }
+ elsif (($book ne '') and ($reference ne ''))
+ {
+ return gdt('`{section}\' in @cite{{book}}', { 'section' =>
$reference, 'book' => $book },{'duplicate'=>1});
+ }
+ elsif ($book ne '')
+ { # should seldom or even never happen
+ return gdt('@cite{{book}}', { 'book' => $book
},{'duplicate'=>1});
+ }
+ elsif ($href ne '')
+ {
+ return gdt('{reference}', { 'reference' => $reference
},{'duplicate'=>1});
+ }
+ elsif ($reference ne '')
+ {
+ return gdt('`{section}\'', { 'section' => $reference
},{'duplicate'=>1});
+ }
+ }
+ return '';
+}
+
+# format a reference to a node or a section in the generated manual. This
+# produces a full reference with introductive words and the reference itself.
+#
+# arguments:
+# type of the reference: xref (reference at the beginning of a sentence),
+# pxref (reference in a parenthesis),
+# href linking to the html page containing the node or the section. A typical
+# use for this href is a href attribute in an <a> element
+# short name for this reference
+# name for this reference
+# boolean true if the reference is a reference to a section
+#
+# SHORT_REF should be used.
+sub t2h_default_internal_ref($$$$$$$$)
+{
+ my $type = shift;
+ my $href = shift;
+ my $short_name = shift;
+ my $name = shift;
+ my $is_section = shift;
+ my $args_texi = shift;
+ my $formatted_args = shift;
+ my $element = shift;
+
+ if (! get_conf('SHORT_REF'))
+ {
+ $name = &$anchor('', $href, $name);
+ if ($type eq 'pxref')
+ {
+ return gdt('see section {reference_name}', { 'reference_name' =>
$name },{'duplicate'=>1}) if ($is_section);
+ return gdt('see {reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
+ }
+ elsif ($type eq 'xref' or $type eq 'inforef')
+ {
+ return gdt('See section {reference_name}', { 'reference_name' =>
$name },{'duplicate'=>1}) if ($is_section);
+ return gdt('See {reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
+ }
+ elsif ($type eq 'ref')
+ {
+ return gdt('{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
+ }
+ }
+ else
+ {
+ $name = &$anchor('', $href, $short_name);
+ if ($type eq 'pxref')
+ {
+ return gdt('see {reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
+ }
+ elsif ($type eq 'xref' or $type eq 'inforef')
+ {
+ return gdt('See {reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
+ }
+ elsif ($type eq 'ref')
+ {
+ return gdt('{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
+ }
+ }
+ return '';
+}
+
+# text after @item in table, vtable and ftable
+sub t2h_default_table_item($$$$$$$)
+{
+ my $text = shift;
+ my $index_label = shift;
+ my $format = shift;
+ my $command = shift;
+ my $style_stack = shift;
+ my $item_cmd = shift;
+ my $formatted_index_entry = shift;
+
+ return $text . "\n";
+}
+
+# format text on the line following the @item line (in table, vtable and
ftable)
+sub t2h_default_table_line($$$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ if ($text =~ /\S/)
+ {
+ return $text;
+ }
+ return '';
+}
+
+#my $cell_nr = -1;
+
+# row in multitable
+sub t2h_default_row($$$$$$$$)
+{
+ my $text = shift;
+ my $macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ if ($text =~ /\S/)
+ {
+ return $text ."\n";
+ }
+ return '';
+}
+
+# cell in multitable
+sub t2h_default_cell($$$$$$$$)
+{
+ my $text = shift;
+ my $row_macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ $text =~ s/^\s*//;
+ $text =~ s/\s*$//;
+
+ return " $text";
+}
+
+# format an itemize, enumerate or @*table @item line, returning
+# a texinfo line.
+sub t2h_default_format_list_item_texi($$$$$)
+{
+ my $format = shift;
+ my $line = shift;
+ my $prepended = shift;
+ my $command = shift;
+ my $number = shift;
+
+ my $result_line;
+ my $open_command = 0;
+
+ $command = 'bullet' if ((!defined($command) or $command eq '') and
(!defined($prepended) or $prepended eq '') and $format eq 'itemize');
+ $prepended = "address@hidden" if (defined($command) and $command ne '');
+ $prepended = "$number." if (defined($number) and $number ne '');
+
+ if (defined($command) and $command ne '' and $format ne 'itemize')
+ {
+ address@hidden
+ $open_command = 1;
+ $line =~ s/^\s*//;
+ $line =~ s/\s*$//;
+ if (exists ($style_map{$command}))
+ {
+ $result_line = "address@hidden";
+ }
+ elsif (exists ($things_map{$command}))
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ else
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ }
+ elsif (defined($prepended) and $prepended ne '')
+ {
+ $prepended =~ s/^\s*//;
+ $prepended =~ s/\s*$//;
+ $line =~ s/^\s*//;
+ $result_line = $prepended . ' ' . $line;
+ }
+ return ($result_line, $open_command);
+}
+
+
+# format an item in a list
+#
+# argument:
+# text of the item
+# format of the list (itemize or enumerate)
+# command passed as argument to the format
+# formatted_command leading command formatted, if it is a thing command
+sub t2h_default_list_item($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $format = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+ my $item_command = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ if ($text =~ /\S/)
+ {
+ return $text;
+ }
+ return '';
+}
+
+sub t2h_default_table_list($$$$$$$$$)
+{
+ my $format_command = shift;
+ my $text = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+# enumerate
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+# itemize
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+# multitable
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+# my $number = shift;
+ return $text;
+}
+
+# an comment
+sub t2h_default_comment($)
+{
+ my $text = shift;
+ return '';
+}
+
+# an xml comment
+sub xml_default_comment($)
+{
+ my $text = shift;
+ $text =~ s/--+/-/go;
+ return '<!-- ' . $text . ' -->' . "\n";
+}
+
+sub t2h_collect_styles($)
+{
+ my $cmd_stack = shift;
+ my @result = ();
+ foreach my $style (reverse(@$cmd_stack))
+ {
+# last unless (defined($command_type{$style}) and $command_type{$style}
eq 'style');
+ push @result, $style if (defined($command_type{$style}) and
$command_type{$style} eq 'style');
+ }
+ return @result;
+}
+
+sub html_default_parse_attribute($)
+{
+ my $element = shift;
+ return ('', '', '') if (!defined($element));
+ my ($class, $attributes) = ('', '');
+ if ($element =~ /^(\w+)(\s+.*)/)
+ {
+ $element = $1;
+ $attributes = $2;
+ if ($attributes =~ s/^\s+class=\"([^\"]+)\"//)
+ {
+ $class = $1;
+ }
+ }
+ return ($element, $class, $attributes);
+}
+
+sub t2h_get_attribute($;$)
+{
+ my $command = shift;
+ my $map_ref = shift;
+ $map_ref = \%style_map if (!defined($map_ref));
+ return unless (defined($map_ref->{$command}));
+ my ($element, $class, $attributes) = ('', '', '');
+ if (defined($map_ref->{$command}))
+ {
+ if (ref($map_ref->{$command}) eq 'HASH')
+ {
+ ($element, $class, $attributes) = t2h_html_parse_attribute
($map_ref->{$command}->{'attribute'});
+ }
+ elsif ($map_ref->{$command} !~ /^&/)
+ {
+ $element = $map_ref->{$command};
+ $element =~ s/^\"//;
+ }
+ }
+ return ($element, $class, $attributes);
+}
+
+# a paragraph
+# arguments:
+# $text of the paragraph
+# $align for the alignement
+# $indent for the indent style (indent or noindent)
+# The following is usefull if the paragraph is in an itemize.
+# $paragraph_command is the leading formatting command (like @minus)
+# $paragraph_command_formatted is the leading formatting command formatted
+# $paragraph_number is a reference on the number of paragraphs appearing
+# in the format. The value should be increased if a paragraph is done
+# $format is the format name (@itemize)
+sub t2h_default_paragraph($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $align = shift;
+ my $indent = shift;
+ my $paragraph_command = shift;
+ my $paragraph_command_formatted = shift;
+ my $paragraph_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+#print STDERR "format: $format\n" if (defined($format));
+#print STDERR "paragraph @$command_stack_at_end; @$command_stack_at_begin\n";
+# $paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
+# exists($special_list_commands{$format}->{$paragraph_command}));
+ return '' if ($text =~ /^\s*$/);
+
+ return $text;
+}
+
+# a preformatted region
+# arguments:
+# $text of the preformatted region
+# $pre_style css style
+# $class identifier for the preformatted region (example, menu-comment)
+# The following is usefull if the preformatted is in an itemize.
+# $leading_command is the leading formatting command (like @minus)
+# $leading_command_formatted is the leading formatting command formatted
+# $preformatted_number is a reference on the number of preformatteds appearing
+# in the format. The value should be increased if a preformatted is done
+sub t2h_default_preformatted($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $pre_style = shift;
+ my $class = shift;
+ my $leading_command = shift;
+ my $leading_command_formatted = shift;
+ my $preformatted_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+#print STDERR "preformatted @$command_stack_at_end;
@$command_stack_at_begin\n";
+ return '' if ($text eq '');
+
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+ if ($top_stack eq 'multitable')
+ {
+ $text =~ s/^\s*//;
+ $text =~ s/\s*$//;
+ }
+
+ # add a new line at the end in case there is none
+ chomp($text);
+ return $text . "\n";
+}
+
+# $new_element is set if the element is associated with a different
+# reference element than the preceding element. This is where we
+# do the navigation. For example it could be a @node before a @section.
+#
+# The heading function is always called, though -- in the default case
+# nodes don't lead to an outputted title.
+sub t2h_default_element_heading($$$$$$$$$$$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+ my $one_section = shift;
+ my $element_heading = shift;
+ my $first_in_page = shift;
+ my $is_top = shift;
+ my $previous_is_top = shift;
+ my $command_line = shift;
+ my $element_id = shift;
+ my $new_element = shift;
+#print STDERR ":::::::: $element $command i_p $in_preformatted o_s
$one_section e_h $element_heading f_p $first_in_page i_t $is_top p_i_t
$previous_is_top id $element_id new $new_element\n";
+
+# my $result = '';
+ my $result = &$element_label($element_id, $element, $command,
$command_line);
+
+ # in default case, print_head_navigation and print_navigation are no-ops.
+ # and $print_element_header is undef, so the following nothing.
+ if ($new_element and !$one_section)
+ {
+ main::msg_debug ("For $element->{'texi'}, element_ref not defined",
$element->{'line_nr'}) if (!defined($element->{'element_ref'}));
+ if (!defined($element->{'element_ref'}->{'top'}))
+ {
+ if (defined($print_element_header))
+ { # FIXME backward compatibility, print_element_header is obsoleted
in nov 2009
+ $result .= &$print_element_header($first_in_page,
$previous_is_top);
+ }
+ else
+ {
+ if (($first_in_page or $previous_is_top) and
get_conf('HEADERS'))
+ {
+ $result .= &$print_head_navigation(undef, address@hidden,
$first_in_page, $previous_is_top, $element);
+ }
+ else
+ { # got to do this here, as it isn't done otherwise sinc
+ # print_head_navigation is not called
+ $result .= &$print_navigation(address@hidden) if
(get_conf('HEADERS') or get_conf('SPLIT') eq 'node');
+ }
+ }
+ }
+ else
+ { # this is here because we want to always print the head navigation
for top
+ # and use TOP_BUTTONS
+ $result .= &$print_head_navigation(undef, address@hidden,
$first_in_page, $previous_is_top, $element)
+ if (get_conf('SPLIT') or get_conf('HEADERS'));
+ }
+ }
+ return $result. &$heading($element, $command, $texi_line, $line,
$in_preformatted, $one_section, $element_heading);
+}
+
+# This function formats a heading for an element
+#
+# argument:
+# an element. It is a hash reference for a node or a sectioning command.
+# it may be the wrong one in case of headings.
+# The interesting keys are:
+# 'text': the heading text
+# 'text_nonumber': the heading text without section number
+# 'node': true if it is a node
+# 'level': level of the element. 0 for @top, 1 for chapter, heading,
+# appendix..., 2 for section and so on...
+# 'tag_level': the sectioning element name, raisesections and lowersections
+# taken into account
+sub t2h_default_heading($$$$$;$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+ my $one_section = shift;
+ my $element_heading = shift;
+
+ my $level = $element->{'level'};
+ if ($element->{'node'})
+ {
+ if ($element->{'text'} =~ /^top$/i)
+ {
+ $level = 0;
+ }
+ else
+ {
+ $level = 3;
+ }
+ return '' if (!$element->{'this'} or $element->{'with_section'})
+ }
+ else
+ {
+ $command = $element->{'tag_level'};
+ }
+ my $text = $element->{'text'};
+
+ if (get_conf('TOC_LINKS') and $command !~ /heading/ and
defined($element->{'tocid'}))
+ {
+ $text = &$anchor ('',
"$Texi2HTML::THISDOC{'toc_file'}#$element->{'tocid'}", $text);
+ }
+
+ my $result;
+ if ($in_preformatted)
+ {
+ $result = &$heading_text_preformatted("address@hidden", $text, $level);
+ }
+ else
+ {
+ $result = &$heading_text("address@hidden", $text, $level);
+ }
+ #$result .= "\n";
+ return $result;
+}
+
+sub t2h_default_heading_no_texi($$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $line = shift;
+ return main::remove_texi($line) . "\n";
+}
+
+# formatting of raw regions
+# if L2H is true another mechanism is used for tex
+sub t2h_default_raw($$;$)
+{
+ my $style = shift;
+ my $text = shift;
+ my $line_nr = shift;
+ my $expanded = 1 if (grep {$style eq $_} @EXPAND);
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($style eq
'tex' and $expanded))
+ {
+ return $text;
+ }
+ elsif ($expanded)
+ {
+ main::line_warn (sprintf(__("Raw format %s is not converted"),
$style), $line_nr);
+ return $text;
+ }
+ else
+ {
+ return '';
+ }
+}
+
+# raw environment when removing texi (in comments)
+sub t2h_default_raw_no_texi($$)
+{
+ my $style = shift;
+ my $text = shift;
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or grep {$style eq
$_} @EXPAND)
+ {
+ return $text;
+ }
+ return '';
+}
+
+# This function formats a footnote reference and the footnote text associated
+# with a given footnote.
+# The footnote reference is the text appearing in the main document pointing
+# to the footnote text.
+#
+# arguments:
+# absolute number of the footnote (in the document)
+# relative number of the footnote (in the page)
+# identifier for the footnote
+# identifier for the footnote reference in the main document
+# main document file
+# footnote text file
+# array with the footnote text lines
+# the state. See menu entry.
+#
+# returns:
+# reference on an array containing the footnote text lines which should
+# have been updated
+# the text for the reference pointing on the footnote text
+sub t2h_default_foot_line_and_ref($$$$$$$$$)
+{
+ my $number_in_doc = shift;
+ my $number_in_page = shift;
+ my $footnote_id = shift;
+ my $place_id = shift;
+ my $document_file = shift;
+ my $footnote_file = shift;
+ my $lines = shift;
+ my $document_state = shift;
+
+ $number_in_doc = $NO_NUMBER_FOOTNOTE_SYMBOL if
(!get_conf('NUMBER_FOOTNOTES'));
+
+ if ($document_file eq $footnote_file)
+ {
+ $document_file = $footnote_file = '';
+ }
+ unshift (@$lines, "($number_in_doc)\n");
+ push @$lines, "\n";
+ return ($lines, "($number_in_doc)");
+}
+
+# formats a group of footnotes.
+#
+# argument:
+# array reference on the footnotes texts lines
+#
+# returns an array reference on the group of footnotes lines
+sub t2h_default_foot_section($)
+{
+ my $lines = shift;
+ my $header = &$heading_text('footnotes', gdt('Footnotes'), 3);
+ unshift (@$lines, "$header\n");
+ return $lines;
+}
+
+sub t2h_default_image_files($$$$)
+{
+ my $base = shift;
+ my $extension = shift;
+ my $texi_base = shift;
+ my $texi_extension = shift;
+ my @files = ();
+ return @files if (!defined($base) or ($base eq ''));
+ if (defined($extension) and ($extension ne ''))
+ {
+ push @files,["$base.$extension", "$texi_base.$texi_extension"];
+ }
+ foreach my $ext (@IMAGE_EXTENSIONS)
+ {
+ push @files,["$base.$ext", "$texi_base.$ext"];
+ }
+ return @files;
+}
+
+# format an image
+#
+# arguments:
+# image file name with path
+# image basename
+# a boolean true if we are in a preformatted format
+# image file name without path
+# alt text
+# width
+# height
+# raw alt
+# extension
+# path to working dir
+# path to file relative from working dir
+sub t2h_default_image($$$$$$$$$$$$$$$$$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ my $file_name = shift;
+ my $alt = shift;
+ my $width = shift;
+ my $height = shift;
+ my $raw_alt = shift;
+ my $extension = shift;
+ my $working_dir = shift;
+ my $file_path = shift;
+ my $in_paragraph = shift;
+ my $file_locations = shift;
+ my $base_simple_format = shift;
+ my $extension_simple_format = shift;
+ my $file_name_simple_format = shift;
+ my $line_nr = shift;
+
+ if (!defined($file_path) or $file_path eq '')
+ {
+ if (defined($extension) and $extension ne '')
+ {
+ $file = "$base.$extension";
+ }
+ else
+ {
+ $file = "$base.txt";
+ }
+ }
+ elsif (! get_conf('COMPLETE_IMAGE_PATHS'))
+ {
+ $file = $file_name;
+ }
+ my $alt_txt = '';
+ $alt_txt = ": $alt" if (defined($alt) and $alt =~ /\S/);
+ return "[ $file$alt_txt ]";
+ # it is possible that $file_name is more correct as it allows the user
+ # to chose the relative path.
+}
+
+# address put in footer describing when was generated and who did the manual
+# not used anymore
+sub t2h_default_address($)
+{
+ my $date = shift;
+ $date = '' if (!defined($date));
+ if ($date ne '')
+ {
+ return gdt('on @emph{{date}}', { 'date' => $date });
+ }
+ return '';
+}
+
+# format a target in the main document for an index entry.
+#
+# arguments:
+# target identifier
+# boolean true if in preformatted format
+sub t2h_default_index_entry_label($$$$$$$$$)
+{
+ my $identifier = shift;
+ my $preformatted = shift;
+ my $entry = shift;
+ my $index_name = shift;
+ my $index_command = shift;
+ my $texi_entry = shift;
+ my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ return '' if (!defined($identifier) or ($identifier !~ /\S/));
+ my $label = &$anchor($identifier);
+ return $label;
+}
+
+sub t2h_default_index_entry_command($$$$$$)
+{
+ my $command = shift;
+ my $index_name = shift;
+ my $label = shift;
+ my $entry_texi = shift;
+ my $entry_formatted = shift;
+ my $index_entry_ref = shift;
+
+ return $label;
+}
+
+# process definition commands line @deffn for example
+sub t2h_default_def_line($$$$$$$$$$$$$$$$)
+{
+ my $category_prepared = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ my $index_label = shift;
+ my $arguments_array = shift;
+ my $arguments_type_array = shift;
+ my $unformatted_arguments_array = shift;
+ my $command = shift;
+ my $class_name = shift;
+ my $category = shift;
+ my $class = shift;
+ my $style = shift;
+ my $original_command = shift;
+
+ $name = '' if (!defined($name) or ($name =~ /^\s*$/));
+ $type = '' if (!defined($type) or $type =~ /^\s*$/);
+ $arguments = '' if (!defined($arguments) or $arguments =~ /^\s*$/);
+
+ my $type_name = '';
+ $type_name .= "$type " if ($type ne '');
+ $type_name .= $name if ($name ne '');
+
+ my $result = " -- $category_prepared: ${type_name}$arguments";
+ $result =~ s/\s*$//;
+ $result .= "\n";
+
+}
+
+# process definition commands line @deffn for example while removing texi
+# commands
+sub t2h_default_def_line_no_texi($$$$$)
+{
+ my $category = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ $name = '' if (!defined($name) or ($name =~ /^\s*$/));
+ $type = '' if (!defined($type) or $type =~ /^\s*$/);
+ if (!defined($arguments) or $arguments =~ /^\s*$/)
+ {
+ $arguments = '';
+ }
+ my $type_name = '';
+ $type_name = " $type" if ($type ne '');
+ $type_name .= ' ' . $name if ($name ne '');
+ $type_name .= $arguments;
+ if (! get_conf('DEF_TABLE'))
+ {
+ return $category . ':' . $type_name . "\n";
+ }
+ else
+ {
+
+ return $type_name . " " . $category . "\n";
+ }
+}
+
+# a cartouche
+sub t2h_default_cartouche($$)
+{
+ my $text = shift;
+
+ if ($text =~ /\S/)
+ {
+ return $text;
+ }
+ return '';
+}
+
+my $IDXFILE;
+# key:
+# origin_href:
+# entry:
+# texi entry:
+# element_href:
+# element_text:
+sub t2h_default_index_summary_file_entry ($$$$$$$$$)
+{
+ my $index_name = shift;
+ my $key = shift;
+ my $origin_href = shift;
+ my $entry = shift;
+ my $texi_entry = shift;
+ my $element_href = shift;
+ my $element_text = shift;
+ my $is_printed = shift;
+ my $manual_name = shift;
+
+ $element_text = 'UNDEF' if (!defined($element_text));
+ print $IDXFILE "key: $key\n origin_href: $origin_href\n entry: $entry\n"
+ . " texi_entry: $texi_entry\n"
+ . " element_href: $element_href\n element_text: $element_text\n";
+}
+
+sub t2h_default_index_summary_file_begin($$$)
+{
+ my $name = shift;
+ my $is_printed = shift;
+ my $manual_name = shift;
+
+ $IDXFILE =
main::open_out("$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}"
. "_$name.idx");
+}
+
+sub t2h_default_index_summary_file_end($$$)
+{
+ my $name = shift;
+ my $is_printed = shift;
+ my $manual_name = shift;
+
+ close ($IDXFILE);
+}
+
+sub t2h_default_sp($$)
+{
+ my $number = shift;
+ my $preformatted = shift;
+ return "\n" x $number;
+}
+
+sub t2h_default_acronym_like($$$$$$)
+{
+ my $command = shift;
+ my $acronym_texi = shift;
+ my $acronym_text = shift;
+ my $with_explanation = shift;
+ my $explanation_lines = shift;
+ my $explanation_text = shift;
+ my $explanation_simply_formatted = shift;
+
+ if ($with_explanation)
+ {
+ #return "$acronym_text ($explanation_text)";
+ return gdt('{acronym_like} ({explanation})', {'acronym_like' =>
$acronym_text, 'explanation' => $explanation_text},{'duplicate'=>1});
+ }
+ else
+ {
+ return "$acronym_text";
+ }
+
+}
+
+sub t2h_default_quotation_prepend_text($$)
+{
+ my $command = shift;
+ my $text = shift;
+ return undef if (!defined($text) or $text =~ /^$/);
+ # If there is a @ protecting the end of line the result is,
+ # after the chomp:
+ # @b{some text @:}
+ # It is likely not to be what was intended, but it is certainly right.
+ # this is tested in formatting/quotation.texi
+ chomp($text);
+ return gdt('@b{{quotation_arg}:} ', {'quotation_arg' => $text},
{'keep_texi' => 1});
+}
+
+sub t2h_default_quotation($$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $argument_text = shift;
+ my $argument_text_texi = shift;
+ my $authors = shift;
+ my $class_text = '';
+ # this allows to add an end of line if there was none, which can happen
+ # if there is an argument to @quotation, but an empty quotation, like
+ # @quotation something
+ # @end quotation
+ chomp($text);
+ $text .= "\n";
+ return $text;
+}
+
+# format the text within a paragraph style format,
+#
+# argument:
+# format name
+# text within the format
+sub t2h_default_paragraph_style_command($$)
+{
+ my $format = shift;
+ my $text = shift;
+ return $text;
+}
+
+# format a whole index
+#
+# argument:
+# index text
+# index name
+sub t2h_default_print_index($$)
+{
+ my $text = shift;
+ my $name = shift;
+ return '' if (!defined($text));
+ return "* Index:\n" . $text;
+}
+
+# format a letter entry in an index page. The letter entry contains
+# the index entries for the words beginning with that letter. It is
+# a target for links pointing from the summary of the index.
+#
+# arguments:
+# the letter
+# identifier for the letter entry. This should be used to make the target
+# identifier
+# text of the index entries
+sub t2h_default_index_letter($$$)
+{
+ my $letter = shift;
+ my $id = shift;
+ my $text = shift;
+ return $text;
+}
+
+# format an index entry (in a letter entry).
+#
+# arguments:
+# href to the main text, linking to the place where the index entry appears
+# entry text
+# href to the main text, linking to the section or node where the index
+# entry appears
+# section or node heading
+sub t2h_default_index_entry($$$$$$$$$$)
+{
+ my $text_href = shift;
+ my $entry = shift;
+ my $element_href = shift;
+ my $element_text = shift;
+ my $entry_file = shift;
+ my $current_element_file = shift;
+ my $entry_target = shift;
+ my $entry_element_target = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ return '' if ($in_region_not_in_output);
+ #!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
+ my $state = {};
+ $state = { 'code_style' => 1 } if ($index_entry_ref->{'in_code'});
+ $entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in
address@hidden", $state);
+ return '' if ($entry =~ /^\s*$/);
+
+ my $real_element_text;
+ my $element = $index_entry_ref->{'real_element'};
+ # in case $element->{'text'} is not defined, it certainly means that we
+ # are n a special elemet, most likely the virtual element appearing
+ # before anything else
+ if (defined($element->{'text'}))
+ {
+ my $element_set = 0;
+ if (get_conf('NODE_NAME_IN_INDEX'))
+ {
+ if ($element->{'node'})
+ {
+ $element_set = 1;
+ }
+ elsif ($element->{'with_node'})
+ {
+ $element = $element->{'with_node'};
+ $element_set = 1;
+ }
+ }
+ elsif (defined(get_conf('NODE_NAME_IN_INDEX')))
+ {
+ if (!$element->{'node'})
+ {
+ $element_set = 1;
+ }
+ elsif ($element->{'with_section'})
+ {
+ $element = $element->{'with_section'};
+ $element_set = 1;
+ }
+ }
+ $element = $element->{'element_ref'} if ($element->{'element_ref'} and
!$element_set);
+ $real_element_text = $element->{'text'};
+ }
+ else
+ {
+ $real_element_text = gdt('(outside of any element)');
+ }
+ return "* $entry: ".$real_element_text . '.'."\n";
+}
+
+
+sub t2h_default_copying_comment($$$$)
+{
+ my $copying_lines = shift;
+ my $copying_text = shift;
+ my $copying_no_texi = shift;
+ my $copying_simple_text = shift;
+ return '' if ($copying_no_texi eq '');
+ my $text = &$comment($copying_no_texi);
+ return $text;
+}
+
+# return value is currently ignored
+sub t2h_default_documentdescription($$$$)
+{
+ my $decription_lines = shift;
+ my $description_text = shift;
+ my $description_no_texi = shift;
+ my $description_simple_text = shift;
+
+ #return '' if ($description_no_texi eq '');
+ #my @documentdescription = split (/\n/, $description_no_texi);
+ if ($description_simple_text eq '')
+ {
+ set_from_document('documentdescription', undef);
+ return;
+ }
+ my @documentdescription = split (/\n/, $description_simple_text);
+ my $document_description = shift @documentdescription;
+ chomp $document_description;
+ foreach my $line (@documentdescription)
+ {
+ chomp $line;
+ $document_description .= ' ' . $line;
+ }
+ set_from_document('documentdescription', $document_description);
+}
+
+# format an index summary. This is a list of letters linking to the letter
+# entries.
+#
+# arguments:
+# array reference containing the formatted alphabetical letters
+# array reference containing the formatted non lphabetical letters
+sub t2h_default_index_summary($$)
+{
+ my $alpha = shift;
+ my $nonalpha = shift;
+
+ my $join = '';
+ my $nonalpha_text = '';
+ my $alpha_text = '';
+ return '';
+}
+
+# return the heading with number texinfo text
+# also called for nodes.
+sub t2h_default_heading_texi($$$)
+{
+ my $tag = shift;
+ my $texi = shift;
+ my $number = shift;
+ #$texi = main::trim_around_spaces($texi);
+ return "$number $texi" if (get_conf('NUMBER_SECTIONS') and
defined($number) and ($number !~ /^\s*$/)) ;
+ return $texi;
+}
+
+# return the heading texinfo text for split index sections
+sub t2h_default_index_element_heading_texi($$$)
+{ # FIXME i18n
+ my $heading_texi = shift;
+ my $tag = shift;
+ my $texi = shift;
+ my $number = shift;
+ my $first_letter = shift;
+ my $last_letter = shift;
+ return "$heading_texi: $first_letter -- $last_letter" if ($last_letter ne
$first_letter);
+ return "$heading_texi: $first_letter";
+}
+
+sub t2h_default_element_label($$$$)
+{
+ my $id = shift;
+ my $element = shift;
+ my $command = shift;
+ my $line = shift;
+
+ return &$anchor($id);
+}
+
+sub t2h_default_misc_element_label($$)
+{
+ my $id = shift;
+ my $misc_page_name = shift;
+ return &$anchor($id);
+}
+
+sub t2h_default_anchor_label($$$$)
+{
+ my $id = shift;
+ my $anchor_text = shift;
+ my $anchor_reference = shift;
+ my $in_special_region = shift;
+ return &$anchor($id);
+}
+
+sub t2h_default_colon_command($)
+{
+ my $punctuation_character = shift;
+ return $colon_command_punctuation_characters{$punctuation_character} if
defined($colon_command_punctuation_characters{$punctuation_character});
+ return $punctuation_character;
+}
+
+# called each time a @tab or an @itemx is encountered.
+# To be noticed that there is another function better suited for
+# formatting of an @item line: $format_list_item_texi
+sub t2h_default_tab_item_texi($$$$$$)
+{
+ my $command = shift;
+ my $commands_stack = shift;
+ my $stack = shift;
+ my $state = shift;
+ my $line = shift;
+ my $line_nr = shift;
+
+ return undef;
+}
+
+sub xml_default_line_command($$$$)
+{
+ my $command = shift;
+ my $arg_text = shift;
+ my $arg_texi = shift;
+ my $state = shift;
+
+ my $style = $line_command_map{$command};
+ return '' if ($arg_text eq '' and !defined($style) or $style eq '');
+ if ($style)
+ {
+ my $attribute_text = '';
+ if ($style =~ /^(\w+)(\s+.*)/)
+ {
+ $style = $1;
+ $attribute_text = $2;
+ }
+ $arg_text = "<${style}$attribute_text>$arg_text</$style>";
+ }
+ $arg_text .= "\n";
+ return $arg_text;
+}
+
+sub t2h_default_line_command($$$$)
+{
+ my $command = shift;
+ my $arg_text = shift;
+ my $arg_texi = shift;
+ my $state = shift;
+
+ return $arg_text;
+}
+
+# info is special, since it doesn't use the basename but directly the
+# setfilename output, contrary to all the other formats
+sub t2h_default_element_file_name($$$)
+{
+ my $element = shift;
+ my $type = shift;
+ my $prefix = shift;
+
+ my $outname;
+ return unless (get_conf('USE_SETFILENAME_EXTENSION') and
get_conf('PREFIX') eq '');
+ my $outfile = get_conf('OUTFILE');
+ $outname = $outfile if (defined($outfile) and $outfile ne '' and
$Texi2HTML::THISDOC{'input_file_number'} == 0);
+ if ($type eq 'doc' or !get_conf('SPLIT'))
+ {
+ if (defined(get_conf('setfilename')) and !defined($outname))
+ {
+ main::document_override('EXTENSION', '');
+ return get_conf('setfilename');
+ }
+ }
+
+ return undef;
+}
+
+sub t2h_default_misc_command_line($$$$$)
+{
+ my $macro = shift;
+ my $line = shift;
+ my $args = shift;
+ my $stack = shift;
+ my $state = shift;
+
+ my $result;
+ return ($macro, $line, $result);
+}
+
+sub t2h_default_internal_links($$$)
+{
+ my $fh = shift;
+ my $elements_list = shift;
+ my $indices = shift;
+
+ foreach my $element (@$elements_list)
+ {
+ my $text = $element->{'no_texi'};
+ #$text =~ s/^([\w.]+)\. /$1 /;
+ #$text = "Annexe ".$text if ($element->{'tag'} =~ /appendix/);
+ print $fh "$element->{'file'}#$element->{'id'}\ttoc\t$text\n";
+ }
+ foreach my $index_name (sort(keys(%$indices)))
+ {
+ my $entries = $indices->{$index_name};
+
+ foreach my $letter_entries (@$entries)
+ {
+ foreach my $entry (@{$letter_entries->{'entries'}})
+ {
+ #print STDERR "($index_name) key $key, t $entry->{'texi'}:
$entry->{'file'}#$entry->{'target'}\n";
+ print $fh
"$entry->{'file'}#$entry->{'target'}\t$index_name\t$entry->{'key'}\n" if
($entry->{'key'} =~ /\S/);
+ }
+ }
+ }
+}
+
+1;
Index: texi2html/examples/enable_encoding.pm
===================================================================
RCS file: texi2html/examples/enable_encoding.pm
diff -N texi2html/examples/enable_encoding.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/examples/enable_encoding.pm 9 Apr 2011 00:10:44 -0000
1.1
@@ -0,0 +1,89 @@
+# -*-perl-*-
+#+##############################################################################
+#
+# enable_encoding.pm: mimics --enable-encoding
+# This is now directly handled in the main program. It is, however different
+# from the main program implementation snce this init file is much more
+# intrusive (for example it wouldn't work with info, but it would work
+# better for a simple output format when entities are not used).
+#
+# Copyright (C) 2008 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+use strict;
+
+my $enable_encoding_default_init_out = $init_out;
+$init_out = \&enable_encoding_init_out;
+
+# badly interact with --enable-encoding support in info.pm
+set_from_init_file('ENABLE_ENCODING', 0);
+
+sub enable_encoding_init_out()
+{
+ &$enable_encoding_default_init_out();
+ # like utf8.pm
+ if (get_conf('ENCODING_NAME') eq 'utf-8')
+ {
+ $normal_text = \&t2h_utf8_normal_text unless
(get_conf('ENABLE_ENCODING_USE_ENTITY'));
+ foreach my $key (keys(%unicode_accents), 'dotless')
+ {
+ $style_map{$key}->{'function'} = \&t2h_utf8_accent;
+ $style_map_texi{$key}->{'function'} = \&t2h_utf8_accent;
+ $style_map_pre{$key}->{'function'} = \&t2h_utf8_accent;
+ }
+
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+ $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
+ $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
+ $sorting_things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($sorting_things_map{$key}));
+ $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
+ }
+ }
+ }
+ elsif (exists($makeinfo_encoding_to_map{get_conf('ENCODING_NAME')}))
+ {
+ my $enc_map = $makeinfo_encoding_to_map{get_conf('ENCODING_NAME')};
+ foreach my $key (keys(%unicode_accents), 'dotless')
+ {
+ $t2h_enable_encoding_default_accent{'normal'}->{$key} =
$style_map{$key}->{'function'};
+ $t2h_enable_encoding_default_accent{'texi'}->{$key} =
$style_map_texi{$key}->{'function'};
+ $t2h_enable_encoding_default_accent{'pre'}->{$key} =
$style_map_pre{$key}->{'function'};
+ $style_map{$key}->{'function'} = \&t2h_enable_encoding_normal_accent;
+ $style_map_texi{$key}->{'function'} = \&t2h_enable_encoding_texi_accent;
+ $style_map_pre{$key}->{'function'} = \&t2h_enable_encoding_pre_accent;
+ }
+
+ foreach my $key (%things_map)
+ {
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne '') and
+ exists($makeinfo_unicode_to_eight_bit{$enc_map}->{$unicode_map{$key}}))
+ { # we let perl handle the conversion
+ $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
+ $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
+ $sorting_things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($sorting_things_map{$key}));
+ $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
+ }
+ }
+ }
+}
+
+1;
Index: texi2html/examples/makeinfo.pm
===================================================================
RCS file: texi2html/examples/makeinfo.pm
diff -N texi2html/examples/makeinfo.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/examples/makeinfo.pm 9 Apr 2011 00:10:44 -0000 1.1
@@ -0,0 +1,420 @@
+# -*-perl-*-
+#+##############################################################################
+#
+# makeinfo.pm: output html in the makeinfo style.
+#
+# This is obsoleted and irrelevant now, in 2010 (though still used in some
+# tests) since a makeinfo-like default is used when called as makeinfo or
+# texi2any.
+#
+# Copyright (C) 2003, 2005, 2008 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+#html_default_load();
+t2h_default_load_format('html');
+
+set_default('TOP_FILE', 'index.html');
+
+set_default('SHOW_MENU', 1);
+
+set_default('USE_NODES', 1);
+
+set_default('SPLIT', 'node');
+
+set_default('NODE_FILES', 1);
+
+set_default('USE_SETFILENAME', 1);
+
+set_default('HEADERS', 1);
+
+set_default('SHORT_REF', 1);
+
+set_default('NODE_NAME_IN_MENU', 1);
+
+set_default('NODE_NAME_IN_INDEX', 0);
+
+set_default('AVOID_MENU_REDUNDANCY', 0);
+
+set_default('SPLIT_INDEX', 0);
+
+$MENU_SYMBOL = '*';
+
+set_default('WORDS_IN_PAGE', 200);
+
+set_default('footnotestyle', 'end');
+
+set_default('USE_ACCESSKEY', 1);
+
+set_default('USE_REL_REV', 1);
+
+set_default('USE_LINKS', 1);
+
+set_default('INLINE_CONTENTS', 1);
+
+set_default('OVERVIEW_LINK_TO_TOC', 1);
+
+if (get_conf('HEADER_IN_TABLE'))
+{
+ @SECTION_BUTTONS =
+ (
+ \"node: ", \$Texi2HTML::NODE{This}, [ 'NodeNext',
\$Texi2HTML::NODE{NodeNext} ] , \",", [ 'NodePrev', \$Texi2HTML::NODE{NodePrev}
], \",", [ 'NodeUp', \$Texi2HTML::NODE{NodeUp} ], 'NodeForward'
+ );
+
+ @TOP_BUTTONS = @SECTION_BUTTONS;
+ @MISC_BUTTONS = @SECTION_BUTTONS;
+}
+
+push @command_handler_process, \&makeinfo_like_initialize_variables;
+
+my $makekinfo_like_footnote_absolute_number;
+my %makekinfo_like_paragraph_in_footnote_nr;
+
+sub makeinfo_like_initialize_variables()
+{
+ $makekinfo_like_footnote_absolute_number = 0;
+ %makekinfo_like_paragraph_in_footnote_nr = ();
+}
+
+my $default_init_out = $init_out;
+$init_out = \&makeinfo_like_init_out;
+
+sub makeinfo_like_init_out()
+{
+ &$default_init_out();
+ $NAVIGATION_TEXT{'NodeForward'} = ' > ';
+}
+
+# FIXME: images not in paragraphs are in <div class="block-image">
+
+
+$foot_line_and_ref = \&makeinfo_like_foot_line_and_ref;
+$foot_section = \&makeinfo_like_foot_lines;
+$paragraph = \&makeinfo_like_paragraph;
+$index_summary = \&makeinfo_like_index_summary;
+$summary_letter = \&makeinfo_like_summary_letter;
+$index_entry = \&makeinfo_like_index_entry;
+$index_letter = \&makeinfo_like_index_letter;
+$print_index = \&makeinfo_like_print_index;
+$listoffloats = \&makeinfo_like_listoffloats;
+$listoffloats_entry = \&makeinfo_like_listoffloats_entry;
+$menu_link = \&makeinfo_like_menu_link;
+$menu_description = \&makeinfo_like_menu_description;
+$menu_comment = \&makeinfo_like_menu_comment;
+$menu = \&makeinfo_like_menu;
+
+sub makeinfo_like_foot_line_and_ref($$$$$$$$)
+{
+ my $foot_num = shift;
+ my $relative_num = shift;
+ my $footid = shift;
+ my $docid = shift;
+ my $from_file = shift;
+ my $footnote_file = shift;
+ my $lines = shift;
+ my $state = shift;
+
+ $makekinfo_like_footnote_absolute_number++;
+
+ # this is a bit obscure, this allows to add an anchor only if formatted
+ # as part of the document.
+ $docid = '' if ($state->{'outside_document'} or $state->{'multiple_pass'});
+
+ if ($from_file eq $footnote_file)
+ {
+ $from_file = $footnote_file = '';
+ }
+
+ my $foot_anchor = "<sup>" . &$anchor($docid, "$footnote_file#$footid",
$relative_num) . "</sup>";
+ $foot_anchor = &$anchor($docid, "$footnote_file#$footid",
"($relative_num)") if ($state->{'preformatted'});
+
+ return ($lines, $foot_anchor);
+}
+
+sub makeinfo_like_foot_lines($)
+{
+ my $lines = shift;
+ unshift @$lines, "<div class=\"footnote\">\n<hr>\n<h4>". gdt('Footnotes')
."</h4>\n";
+ push (@$lines, "</div>\n");
+ return $lines;
+}
+
+sub makeinfo_like_paragraph ($$$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $align = shift;
+ my $indent = shift;
+ my $paragraph_command = shift;
+ my $paragraph_command_formatted = shift;
+ my $paragraph_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+ my $state = shift;
+#print STDERR "format: $format\n" if (defined($format));
+#print STDERR "paragraph @$command_stack_at_end; @$command_stack_at_begin\n";
+ #$paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
+ # exists($special_list_commands{$format}->{$paragraph_command}));
+ return '' if ($text =~ /^\s*$/);
+ if (defined($paragraph_number) and defined($$paragraph_number))
+ {
+ $$paragraph_number++;
+ return $text if (($format eq 'itemize' or $format eq 'enumerate') and
+ ($$paragraph_number == 1));
+ }
+ my $open = '<p';
+ if ($align)
+ {
+ $open .= " align=\"$paragraph_style{$align}\"";
+ }
+
+ my $footnote_text = '';
+ if (defined($command_stack_at_begin->[0]) and $command_stack_at_begin->[0]
eq 'footnote')
+ {
+ my $state = $Texi2HTML::THISDOC{'state'};
+
$makekinfo_like_paragraph_in_footnote_nr{$makekinfo_like_footnote_absolute_number}++;
+ if
($makekinfo_like_paragraph_in_footnote_nr{$makekinfo_like_footnote_absolute_number}
<= 1)
+ {
+ $open.=' class="footnote"';
+ my $document_file = $state->{'footnote_document_file'};
+ if ($document_file eq $state->{'footnote_footnote_file'})
+ {
+ $document_file = '';
+ }
+ my $docid = $state->{'footnote_place_id'};
+ my $doc_state = $state->{'footnote_document_state'};
+ $docid = '' if ($doc_state->{'outside_document'} or
$doc_state->{'multiple_pass'});
+ my $foot_label = &$anchor($state->{'footnote_footnote_id'},
+ $document_file . "#$state->{'footnote_place_id'}",
+ "$state->{'footnote_number_in_page'}");
+ $footnote_text = "<small>[${foot_label}]</small> ";
+ }
+ }
+
+ $text = $footnote_text.$text;
+
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+ if ($top_stack eq 'multitable')
+# FIXME
+# paragraph_number is not by cell, so it is not possible to know if it
+# is the first paragraph in cell. Also currently there is no hook for a
+# cell beginning which means that it is not possible to reset the cell
+# paragraph count at a cell beginning
+# and (!defined($paragraph_number) or !defined($$paragraph_number) or
$$paragraph_number == 1))
+ {
+ return $text;
+ }
+
+ return $open.'>'.$text.'</p>';
+}
+
+
+sub makeinfo_like_index_summary
+{
+ return '';
+}
+
+sub makeinfo_like_summary_letter
+{
+ return '';
+}
+
+sub makeinfo_like_index_entry($$$$$$$$$$)
+{
+ my $text_href = shift;
+ my $entry = shift;
+ my $element_href = shift;
+ my $element_text = shift;
+ my $entry_file = shift;
+ my $current_element_file = shift;
+ my $entry_target = shift;
+ my $entry_element_target = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ return '' if ($entry !~ /\S/);
+ my $element = $index_entry_ref->{'real_element'};
+ if (defined($element))
+ {
+ my $element_set = 0;
+ if (get_conf('NODE_NAME_IN_INDEX'))
+ {
+ if ($element->{'node'})
+ {
+ $element_set = 1;
+ }
+ elsif ($element->{'with_node'})
+ {
+ $element = $element->{'with_node'};
+ $element_set = 1;
+ }
+ }
+ elsif (defined(get_conf('NODE_NAME_IN_INDEX')))
+ {
+ if (!$element->{'node'})
+ {
+ $element_set = 1;
+ }
+ elsif ($element->{'with_section'})
+ {
+ $element = $element->{'with_section'};
+ $element_set = 1;
+ }
+ }
+ if ($element_set)
+ {
+ $element_href = main::href($element,
$Texi2HTML::THIS_ELEMENT->{'file'},
+ $Texi2HTML::THISDOC{'line_nr'});
+ $element_text = $element->{'text'};
+ }
+ }
+
+
+ return '<li>' . $entry . ': ' . &$anchor('', $element_href, $element_text)
+ . "</li>\n";
+}
+
+sub makeinfo_like_index_letter($$$)
+{
+ my $letter = shift;
+ my $id = shift;
+ my $text = shift;
+ return $text;
+}
+
+sub makeinfo_like_print_index($$)
+{
+ my $text = shift;
+ my $name = shift;
+ return '' if (!defined($text));
+ return "<ul class=\"index-$name\" compact>\n" . $text . "</ul>\n";
+}
+
+sub makeinfo_like_listoffloats_entry($$$$)
+{
+ my $style_texi = shift;
+ my $float = shift;
+ my $float_style = shift;
+ my $caption = shift;
+ my $href = shift;
+
+ if ($caption ne '')
+ {
+ return '<li>' . gdt('{href}: {caption}', { 'href' => &$anchor('',
$href, $float_style), 'caption' => $caption }) . "</li>\n";
+ }
+ else
+ {
+ return '<li>' . &$anchor('', $href, $float_style) . "</li>\n";
+ }
+}
+
+sub makeinfo_like_listoffloats($$$)
+{
+ my $style_texi = shift;
+ my $style = shift;
+ my $float_entries = shift;
+
+ my $result = "<ul class=\"listoffloats\">\n" ;
+ foreach my $float_entry (@$float_entries)
+ {
+ $result .= $float_entry;
+ }
+ return $result . "</ul>\n";
+}
+
+# a whole menu
+#
+# argument:
+# the whole menu text (entries and menu comments)
+#
+# argument:
+# whole menu text.
+sub makeinfo_like_menu($)
+{
+ my $text = shift;
+ $menu_entry_index=0;
+ if ($text =~ /\S/)
+ {
+ return "<ul>\n"
+ . $text . "</ul>\n";
+ }
+}
+
+# formats a menu entry link pointing to a node or section
+#
+# arguments:
+# the entry text
+# the state, a hash reference holding informations about the context, with a
+# usefull entry, 'preformatted', true if we are in a preformatted format
+# (a format keeping space between words). In that case a function
+# of the main program, main::do_preformatted($text, $state) might
+# be used to format the text with the current format style.
+# href is optionnal. It is the reference to the section or the node anchor
+# which should be used to make the link (typically it is the argument
+# of a href= attribute in a <a> element).
+sub makeinfo_like_menu_link($$$$$$$)
+{
+ my $entry = shift;
+ my $state = shift;
+ my $href = shift;
+ my $node = shift;
+ my $title = shift;
+ my $ending = shift;
+ my $has_title = shift;
+ $title = '' unless ($has_title);
+ if (($entry eq '') or get_conf('NODE_NAME_IN_MENU') or
$state->{'preformatted'})
+ {
+
+ $title .= ':' if ($title ne '');
+ $entry = "$title$node";
+ }
+ $menu_entry_index++;
+ my $accesskey;
+ $accesskey = "accesskey=\"$menu_entry_index\"" if
(get_conf('USE_ACCESSKEY') and ($menu_entry_index < 10));
+ $entry = &$anchor ('', $href, $entry, $accesskey) if (defined($href));
+# if ($state->{'preformatted'})
+# {
+# return '<li>' . main::do_preformatted($entry . $ending, $state);
+# }
+ return "<li> $entry";
+}
+
+# formats a menu entry description, ie the text appearing after the node
+# specification in a menu entry an spanning until there is another
+# menu entry, an empty line or some text at the very beginning of the line
+# (we consider that text at the beginning of the line begins a menu comment)
+#
+# arguments:
+# the description text
+# the state. See menu_entry.
+sub makeinfo_like_menu_description($$)
+{
+ my $text = shift;
+ my $state = shift;
+# if ($state->{'preformatted'})
+# {
+# return main::do_preformatted($text, $state) . '</td></tr>';
+# }
+ return "$text</li>\n";
+}
+
+1;
Index: texi2html/examples/noheaders.pm
===================================================================
RCS file: texi2html/examples/noheaders.pm
diff -N texi2html/examples/noheaders.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/examples/noheaders.pm 9 Apr 2011 00:10:44 -0000 1.1
@@ -0,0 +1,110 @@
+# -*-perl-*-
+#+##############################################################################
+#
+# noheaders.pm: output html without headers. Obsoleted by --no-header
+#
+# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+#
+# does nothing in case of info (at least in the test suite)
+
+$print_section = \&T2H_NOHEAD_print_section;
+$end_section = \&T2H_NOHEAD_end_section;
+$one_section = \&T2H_NOHEAD_one_section;
+$print_Top_footer = \&T2H_NOHEAD_print_Top_footer;
+$print_misc_footer = \&T2H_NOHEAD_print_misc_footer;
+$print_head_navigation = \&T2H_NOHEAD_noop;
+$print_navigation = \&T2H_NOHEAD_noop;
+$about_body = \&T2H_NOHEAD_about_body;
+
+sub T2H_NOHEAD_noop
+{
+ return '';
+}
+
+########################################################################
+# Layout for html for every sections
+#
+
+sub T2H_NOHEAD_print_section
+{
+ my $fh = shift;
+ my $first_in_page = shift;
+ my $previous_is_top = shift;
+ my $nw = main::print_lines($fh);
+}
+
+sub T2H_NOHEAD_one_section($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ main::print_lines($fh);
+ print $fh "$DEFAULT_RULE\n" if ($DEFAULT_RULE ne '');
+ &$print_page_foot($fh);
+}
+
+###################################################################
+# Layout of top-page I recommend that you use @ifnothtml, @ifhtml,
+# @html within the Top texinfo node to specify content of top-level
+# page.
+#
+# If you enclose everything in @ifnothtml, then title, subtitle,
+# author and overview is printed
+# Texi2HTML::HREF of Next, Prev, Up, Forward, Back are not defined
+# if $T2H_SPLIT then Top page is in its own html file
+sub T2H_NOHEAD_print_Top_footer($$)
+{
+ my $fh = shift;
+ print $fh "$DEFAULT_RULE\n" if ($DEFAULT_RULE ne '');
+}
+
+###################################################################
+# Layout of Toc, Overview, and Footnotes pages
+# By default, we use "normal" layout
+# Texi2HTML::HREF of Next, Prev, Up, Forward, Back, etc are not defined
+# use: my $buttons = [...] to redefine navigation buttons
+sub T2H_NOHEAD_print_misc_header
+{
+ my $fh = shift;
+ &$print_page_head($fh) if (get_conf('SPLIT'));
+}
+sub T2H_NOHEAD_print_misc_footer
+{
+ my $fh = shift;
+ print $fh "$DEFAULT_RULE\n" if ($DEFAULT_RULE ne '');
+ if (get_conf('SPLIT'))
+ {
+ &$print_page_foot($fh);
+ }
+
+}
+
+sub T2H_NOHEAD_end_section($)
+{
+ my $fh = shift;
+ print $fh "$DEFAULT_RULE\n" if ($DEFAULT_RULE ne '');
+}
+
+###################################################################
+# Layout of navigation panel
+
+sub T2H_NOHEAD_about_body
+{
+}
+
Index: texi2html/examples/roff.pm
===================================================================
RCS file: texi2html/examples/roff.pm
diff -N texi2html/examples/roff.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/examples/roff.pm 9 Apr 2011 00:10:44 -0000 1.1
@@ -0,0 +1,1240 @@
+# -*-perl-*-
+#+##############################################################################
+#
+# roff.pm: convert to roff
+#
+# So much out of date that it may be considered unuseful.
+#
+# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+# FIXME obsolete
+main::load_init_file('', 'noheaders.pm');
+
+set_default('SPLIT', 0);
address@hidden = ('info');
+set_default('USE_ISO', 0);
+$SMALL_RULE = '';
+$DEFAULT_RULE = '';
+$MIDDLE_RULE = '';
+$BIG_RULE = '';
+set_default('NODE_FILE_EXTENSION', 'roff');
+set_default('EXTENSION', 'roff');
+$MENU_SYMBOL = '*';
+set_default('AVOID_MENU_REDUNDANCY', 0);
+
+$print_Top = \&T2H_ROFF_print_Top;
+$print_misc = \&T2H_ROFF_print_misc;
+$print_page_head = \&T2H_ROFF_print_page_head;
+$print_page_foot = \&T2H_ROFF_print_page_foot;
+$toc_body = \&T2H_ROFF_toc_body;
+$titlepage = \&T2H_ROFF_titlepage;
+
+sub T2H_ROFF_print_page_head
+{
+ my $fh = shift;
+ print $fh <<EOT;
+.nr _- 0
+.tr \\(is'
+.tr \\(if`
+.tr \\(pd"
+
+$AFTER_BODY_OPEN
+
+EOT
+ my $today = get_conf('today');
+ print $fh $Texi2HTML::THISDOC{'copying_comment'} . "\n";
+ print $fh "" . &$comment("Created by
$Texi2HTML::THISDOC{'program_version'},
$Texi2HTML::THISDOC{'program_homepage'}\n");
+ # FIXME this should instead be done in print_title
+ print $fh ".ds St " . protect_spaces($Texi2HTML::THISDOC{'title'}) . "\n";
+ print $fh '.oh \'\\\\*(St\'\'%\'' ."\n".'.eh \'%\'\'\\\\*(St\'' . "\n";
+}
+
+sub T2H_ROFF_print_page_foot
+{
+ my $fh = shift;
+ my $program_string = program_string();
+ print $fh <<EOT;
+.br
+.pp
+$program_string
+EOT
+}
+
+sub T2H_ROFF_print_Top($$)
+{
+ my $fh = shift;
+ my $has_top_heading = shift;
+
+ my $buttons = address@hidden;
+ &$print_head_navigation($fh, $buttons);
+ # FIXME this is done in print_title now.
+ # redo the titlepage with the actual state
+ my ($titlepage_text, $titlepage_no_texi, $titlepage_simple_text) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
+ &$titlepage([],$titlepage_text, $titlepage_no_texi,
$titlepage_simple_text);
+ print $fh $Texi2HTML::TITLEPAGE;
+ main::print_lines($fh, $Texi2HTML::THIS_SECTION);
+}
+
+# FIXME: use the vanilla print_misc instead, and add a
+# $heading_text
+sub T2H_ROFF_print_misc
+{
+ my $fh = shift;
+ &$print_misc_header($fh);
+ main::print_lines($fh);
+ &$print_misc_footer($fh);
+}
+
+# FIXME obsolete, main one is right now, need to do a heading_text
+sub T2H_ROFF_titlepage ($$$$)
+{
+ my $titlepage_lines = shift;
+ my $titlepage_text = shift;
+ my $titlepage_no_texi = shift;
+ my $titlepage_simple_text = shift;
+
+ my $result = '';
+ if (@{$Texi2HTML::THISDOC{'titles'}}
+ or @{$Texi2HTML::THISDOC{'subtitles'}}
+ or @{$Texi2HTML::THISDOC{'authors'}})
+ {
+# FIXME obsolete, use $line_command instead
+ foreach my $title (@{$Texi2HTML::THISDOC{'titles'}})
+ {
+ $result .= ".sz +10\n.ce\n" . protect_spaces($title) . "\n.sz
-10\n";
+ }
+ foreach my $subtitle (@{$Texi2HTML::THISDOC{'subtitles'}})
+ {
+ $result .= ".sz +4\n.ce\n" . protect_spaces($subtitle) . "\n.sz
-4\n";
+ }
+ $result .= ".sp 4\n" if ($result ne '');
+ foreach my $author (@{$Texi2HTML::THISDOC{'authors'}})
+ {
+ $result .= protect_spaces($author) . "\n.br\n";
+ }
+ $result .= ".sp 2\n" if (@{$Texi2HTML::THISDOC{'authors'}});
+ }
+ if (($result ne '') or ($Texi2HTML::TITLEPAGE ne ''))
+ {
+ $Texi2HTML::TITLEPAGE = ".tp\n" . $result . $titlepage_text . ".++
C\n";
+ }
+}
+
+########################################################################
+# Control of formatting:
+# 1.) For some changes, it is often enough to change the value of
+# some global map. It might necessitate building a little
+# function along with the change in hash, if the change is the use
+# of another function (in style_map).
+# 2.) For other changes, reimplement one of the t2h_default_<fnc>* routines,
+# give them another name, and assign them to the respective
+# $<fnc> variable (below).
+
+
+#
+# This hash should have keys corresponding with the nonletter command accent
+# whose following character is considered to be the argument
+# This hash associates an accent macro to the ISO name for the accent if any.
+# The customary use of this map is to find the ISO name appearing in html
+# entity (like é) associated with a texinfo accent macro.
+#
+# The keys of the hash are
+# ": umlaut
+# ~: tilda accent
+# ^: circumflex accent
+# `: grave accent
+# ': acute accent
+# =: macron accent
+%accent_map = (
+ '"', ':',
+ '~', '~',
+ '^', '^',
+ '`', '`',
+ ',', ',',
+ "'", "'",
+ '=', '',
+ );
+
+#
+# texinfo "simple things" (@foo) to HTML ones
+#
+%simple_map = (
+# "*", "\n.br\n",
+ ' ', '\ ',
+ "\t", "\\\t",
+ "\n", "\\\n",
+ # "­" or "­" could also be possible for @-, but it seems
+ # that some browser will consider this as an always visible hyphen mark
+ # which is not what we want (see http://www.cs.tut.fi/~jkorpela/shy.html)
+ '-', '', # hyphenation hint
+ '|', '', # used in formatting commands @evenfooting and friends
+ '/', '',
+ # spacing commands
+ ':', '',
+ '!', '!',
+ '?', '?',
+ '.', '\&.',
+ '@', '@',
+ '}', '}',
+ '{', '{',
+ );
+
+# this map is used in preformatted text
+%simple_map_pre = %simple_map;
+
+#
+# texinfo "things" (@foo{}) to HTML ones
+#
+%things_map = (
+ 'TeX' => 'TeX',
+ 'LaTeX' => 'LaTeX',
+ 'bullet' => '\(bu',
+ 'copyright' => '\(co',
+ 'registeredsymbol' => '\(rg',
+ 'dots' => '\&...',
+ 'enddots' => '\&...',
+ 'equiv' => '\(==',
+# i18n
+ 'error' => 'error->',
+ 'expansion' => '\(->',
+ 'minus' => '\-',
+ 'point' => '*',
+ 'print' => '-|',
+ 'result' => '\(rh',
+ # set in code using the language
+ # 'today', &pretty_date,
+ 'aa' => '\(oa',
+ 'AA' => '\(oA',
+ 'ae' => '\(ae',
+ 'oe' => '\(oe',
+ 'AE' => '\(AE',
+ 'OE' => '\(OE',
+ 'o' => '\(/o',
+ 'O' => '\(/O',
+ 'ss' => '\(ss',
+ 'l' => '\(/l',
+ 'L' => '\(/L',
+ 'exclamdown' => '\(r!',
+ 'questiondown' => '\(r?',
+ 'pounds' => '\(Po',
+ 'ordm' => '\(Om',
+ 'ordf' => '\(Of',
+ 'euro' => '\(eu',
+ );
+
+# This map is used in preformatted environments
+%pre_map = %things_map;
+
+#%style_map = (
+# 'acronym', '',
+# 'asis', '',
+# 'b', ['\fB', '\fR'],
+# 'cite', ['\fI', '\fR'],
+# 'code', ['\fR\&\f(CW', '\fR'],
+# 'command', ['\fR\&\f(CW', '\fR'],
+# 'ctrl', ['\fR\&\f(CW', '\fR'],
+# 'dfn', ['\fI', '\fR'],
+# 'dmn', '',
+# 'email', ['\fB', '\fR'],
+# 'emph', ['\fI', '\fR'],
+# 'env', ['\fR\&\f(CW', '\fR'],
+# 'file', ['\fR\&\f(CW', '\fR', '"'],
+# 'i', ['\fI', '\fR'],
+# 'kbd', ['\fR\&\f(CW', '\fR'],
+# 'key', ['\fR\&\f(CW', '\fR'],
+# 'math', ['\fR\&\f(CW', '\fR'],
+# 'option', ['\fR\&\f(CW', '\fR', '"'],
+# 'r', ['\fR', ''],
+# 'samp', ['\fR\&\f(CW', '\fR', '"'],
+# 'sc', '&roff_sc',
+# 'strong', ['\fB', '\fR'],
+# 't', ['\fR\&\f(CW', '\fR'],
+# 'uref', '&default_uref',
+# 'url', '&default_url',
+# 'var', ['\fI', '\fR'],
+# 'verb', ['\fR\&\f(CW', '\fR'],
+# 'titlefont', ["\n.sz +10\n.ce\n", "\n.sz -10\n"],
+# 'w', '',
+# 'H', '&roff_accent',
+# 'dotaccent', '&roff_accent',
+# 'ringaccent', '&roff_accent',
+# 'tieaccent', '&roff_accent',
+# 'u', '&roff_accent',
+# 'ubaraccent', '&roff_accent',
+# 'udotaccent', '&roff_accent',
+# 'v', '&roff_accent',
+# ',', '&roff_accent',
+# 'dotless', ''
+# );
+
+my @bold_commands = ('strong', 'b', 'email');
+my @italic_commands = ('cite', 'dfn', 'emph', 'i', 'var', 'slanted');
+my @fixed_command = ('code', 'command', 'ctrl', 'env', 'file', 'kbd', 'key',
+ 'math', 'option', 'samp', 't', 'verb');
+
+foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents),
keys(%accent_map))
+{
+ #$style_map{$accent_command} = { 'function' => \&t2h_roff_accent };
+ $style_map{$accent_command} = '&roff_accent';
+}
+#foreach my $accent (keys(%accent_map))
+#{
+# $style_map{$accent} = '&roff_accent';
+#}
+
+foreach my $command (keys(%style_map))
+{
+ delete $style_map{$command}->{'attribute'} if
(exists($style_map{$command}->{'attribute'}));
+ if (grep {$_ eq $command} @bold_commands)
+ {
+ delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
+ $style_map{$command}->{'begin'} = '\fB';
+ $style_map{$command}->{'end'} = '\fR';
+ next;
+ }
+ elsif (grep {$_ eq $command} @italic_commands)
+ {
+ delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
+ $style_map{$command}->{'begin'} = '\fI';
+ $style_map{$command}->{'end'} = '\fR';
+ next;
+ }
+ elsif (grep {$_ eq $command} @fixed_commands)
+ {
+ delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
+ $style_map{$command}->{'begin'} = '\fR\&\f(CW';
+ $style_map{$command}->{'end'} = '\fR';
+ next;
+ }
+}
+
+delete $style_map{'titlefont'}->{'function'} if
(exists($style_map{'titlefont'}->{'function'}));
+$style_map{'titlefont'}->{'begin'} = "\n.sz +10\n.ce\n";
+$style_map{'titlefont'}->{'end'} = "\n.sz -10\n";
+
+delete $style_map{'r'}->{'function'} if
(exists($style_map{'r'}->{'function'}));
+$style_map{'r'}->{'begin'} = '\r';
+#$style_map{'r'}->{'end'} = '';
+
+$style_map{'sc'} = '&roff_sc';
+
+$style_map{'indicateurl'}->{'begin'} = '<';
+$style_map{'indicateurl'}->{'end'} = '>';
+
+foreach my $command (keys(%style_map))
+{
+ if (ref($style_map{$command}) ne 'HASH')
+ {
+ $style_map_pre{$command} = $style_map{$command};
+ next;
+ }
+ $style_map_pre{$command} = {};
+ foreach my $key (keys(%{$style_map{$command}}))
+ {
+ $style_map_pre{$command}->{$key} = $style_map{$command}->{$key};
+ }
+}
+
+%special_accents = (
+ 'ringaccent' => 'aA',
+ "'" => 'aeiouyAEIOUY',
+ ',' => 'cC',
+ '^' => 'aeiouAEIOU',
+ '`' => 'aeiouAEIOU',
+ '~' => 'nNaoAO',
+ '"' => 'aeiouyAEIOUY',
+ 'v' => 'sSzZ',
+);
+
+sub roff_accent($$)
+{
+ my $text = shift;
+ my $accent = shift;
+ return $text if ($accent eq 'dotless');
+ return "\\($accent_map{$accent}${text}" if (defined($accent_map{$accent})
and defined($special_accents{$accent}) and ($text =~
/^[$special_accents{$accent}]$/));
+ return "\\(o${text}" if (($accent eq 'ringaccent') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
+ return "\\(v${text}" if (($accent eq 'v') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
+#FIXME maybe we should protect the symbols such that they look like strings and
+# not ponctuation marks ? Like it is done in texi2roff ?
+ return $text . '\\&.' if ($accent eq 'dotaccent');
+ return '\\&.' . $text if ($accent eq 'udotaccent');
+ return ascii_accents($text, $accent);
+}
+
+sub roff_sc($$)
+{
+ return "\n.sz -6\n" . uc($_[0]) . "\n.sz +6\n" ;
+}
+
+sub roff_ctrl($$)
+{
+ return "\\*^$_[0]";
+}
+
+$format = \&T2H_ROFF_format;
+
+sub T2H_ROFF_format($$$)
+{
+ my $tag = shift;
+ my $element = shift;
+ my $text = shift;
+ return '' if (!defined($element) or ($text !~ /\S/));
+ return $element->[0] . $text . $element->[1];
+}
+
+%format_map = (
+ 'quotation' => [ ".(q\n", ".)q\n" ],
+ 'smallquotation' => [ ".(q\n", ".)q\n" ],
+ # lists
+ 'itemize' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
+ 'enumerate' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
+ 'multitable' => [ ".(l M\n.nh\n", ".hy\n.)l\n" ],
+ 'table' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
+ 'vtable' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
+ 'ftable' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
+ );
+
+%special_list_commands = (
+ 'table' => {},
+ 'vtable' => {},
+ 'ftable' => {},
+ 'itemize' => {}
+ );
+
+$complex_format_map =
+(
+ 'example' =>
+ {
+ 'begin' => "",
+ 'end' => "",
+ 'begin_region' => ".(l I\n\\&\\fR\\f(CW",
+ 'end_region' => "\\&\\fR\n.)l\n"
+ },
+ 'smallexample' =>
+ {
+ 'begin' => "",
+ 'end' => "",
+ 'begin_region' => ".(l I\n.size -2\n\\&\\fR\\f(CW",
+ 'end_region' => "\\&\\fR\n.size +2\n.)l\n"
+ },
+ 'display' =>
+ {
+ 'begin' => "",
+ 'end' => "",
+ 'begin_region' => ".(l I\n\\&\\fR\\f(CW",
+ 'end_region' => "\\&\\fR\n.)l\n"
+ },
+ 'smalldisplay' =>
+ {
+ 'begin' => "",
+ 'end' => "",
+ 'begin_region' => ".(l I\n.size -2\n\\&\\fR\\f(CW",
+ 'end_region' => "\\&\\fR\n.size +2\n.)l\n"
+ },
+ 'menu-comment' =>
+ {
+ 'begin' => "",
+ 'end' => "",
+ 'begin_region' => "",
+ 'end_region' => "\n"
+ },
+ 'menu-preformatted' =>
+ {
+ 'begin' => "",
+ 'end' => "",
+ 'begin_region' => "",
+ 'end_region' => "\n"
+ }
+);
+
+# format shouldn't narrow the margins
+
+$complex_format_map{'lisp'} = $complex_format_map{'example'};
+$complex_format_map{'smalllisp'} = $complex_format_map{'smallexample'};
+$complex_format_map{'format'} = $complex_format_map{'display'};
+$complex_format_map{'smallformat'} = $complex_format_map{'smalldisplay'};
+
+sub protect_spaces($)
+{
+ my $text = shift;
+ my $result = '';
+ while($text)
+ {
+ if ($text =~ s/^([^\\]*)\\//o)
+ {
+ my $leading = $1;
+ if (defined($leading))
+ {
+ $leading =~ s/([\t ])/\\$1/go;
+ $result .= $leading . '\\';
+ }
+ if (($text =~ s/^(\s)//o) or ($text =~ s/^(.)//o))
+ {
+ $result .= $1;
+ }
+ }
+ else
+ {
+ $text =~ s/([\t ])/\\$1/go;
+ $result .= $text;
+ $text = '';
+ }
+ }
+ return $result;
+}
+
+# formatting functions
+
+$anchor = \&t2h_roff_anchor;
+$def_item = \&t2h_roff_def_item;
+$def = \&t2h_roff_def;
+$menu = \&t2h_roff_menu;
+$menu_link = \&t2h_roff_menu_link;
+$menu_comment = \&t2h_roff_menu_comment;
+$menu_description = \&t2h_roff_menu_description;
+$simple_menu_link = \&t2h_roff_simple_menu_link;
+$table_item = \&t2h_roff_table_item;
+$table_line = \&t2h_roff_table_line;
+$row = \&t2h_roff_row;
+$cell = \&t2h_roff_cell;
+$list_item = \&t2h_roff_list_item;
+$comment = \&t2h_roff_comment;
+$def_line = \&t2h_roff_def_line;
+$raw = \&t2h_roff_raw;
+$heading = \&t2h_roff_heading;
+$paragraph = \&t2h_roff_paragraph;
+$preformatted = \&t2h_roff_preformatted;
+$foot_line_and_ref = \&t2h_roff_foot_line_and_ref;
+$foot_section = \&t2h_roff_foot_section;
+$image = \&t2h_roff_image;
+$index_entry_label = \&t2h_roff_index_entry_label;
+$index_summary = \&t2h_roff_index_summary;
+$print_index = \&t2h_roff_print_index;
+$protect_text = \&t2h_roff_protect_text;
+$cartouche = \&t2h_roff_cartouche;
+$sp = \&t2h_roff_sp;
+$normal_text = \&t2h_roff_normal_text;
+$empty_line = \&t2h_roff_empty_line;
+$unknown = \&t2h_roff_unknown;
+$float = \&t2h_roff_float;
+$listoffloats = \&t2h_roff_listoffloats;
+$listoffloats_entry = \&t2h_roff_listoffloats_entry;
+
+# This function is used to protect characters which are special in html
+# in inline text: &, ", <, and >.
+#
+# argument:
+# text to be protected
+sub t2h_roff_protect_text($)
+{
+ my $text = shift;
+ $text =~ s/\\/\\e/g;
+# $text =~ s/$;---$;/\\(em/g;
+# $text =~ s/$;--$;/-/g;
+# $text =~ s/$;-$;/\\-/g;
+ $text =~ s/^\./\\&./;
+ $text =~ s/([\s])\./$1\\&./g;
+ return $text;
+}
+
+sub t2h_roff_normal_text($$$$$$$;$)
+{
+ my $text = shift;
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_code =shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ $text = &$protect_text($text) unless($in_raw_text);
+ if (! $in_code and !$in_preformatted and !$in_raw_text)
+ {
+ $text =~ s/---/\\(em/g;
+ $text =~ s/--/\\(en/g;
+ $text =~ s/-/\\-/g;
+ $text =~ s/``/\\(lq/g;
+ $text =~ s/''/\\(rq/g;
+ }
+ #$text =~ s/---/\\(em/g;
+ #$text =~ s/(--?-?)/$;$1$;/go;
+ return $text;
+}
+
+sub t2h_roff_unknown($$$)
+{
+ my $macro = shift;
+ my $line = shift;
+ my $pass = shift;
+
+ if ($macro eq '*' and $pass == 2)
+ {
+ $line = '' if ($line =~ /^\s*$/);
+ return ($line, 1, "\n.br\n", undef);
+ }
+ return ($line, 0, undef, undef);
+}
+
+
+# This function produces an anchor
+#
+# arguments:
+# $name : anchor name
+# $href : anchor href
+# text : text displayed
+# extra_attribs : added to anchor attributes list
+sub t2h_roff_anchor($;$$$)
+{
+ my $name = shift;
+ my $href = shift;
+ my $text = shift;
+ my $attributes = shift;
+ $href = '' if (!defined($href) or ($href !~ /\S/));
+ $text = '' if (!defined($text));
+ return $text if ($text ne '');
+ return "[$href]" if ($href ne '');
+ return '';
+}
+
+# This function is used to format the text associated with a @deff/@end deff
+#
+# argument:
+# text
+sub t2h_roff_def_item($)
+{
+ my $text = shift;
+ if ($text =~ /\S/)
+ {
+ {
+ #return ".ba +5\n.(l L F\n" . $text . ".)l\n.ba -5\n";
+ return ".(l L F\n.ba +5\n" . $text . ".ba -5\n.)l\n";
+ }
+ }
+ return '';
+}
+
+# format the container for the @deffn line and text
+#
+# argument
+# text of the whole @def, line and associated text.
+sub t2h_roff_def($)
+{
+ my $text = shift;
+ return $text;
+}
+
+# a whole menu
+#
+# argument:
+# the whole menu text (entries and menu comments)
+#
+# argument:
+# whole menu text.
+sub t2h_roff_menu($)
+{
+ my $text = shift;
+ chomp $text;
+ return ".(l M\n\\&\\s8" . gdt('Menu:') . "\n" . $text . "\\&\\s0\n.)l\n";
+}
+
+# a simple menu entry ref in case we aren't in a standard menu context
+sub t2h_roff_simple_menu_link($$$$$$$)
+{
+ my $entry = shift;
+ my $preformatted = shift; # We assume this is true.
+ my $href = shift;
+ my $node = shift;
+ my $title = shift;
+ my $ending = shift;
+ my $has_title = shift;
+ $title = '' unless ($has_title);
+ $title .= ':' if ($title ne '');
+ return "$MENU_SYMBOL$title$node$ending";
+}
+
+# formats a menu entry link pointing to a node or section
+#
+# arguments:
+# the entry text
+# the state, a hash reference holding informations about the context, with a
+# usefull entry, 'preformatted', true if we are in a preformatted format
+# (a format keeping space between words). In that case a function
+# of the main program, main::do_preformatted($text, $state) might
+# be used to format the text with the current format style.
+# href is optionnal. It is the reference to the section or the node anchor
+# which should be used to make the link (typically it is the argument
+# of a href= attribute in a <a> element).
+sub t2h_roff_menu_link($$$$$$)
+{
+ my $entry = shift;
+ my $state = shift;
+ my $href = shift;
+ my $node = shift;
+ my $title = shift;
+ my $ending = shift;
+ my $has_title = shift;
+ $title = '' unless ($has_title);
+ $title .= ':' if ($title ne '');
+ return "$MENU_SYMBOL$title$node$ending";
+}
+
+# formats a menu entry description, ie the text appearing after the node
+# specification in a menu entry an spanning until there is another
+# menu entry, an empty line or some text at the very beginning of the line
+# (we consider that text at the beginning of the line begins a menu comment)
+#
+# arguments:
+# the description text
+# the state. See menu_entry.
+sub t2h_roff_menu_description($$)
+{
+ my $text = shift;
+ my $state = shift;
+ return $text;
+}
+
+# a menu comment (between menu lines)
+# formats the container of a menu comment. A menu comment is any text
+# appearing between menu lines, either separated by an empty line from
+# the preceding menu entry, or a text beginning at the first character
+# of the line (text not at the very beginning of the line is considered to
+# be the continuation of a menu entry description text).
+#
+# The text itself is considered to be in a preformatted environment
+# with name 'menu-commment' and with style $MENU_PRE_STYLE.
+#
+# argument
+# text contained in the menu comment.
+sub t2h_roff_menu_comment($)
+{
+ my $text = shift;
+ return $text;
+}
+
+# text after @item in table, vtable and ftable
+sub t2h_roff_table_item($$$$$)
+{
+ my $text = shift;
+ my $index_label = shift;
+ my $format = shift;
+ my $command = shift;
+# my $formatted_command = shift;
+ my $style_stack = shift;
+# my $text_formatted = shift;
+# my $text_formatted_leading_spaces = shift;
+# my $text_formatted_trailing_spaces = shift;
+ my $item_cmd = shift;
+
+
+# if (defined($text_formatted))
+# {
+# $text = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
+# }
+# $formatted_command = '' if (!defined($formatted_command) or
+# exists($special_list_commands{$format}->{$command}));
+ $text = '.ip ' . $formatted_command . protect_spaces($text) . "\n";
+ $text .= $index_label if (defined($index_label));
+ return $text;
+}
+
+# format text on the line following @item (in table, vtable and ftable)
+sub t2h_roff_table_line($)
+{
+ my $text = shift;
+ return $text;
+}
+
+# row in multitable
+sub t2h_roff_row($)
+{
+ my $text = shift;
+
+ if ($text =~ /\S/)
+ {
+ return $text ."\n" ;
+ }
+ return '';
+}
+
+# cell in multitable
+sub t2h_roff_cell($)
+{
+ my $text = shift;
+ chomp $text;
+ return protect_spaces($text) . "\\\t";
+}
+
+# format an item in a list
+#
+# argument:
+# text of the item
+sub t2h_roff_list_item($$$$$$$)
+{
+ my $text = shift;
+ my $format = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ $formatted_command = '' if (!defined($formatted_command) or
+ exists($special_list_commands{$format}->{$command}));
+ if ($text =~ /\S/)
+ {
+ #return $formatted_command . $text;
+ return $text . "\n";
+ }
+ return '';
+}
+
+# an comment
+sub t2h_roff_comment($)
+{
+ my $text = shift;
+ my $result = '';
+ while ($text)
+ {
+ $text =~ s/$;---$;/--/g;
+ $text =~ s/$;--$;/-/g;
+ $text =~ s/$;-$;/-/g;
+ $text =~ s/^(.*)//;
+ $result .= ".\\\"$1";
+ $result .= "\n" if ($text =~ s/^\n//);
+ }
+ return $result;
+}
+
+# a paragraph
+sub t2h_roff_paragraph($$$$$$$$$$)
+{
+ my $text = shift;
+ my $align = shift;
+ my $indent = shift;
+ my $paragraph_command = shift;
+ my $paragraph_command_formatted = shift;
+ my $paragraph_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ return '' if ($text =~ /^\s*$/);
+ if (defined($paragraph_number) and defined($$paragraph_number))
+ {
+ $$paragraph_number++;
+ $paragraph_command_formatted = undef if ($$paragraph_number > 1);
+ }
+# $paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
+# exists($special_list_commands{$format}->{$paragraph_command}));
+ #return $text if (defined($format) and $format eq 'multitable');
+ return $text if (defined($format) and (($format eq 'multitable') or
($format eq 'quotation') or ($format eq 'smallquotation')));
+ my $open = ".pp\n";
+ if (defined($format) and (($format eq 'itemize') or ($format eq
'enumerate')) and
+ defined($paragraph_number) and defined($$paragraph_number) and
($$paragraph_number == 1))
+ {
+ $open = ".lp\n";
+ }
+ my $close = '';
+ if ($align)
+ {
+ if ($align eq 'flushleft')
+ {
+ $open .= ".ad l\n";
+ $close .= ".ad b\n";
+ }
+ elsif ($align eq 'flushright')
+ {
+ $open .= ".ad r\n";
+ $close .= ".ad b\n";
+ }
+ elsif ($align eq 'center')
+ {
+ $open .= ".ce\n";
+ }
+ }
+ if (defined($format) and ($format eq 'enumerate') and
+ defined($paragraph_number) and defined($$paragraph_number) and
($$paragraph_number == 1) and defined($number) and ($number ne ''))
+ {
+ $open .= "$number.";
+ }
+ chomp ($text);
+ #return $open. $paragraph_command_formatted . $text . "\n" . $close;
+ return $open. $text . "\n" . $close;
+}
+
+# a preformatted region
+sub t2h_roff_preformatted($$$$$$$$$$)
+{
+ my $text = shift;
+ my $pre_style = shift;
+ my $class = shift;
+ my $leading_command = shift;
+ my $leading_command_formatted = shift;
+ my $preformatted_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ $leading_command_formatted = '' if (!defined($leading_command_formatted) or
+ exists($special_list_commands{$format}->{$leading_command}));
+
+ if (defined($format) and $format eq 'multitable')
+ {
+ my $chomped = chomp($text);
+ my $result = '\&\fR\f(CW' . $text . '\&\fR';
+ $result .= "\n" if ($chomped);
+ return $result;
+ }
+ return '' if ($text eq '');
+ if (defined($preformatted_number) and defined($$preformatted_number))
+ {
+ $$preformatted_number++;
+ $leading_command_formatted = undef if ($$preformatted_number > 1);
+ }
+ $leading_command_formatted = '' if (!defined($leading_command_formatted));
+ chomp $text;
+ my $open = '';
+ if (defined($format) and ($format eq 'enumerate') and
+ defined($paragraph_number) and defined($$paragraph_number) and
($$paragraph_number == 1) and defined($number) and ($number ne ''))
+ {
+ $open = "$number. ";
+ }
+ return $complex_format_map{$class}->{'begin_region'} .
$leading_command_formatted . $open . $text .
$complex_format_map{$class}->{'end_region'};
+}
+
+# This function formats a heading for an element
+#
+# argument:
+# an element. It is a hash reference for a node or a sectioning command.
+# The interesting keys are:
+# 'text': the heading text
+# 'name': the heading text without section number
+# 'node': true if it is a node
+# 'level': level of the element. 0 for @top, 1 for chapter, heading,
+# appendix..., 2 for section and so on...
+# 'tag_level': the sectioning element name, raisesections and lowersections
+# taken into account
+sub t2h_roff_heading($$$$$;$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+ my $one_section = shift;
+ my $element_heading = shift;
+
+ my $name = $element->{'text'};
+ if (!$element->{'node'})
+ {
+ $name = $element->{'name'};
+ }
+ return '' if ($element->{'name'} !~ /\S/);
+ my $class = $element->{'tag_level'};
+ $class = 'unnumbered' if ($class eq 'top');
+ $level = $element->{'level'};
+ $level = 3 if (!defined($level));
+ $level = 1 if ($level == 0);
+ my $heading = '';
+ $heading = ".bp\n" if ($level == 1);
+ $heading .= '.if !\n(_- \{\\' . "\n.nr _- 1\n.nr \$1 0 1\n" . '.af $1 A\}'
. "\n"
+ if ($class =~ /^appendix/);
+ $name = protect_spaces($name);
+ my $toc_entry = '\&';
+ if ($class =~ /^unnumbered/ or ($class eq 'node'))
+ {
+ $heading .= ".uh $name\n";
+ $toc_entry .= ' ';
+ }
+ elsif (($class =~ /section$/) or ($class eq 'chapter') or ($class =~
/^appendix/))
+ {
+ $heading .= ".sh $level $name\n";
+ my $number = 1;
+ while ($number < $level)
+ {
+ $toc_entry .= "\\n(\$$number.";
+ $number++;
+ }
+ $toc_entry .= "\\n(\$$number ";
+ }
+ $toc_entry .= $name;
+ return $heading . "\n" if ($class eq 'node');
+ return $heading . ".(x\n" . $toc_entry . "\n.)x\n\\&\\fR\n";
+}
+
+sub T2H_ROFF_toc_body($$$)
+{
+ my $elements_list = shift;
+ my $do_contents = shift;
+ my $do_scontents = shift;
+ if ($do_contents or $do_scontents)
+ {
+ my $lines = ".pp\n.nr % 0 1\n.af % i\n.bp \\n%+1\n.ce\n\\&\\fB" .
gdt('Table of Contents') . "\\fR\n.sp 2\n.xp\n";
+ if (!$do_contents)
+ {
+ push @{$Texi2HTML::OVERVIEW}, $lines;
+ }
+ else
+ {
+ push @{$Texi2HTML::TOC_LINES}, $lines;
+ }
+ }
+}
+
+# formatting of raw regions
+# ih L2H is true another mechanism is used for tex
+sub t2h_roff_raw($$)
+{
+ my $style = shift;
+ my $text = shift;
+ my $expanded = 1 if (grep {$style eq $_} @EXPAND);
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($expanded and
($style eq 'tex' or $style eq 'html')))
+ {
+ chomp ($text);
+ return ".(l M\n\\fR\\&\\f(CW" . &$protect_text($text) . "\\fR\n.)l\n" ;
+ }
+ elsif ($expanded)
+ {
+ main::msg_debug ("(bug) unknown style $style");
+ return &$protect_text($text);
+ }
+ return '';
+}
+
+# This function formats a footnote reference and the footnote text associated
+# with a given footnote.
+# The footnote reference is the text appearing in the main document pointing
+# to the footnote text.
+#
+# arguments:
+# absolute number of the footnote (in the document)
+# relative number of the footnote (in the page)
+# identifier for the footnote
+# identifier for the footnote reference in the main document
+# main document file
+# footnote text file
+# array with the footnote text lines
+# the state. See menu entry.
+#
+# returns:
+# reference on an array containing the footnote text lines which should
+# have been updated
+# the text for the reference pointing on the footnote text
+sub t2h_roff_foot_line_and_ref($$$$$$$)
+{
+ my $number_in_doc = shift;
+ my $number_in_page = shift;
+ my $footnote_id = shift;
+ my $place_id = shift;
+ my $document_file = shift;
+ my $footnote_file = shift;
+ my $lines = shift;
+ my $state = shift;
+
+ my $text = '';
+ my $line;
+ while (@$lines)
+ {
+ $line = shift @$lines;
+ $text .= $line;
+ }
+ chomp $text;
+ return ([], "\n.(f\n" . $text . "\n.)f\n" );
+}
+
+# formats a group of footnotes.
+#
+# argument:
+# array reference on the footnotes texts lines
+#
+# returns an array reference on the group of footnotes lines
+sub t2h_roff_foot_section($)
+{
+ my $lines = shift;
+ @$lines = ();
+}
+
+# format an image
+#
+# arguments:
+# image file name
+# image basename
+# a boolean true if we are in a preformatted format
+sub t2h_roff_image($$$$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ my $file_name = shift;
+ return "[$base src=$file_name]" if ($base ne $file_name);
+ return "[$base]";
+}
+
+# format a target in the main document for an index entry.
+#
+# arguments:
+# target identifier
+# boolean true if in preformatted format
+sub t2h_roff_index_entry_label($$$$$$$$$)
+{
+ my $identifier = shift;
+ my $preformatted = shift;
+ my $entry = shift;
+ my $index_name = shift;
+ my $index_command = shift;
+ my $texi_entry = shift;
+ my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ return ".(x $index_name\n" . protect_spaces($entry) . "\n.)x\n";
+}
+
+# process definition commands line @deffn for example
+sub t2h_roff_def_line($$$$$)
+{
+ my $category = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ my $index_label = shift;
+ $index_label = '' if (!defined($index_label));
+ $name = '' if (!defined($name) or ($name =~ /^\s*$/));
+ $type = '' if (!defined($type) or $type =~ /^\s*$/);
+ if (!defined($arguments) or $arguments =~ /^\s*$/)
+ {
+ $arguments = '';
+ }
+ else
+ {
+ $arguments = '\fI' . protect_spaces($arguments) . '\fR';
+ }
+ my $type_name = ' ';
+ $type_name = " $type" if ($type ne '');
+
+ $type_name .= '\fB' . protect_spaces($name) . '\fR' if ($name ne '');
+ $type_name .= $arguments . "\n";
+ return '\fI' . protect_spaces($category) . ':\fR' . $type_name .
$index_label;
+}
+
+# a cartouche
+sub t2h_roff_cartouche($$)
+{
+ my $text = shift;
+ return $text;
+}
+
+sub t2h_roff_sp($$)
+{
+ my $number = shift;
+ my $preformatted = shift;
+ return "\n.sp $number\n";
+}
+
+# format a whole index
+#
+# argument:
+# index text
+# index name
+sub t2h_roff_print_index($$)
+{
+ my $text = shift;
+ my $name = shift;
+ return ".xp $name\n";
+}
+
+# format an index summary. This is a list of letters linking to the letter
+# entries.
+#
+# arguments:
+# array reference containing the formatted alphabetical letters
+# array reference containing the formatted non lphabetical letters
+sub t2h_roff_index_summary($$)
+{
+ my $alpha = shift;
+ my $nonalpha = shift;
+ my $join = '';
+ my $nonalpha_text = '';
+ my $alpha_text = '';
+ return '';
+}
+
+# FIXME the following construct leads to something wrong ?
+# something @c a comment
+#
+# other thing
+sub t2h_roff_empty_line($)
+{
+ my $text = shift;
+ return '';
+}
+
+sub t2h_roff_listoffloats_entry($$$$)
+{
+ my $style_texi = shift;
+ my $float = shift;
+ my $float_style = shift;
+ my $caption = shift;
+ my $href = shift;
+ chomp ($caption);
+
+ return '.ip ' . protect_spaces($float_style) . "\n" . $caption . "\n";
+}
+
+sub t2h_roff_listoffloats($$$)
+{
+ my $style_texi = shift;
+ my $style = shift;
+ my $float_entries = shift;
+
+ my $result = ".(l L F\n.ba +5\n";
+ foreach my $float_entry (@$float_entries)
+ {
+ $result .= $float_entry;
+ }
+ return $result . ".ba -5\n.)l\n";
+}
+
+sub t2h_roff_float($$$$$)
+{
+ my $text = shift;
+ my $float = shift;
+ my $caption = shift;
+ my $shortcaption = shift;
+
+ my $caption_text = '';
+
+ if (defined($float->{'caption_texi'}))
+ {
+ $caption_text = $caption;
+ }
+ elsif (defined($float->{'shortcaption_texi'}))
+ {
+ $caption_text = $shortcaption;
+ }
+ elsif (defined($caption))
+ {
+ $caption_text = $caption;
+ }
+ chomp ($caption_text);
+ return ".(b L F\n" . $text . $caption_text . "\n.b)\n";
+}
+
+1;
Index: texi2html/examples/utf8.pm
===================================================================
RCS file: texi2html/examples/utf8.pm
diff -N texi2html/examples/utf8.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/examples/utf8.pm 9 Apr 2011 00:10:44 -0000 1.1
@@ -0,0 +1,52 @@
+# -*-perl-*-
+#+##############################################################################
+#
+# utf8.pm: convert accented letters to utf8
+#
+# This style doesn't work when outputting info.
+#
+# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+set_default('USE_ISO', 0);
+set_from_init_file('ENCODING_NAME', 'utf-8');
+
+use Encode;
+use Unicode::Normalize;
+
+foreach my $key (keys(%unicode_accents), 'dotless')
+{
+ $style_map{$key}->{'function'} = \&t2h_utf8_accent;
+ $style_map_texi{$key}->{'function'} = \&t2h_utf8_accent;
+ $style_map_pre{$key}->{'function'} = \&t2h_utf8_accent;
+}
+
+foreach my $key (%things_map)
+{
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+ $things_map{$key} = chr(hex($unicode_map{$key}));
+ $texi_map{$key} = chr(hex($unicode_map{$key}));
+ $sorting_things_map{$key} = chr(hex($unicode_map{$key}));
+ $pre_map{$key} = chr(hex($unicode_map{$key}));
+ }
+}
+
+$normal_text = \&t2h_utf8_normal_text;
+
+1;
Index: texi2html/examples/xhtml.pm
===================================================================
RCS file: texi2html/examples/xhtml.pm
diff -N texi2html/examples/xhtml.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/examples/xhtml.pm 9 Apr 2011 00:10:44 -0000 1.1
@@ -0,0 +1,218 @@
+# -*-perl-*-
+#+##############################################################################
+#
+# xhtml.pm: convert to well-formed xhtml transitional
+# !!!!!!! This is very out of date!!!!
+#
+# Copyright (C) 2003 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+# FIXME this is out of date. There are still the T2H_ prefixes!
+
+# APA: Add SystemLiteral to identify the canonical DTD.
+# [Definition:] The SystemLiteral is called the entity's system
+# identifier. It is a URI, which may be used to retrieve the entity.
+# See http://www.xml.com/axml/target.html#NT-ExternalID
+set_default('DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Transitional//EN" "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd";>');
+
+set_default('FRAMESET_DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Frameset//EN" "http://www.w3.org/TR/xhtml1/xhtml1-frameset.dtd";>');
+
+# -iso
+# if set, ISO8859 characters are used for special symbols (like copyright, etc)
+# FIXME certainly obsoleted by t2h_default_set_iso_symbols which should
+# certainly ba called indirectly through html_default_load
+set_default('USE_ISO', 1);
+
+# horizontal rules
+$SMALL_RULE = '<hr size="1"/>';
+$DEFAULT_RULE = '<hr/>';
+$MIDDLE_RULE = '<hr size="2"/>';
+$BIG_RULE = '<hr size="6"/>';
+
+# this is added inside <head></head> after <title> and some <meta name>
+# stuff, it can be used for eg. <style>, <script>, <meta> etc. tags.
+$EXTRA_HEAD = '';
+
+$print_page_head = \&T2H_XHTML_print_page_head;
+$print_page_foot = \&T2H_XHTML_print_page_foot;
+$print_frame = \&T2H_XHTML_print_frame;
+$button_icon_img = \&T2H_XHTML_button_icon_img;
+
+#FIXME update once it is more stabilized in texi2html.pm
+sub T2H_XHTML_print_page_head
+{
+ my $fh = shift;
+ my $longtitle = "$Texi2HTML::THISDOC{'title_no_texi'}";
+ $longtitle .= ": $Texi2HTML::NO_TEXI{'This'}" if exists
$T2H_NO_TEXI{'This'};
+ my $doctype = get_conf('doctype');
+ my $bodytext = get_conf('BODYTEXT');
+ print $fh <<EOT;
+<?xml version="1.0" encoding="iso-8859-1"?>
+$doctype
+<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="$T2H_LANG"
lang="$T2H_LANG">
+$T2H_THISDOC{'copying'}<!-- Created on $Texi2HTML::THISDOC{today} by
$Texi2HTML::THISDOC{program} -->
+<!--
+$Texi2HTML::THISDOC{program_authors}
+-->
+<head>
+<title>$longtitle</title>
+
+<meta name="description" content="$longtitle"/>
+<meta name="keywords" content="$longtitle"/>
+<meta name="resource-type" content="document"/>
+<meta name="distribution" content="global"/>
+<meta name="Generator" content="$T2H_THISDOC{program}"/>
+$EXTRA_HEAD
+</head>
+
+<body $bodytext>
+$AFTER_BODY_OPEN
+EOT
+}
+
+# <span> instead of <font>
+sub T2H_XHTML_print_page_foot
+{
+ my $fh = shift;
+ print $fh <<EOT;
+<p>
+ <span style="font-size: smaller">
+ This document was generated $ADDRESS
+ using <a
href="$T2H_THISDOC{program_homepage}"><i>$Texi2HTML::THISDOC{program}</i></a>.
+ </span>
+ <br/>
+$PRE_BODY_CLOSE
+</p>
+</body>
+</html>
+EOT
+}
+
+sub T2H_XHTML_print_frame
+{
+ my $fh = shift;
+ my $toc_file = shift;
+ my $main_file = shift;
+ my $doctype = get_conf('FRAMESET_DOCTYPE');
+ print $fh <<EOT;
+$doctype
+<html>
+<head><title>$Texi2HTML::THISDOC{title}</title></head>
+<frameset cols="140,*">
+ <frame name="toc" src="$toc_file"/>
+ <frame name="main" src="$main_file"/>
+</frameset>
+</html>
+EOT
+}
+
+# / in <img>
+sub T2H_XHTML_button_icon_img
+{
+ my $button = shift;
+ my $icon = shift;
+ my $name = shift;
+ return '' if (!defined($icon));
+ if (defined($name) && $name)
+ {
+ $name = ": $name";
+ }
+ else
+ {
+ $name = '';
+ }
+ $button = "" if (!defined ($button));
+ return qq{<img src="$icon" border="0" alt="$button$name" align="middle"/>};
+}
+
+$simple_map{'*'} = '<br/>';
+
+# formatting functions
+
+$def_line = \&t2h_xhtml_def_line;
+$index_summary = \&t2h_xhtml_index_summary;
+$image = \&t2h_xhtml_image;
+
+# need / in <img>
+sub t2h_xhtml_image($$$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ return "[ $base ]" if ($preformatted);
+ return "<img src=\"$file\" alt=\"$base\"/>";
+}
+
+# process definition commands line @deffn for example
+# <u> replaced by <span>
+sub t2h_xhtml_def_line($$$$$)
+{
+ my $category = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ my $index_label = shift;
+ $index_label = '' if (!defined($index_label));
+ $name = '' if (!defined($name) or ($name =~ /^\s*$/));
+ $type = '' if (!defined($type) or $type =~ /^\s*$/);
+ if (!defined($arguments) or $arguments =~ /^\s*$/)
+ {
+ $arguments = '';
+ }
+ else
+ {
+ $arguments = '<i>' . $arguments . '</i>';
+ }
+ my $type_name = '';
+ $type_name = " $type" if ($type ne '');
+ $type_name .= ' <b>' . $name . '</b>' if ($name ne '');
+ $type_name .= $arguments . "\n";
+ if (! get_conf('DEF_TABLE'))
+ {
+ return '<dt>'. '<span style="text-decoration: underline">' . $category
. ':</span>' . $type_name . $index_label . "</dt>\n";
+ }
+ else
+ {
+
+ return "<tr>\n<td align=\"left\">" . $type_name .
+ "</td>\n<td align=\"right\">" . $category . $index_label . "</td>\n" .
"</tr>\n";
+ }
+}
+
+# There is a br which needs /
+sub t2h_xhtml_index_summary($$)
+{
+ my $alpha = shift;
+ my $nonalpha = shift;
+ my $join = '';
+ my $nonalpha_text = '';
+ my $alpha_text = '';
+ $join = " \n<br/>\n" if (@$nonalpha and @$alpha);
+ if (@$nonalpha)
+ {
+ $nonalpha_text = join("\n \n", @$nonalpha) . "\n";
+ }
+ if (@$alpha)
+ {
+ $alpha_text = join("\n \n", @$alpha) . "\n \n";
+ }
+ #I18n
+ return "<table><tr><th valign=\"top\">Jump to: </th><td>" .
+ $nonalpha_text . $join . $alpha_text . '</td></tr></table>';
+}
Index: texi2html/formats/docbook.pm
===================================================================
RCS file: texi2html/formats/docbook.pm
diff -N texi2html/formats/docbook.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/formats/docbook.pm 9 Apr 2011 00:10:44 -0000 1.1
@@ -0,0 +1,1573 @@
+#+##############################################################################
+#
+# docbook.pm: convert to docbook
+#
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+
+# regarding sections and nodes, in docbook we don't care at all about the
+# splitting done in the main program. When there is a node, it is recorded as
+# being pending. When there is a section it is opened, and closed when
+# there is the next section or end of file.
+
+use strict;
+
+my %docbook_complex_format;
+my $kept_footnote_function;
+my $docbook_in_footnote;
+my %docbook_sections;
+my %def_format_docbook;
+my %def_argument_types_docbook;
+
+my $docbook_pending_node_id;
+my $docbook_current_section;
+my @docbook_multitable_stack = ();
+my @docbook_table_stack = ();
+my @docbook_special_quotation;
+
+
+sub docbook_default_load(;$)
+{
+my $from_command_line = shift;
+
+t2h_default_set_variables_xml();
+set_default('DOCTYPE', '<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML
V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; [
+ <!ENTITY tex "TeX">
+ <!ENTITY latex "LaTeX">
+]>');
address@hidden = ('docbook');
address@hidden = ('eps', 'gif', 'jpg', 'jpeg', 'pdf', 'png', 'svg', 'txt');
+set_default('INLINE_INSERTCOPYING', 1);
+# this should lead to end_section being only called at the end of sectioning
+set_default('USE_NODES', 0);
+set_default('USE_SECTIONS', 1);
+
+set_default('SHOW_MENU', 0);
+set_default('SHOW_TITLE', 0);
+set_default('HEADERS', 0);
+set_default('SPLIT', '');
+# certainly irrelevant
+set_default('SIMPLE_MENU', 0);
+
+t2h_default_push_handler(\&docbook_initialize_variables, address@hidden);
+
+%style_map = ();
+t2h_default_copy_style_map (\%default_style_map, \%style_map);
+foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
+{
+ $style_map{$accent_command} = { 'function' => \&xml_default_accent };
+}
+
+delete $style_map{'sc'}->{'inline_attribute'};
+# FIXME there is a code element in v4.3
+$style_map{'code'}->{'inline_attribute'} = 'literal';
+$style_map{'strong'}->{'inline_attribute'} = 'emphasis role="bold"';
+$style_map{'kbd'}->{'inline_attribute'} = 'userinput';
+$style_map{'w'}->{'end'} = '<!-- /@w -->';
+$style_map{'='}->{'function'} = \&docbook_macron;
+$style_map{'b'}->{'inline_attribute'} = 'emphasis role="bold"';
+$style_map{'cite'}->{'inline_attribute'} = 'citetitle';
+$style_map{'command'}->{'inline_attribute'} = 'command';
+$style_map{'dfn'}->{'inline_attribute'} = 'firstterm';
+$style_map{'emph'}->{'inline_attribute'} = 'emphasis';
+$style_map{'env'}->{'inline_attribute'} = 'envar';
+$style_map{'file'}->{'inline_attribute'} = 'filename';
+$style_map{'i'}->{'inline_attribute'} = 'wordasword';
+$style_map{'key'}->{'inline_attribute'} = 'keycap';
+delete $style_map{'key'}->{'begin'};
+delete $style_map{'key'}->{'end'};
+$style_map{'option'}->{'inline_attribute'} = 'option';
+$style_map{'t'}->{'inline_attribute'} = 'literal';
+delete $style_map{'sansserif'}->{'inline_attribute'};
+delete $style_map{'r'}->{'inline_attribute'};
+$style_map{'indicateurl'}->{'inline_attribute'} = 'wordasword';
+delete $style_map{'indicateurl'}->{'begin'};
+delete $style_map{'indicateurl'}->{'end'};
+$style_map{'var'}->{'inline_attribute'} = 'replaceable';
+delete $style_map{'verb'}->{'inline_attribute'};
+$style_map{'email'}->{'function'} = \&docbook_email;
+$style_map{'math'}->{'function'} = \&docbook_math;
+$style_map{'uref'}->{'function'} = \&docbook_uref;
+$style_map{'url'}->{'function'} = \&docbook_uref;
+$style_map{'titlefont'}->{'function'} = \&docbook_titlefont;
+#$style_map{'samp'}->{'function'} = \&docbook_samp;
+#delete $style_map{'samp'}->{'inline_attribute'};
+$style_map{'samp'}->{'inline_attribute'} = 'literal';
+$style_map{'samp'}->{'begin'} = '‘';
+$style_map{'samp'}->{'end'} = '’';
+
+$kept_footnote_function = $style_map{'footnote'}->{'function'};
+$style_map{'footnote'}->{'function'} = \&docbook_footnote;
+
+foreach my $style (keys(%style_map))
+{
+ delete ($style_map{$style}->{'quote'});
+}
+
+#use Data::Dumper;
+%style_map_pre = ();
+t2h_default_copy_style_map (\%style_map, \%style_map_pre);
+
+$style_map_pre{'r'}->{'inline_attribute'} = 'lineannotation';
+
+$colon_command_punctuation_characters{'.'} = '.';
+$colon_command_punctuation_characters{':'} = ':';
+$colon_command_punctuation_characters{'?'} = '?';
+$colon_command_punctuation_characters{'!'} = '!';
+
+$stop_paragraph_command{'titlefont'} = 0;
+
+# FIXME
+#$no_paragraph_commands{'anchor'} = 0;
+
+# FIXME
+delete $special_accents{'ringaccent'};
+$special_accents{'ogonek'} = 'aeiuAEIU';
+
+%simple_map = %default_simple_map;
+%simple_map_pre = %simple_map;
+
+# FIXME right? ł Ł
+$things_map{'l'} = '/l';
+$things_map{'L'} = '/L';
+$things_map{'TeX'} = '&tex;';
+$things_map{'LaTeX'} = '&latex;';
+$things_map{'enddots'} = '….';
+$things_map{'minus'} = '−';
+# FIXME ∗
+$things_map{'point'} = '-!-';
+# FIXME ≡
+$things_map{'equiv'} = '==';
+# FIXME no ‹ nor ›
+$things_map{'guilsinglright'} = '>';
+$things_map{'guilsinglleft'} = '<';
+# The following is unneeded because normal_text is redefined.
+# FIXME it should certainly be better to leave those substitutions,
+# or even hardcodes them in normal_text.
+# t2h_remove_text_substitutions("'", 1, 0, 0, 1);
+# t2h_remove_text_substitutions('`', 1, 0, 0, 1);
+
+$things_map{'quotedblbase'} = '„';
+$things_map{'quotesinglbase'} = '‚';
+
+%pre_map = %things_map;
+
+#delete $inter_item_commands{'cindex'};
+
+#$no_paragraph_commands{'cindex'} = 0;
+$no_paragraph_commands{'float'} = 0;
+
+%docbook_complex_format = (
+ 'example' => 'screen',
+ 'smallexample' => 'screen',
+ 'display' => 'literallayout',
+ 'smalldisplay' => 'literallayout',
+ 'lisp' => 'programlisting',
+ 'smalllisp' => 'programlisting',
+ 'format' => 'abstract',
+ 'smallformat' => 'screen'
+);
+
+%docbook_sections = (
+ 'top' => 'chapter',
+ 'part' => 'part',
+ 'chapter' => 'chapter',
+ 'unnumbered' => 'chapter',
+ 'centerchap' => 'chapter',
+ 'appendix' => 'appendix',
+ 'majorheading' => 'other',
+ 'chapheading' => 'other',
+ 'heading' => 'sect1',
+ 'subheading' => 'sect2',
+ 'subsubheading' => 'sect3',
+ 2 => 'sect1',
+ 3 => 'sect2',
+ 4 => 'sect3'
+);
+
+%def_format_docbook = (
+ 'deffn' => [ ['function', 'name'] ],
+ 'defvr' => [ ['varname', 'name'] ],
+ 'deftypefn' => [ [ 'returnvalue', 'type' ], ['function', 'name'] ],
+ 'deftypeop' => [ ['returnvalue', 'type'], ['methodname', 'name'] ],
+ 'deftypevr' => [ ['returnvalue', 'type'], ['varname', 'name'] ],
+ 'defcv' => [ ['classname', 'class'], ['property', 'name'] ],
+ 'deftypecv' => [ ['returnvalue', 'type'], ['property', 'name'] ],
+ 'defop' => [ ['classname', 'class'], ['methodname', 'name'] ],
+ 'deftp' => [ ['structname', 'name'] ]
+);
+
+%def_argument_types_docbook = (
+ 'param' => 'replaceable',
+ 'paramtype' => 'type',
+ 'delimiter' => ''
+);
+
address@hidden = ('note', 'caution', 'important', 'tip', 'warning');
+
+$region_formats_kept{'copying'} = 1;
+
+%format_map = (
+ 'group' => '',
+ 'raggedright' => '',
+ 'copying' => 'copying',
+ );
+
+$print_Top = \&docbook_print_Top;
+$print_Top_footer = \&docbook_print_Top_footer;
+$print_page_head = \&docbook_print_page_head;
+$print_foot_navigation = \&docbook_noop;
+$contents = \&docbook_noop;
+$shortcontents = \&docbook_noop;
+$about_body = \&docbook_noop;
+$print_page_foot = \&docbook_print_page_foot;
+$end_section = \&docbook_end_section;
+$one_section = \&docbook_one_section;
+
+$acronym_like = \&docbook_acronym_like;
+$anchor_label = \&docbook_anchor_label;
+$begin_format_texi = \&docbook_begin_format_texi;
+$cartouche = \&docbook_cartouche;
+$cell = \&docbook_cell;
+$complex_format = \&docbook_complex_format;
+$def = \&docbook_def;
+$def_line = \&docbook_def_line;
+$def_item = \&docbook_def_item;
+$element_label = \&docbook_element_label;
+$external_ref = \&docbook_external_ref;
+$float = \&docbook_float;
+$foot_line_and_ref = \&docbook_foot_line_and_ref;
+$format = \&docbook_format;
+$format_list_item_texi = \&docbook_format_list_item_texi;
+$heading = \&docbook_heading;
+$image = \&docbook_image;
+$image_files = \&docbook_image_files;
+$index_entry_command = \&docbook_index_entry_command;
+$index_entry_label = \&docbook_index_entry_label;
+$index_summary = \&docbook_index_summary;
+$internal_ref = \&docbook_internal_ref;
+$insertcopying = \&docbook_insertcopying;
+$list_item = \&docbook_list_item;
+$misc_element_label = \&docbook_noop;
+$normal_text = \&docbook_normal_text;
+$paragraph = \&docbook_paragraph;
+$preformatted = \&docbook_preformatted;
+$printindex = \&docbook_printindex;
+$protect_text = \&xml_default_protect_text;
+$quotation = \&docbook_quotation;
+$quotation_prepend_text = \&docbook_quotation_prepend_text;
+$listoffloats = \&docbook_noop;
+$raw = \&docbook_raw;
+$row = \&docbook_row;
+$sp = \&docbook_sp;
+$style = \&docbook_style;
+$table_item = \&docbook_table_item;
+$table_line = \&docbook_table_line;
+$table_list = \&docbook_table_list;
+$misc_command_line = \&docbook_misc_commands;
+
+
+}
+
+sub docbook_footnote
+{
+ $docbook_in_footnote = 1;
+ my $result = &$kept_footnote_function(@_);
+ $docbook_in_footnote = 0;
+ return $result;
+}
+
+sub docbook_macron($$)
+{
+ my $accent = shift;
+ my $args = shift;
+ return $args->[0] . "¯";
+}
+
+sub docbook_samp($$)
+{
+ shift;
+ my $args = shift;
+ return "‘<literal>$args->[0]</literal>’";
+}
+
+sub docbook_email($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $mail = shift @$args;
+ my $text = shift @$args;
+ $mail = main::normalise_space($mail);
+ if (defined($text) and $text =~ /\S/)
+ {
+ # FIXME normalise_space would be more legible.
+ #return docbook_add_id('ulink').'
url="mailto:'.$mail.'">'.main::normalise_space($text).'</ulink>';
+ return docbook_add_id('ulink').'
url="mailto:'.$mail.'">'.$text.'</ulink>';
+ }
+ return docbook_add_id('email').">$mail</email>";
+}
+
+sub docbook_uref($$)
+{
+ shift;
+ my $args = shift;
+ my $url = shift @$args;
+ my $text = shift @$args;
+ my $replacement = shift @$args;
+ $url = main::normalise_space($url);
+ $text = '' if (!defined($text));
+ $replacement = '' if (!defined($replacement));
+ $replacement = $text if ($replacement eq '');
+ $replacement = $url if ($replacement eq '');
+ $replacement = main::normalise_space($replacement);
+
+ return docbook_add_id('ulink')." url=\"$url\">$replacement</ulink>";
+}
+
+# FIXME
+sub docbook_titlefont($$)
+{
+ shift;
+ my $args = shift;
+ return "$args->[0]";
+}
+
+# FIXME there ought to be something better... Like use tex4ht mathml
+# output or something like that
+sub docbook_math($$)
+{
+ shift;
+ my $args = shift;
+ my $text = shift @$args;
+ return $text;
+}
+
+
+sub docbook_print_page_head($)
+{
+ my $fh = shift;
+ my $language = get_conf('documentlanguage');
+ my $doctype = get_conf('DOCTYPE');
+ my $extension = get_conf('EXTENSION');
+ print $fh <<EOT;
+<?xml version="1.0"?>
+$doctype
+<book id="$Texi2HTML::THISDOC{'file_base_name'}.$extension" lang="$language">
+EOT
+}
+
+sub docbook_print_page_foot($)
+{
+ my $fh = shift;
+ print $fh "". docbook_close_section();
+ print $fh <<EOT;
+</book>
+EOT
+}
+
+sub docbook_print_Top($$$)
+{
+ my $fh = shift;
+ my $has_top_heading = shift;
+ my $element = shift;
+ main::print_lines($fh, $Texi2HTML::THIS_SECTION);
+}
+
+sub docbook_element_tag($)
+{
+ my $element = shift;
+#print STDERR "$element->{'texi'}, $element->{'tag_level'},
$element->{'level'}\n";
+ return $docbook_sections{$element->{'tag_level'}} if
(exists($docbook_sections{$element->{'tag_level'}}));
+ return $docbook_sections{$element->{'level'}} if
(exists($docbook_sections{$element->{'level'}}));
+}
+
+sub docbook_node_id($)
+{
+ my $node_texi = shift;
+ my $node = main::substitute_line($node_texi, 'docbook node id',
{'code_style' => 1, 'remove_texi' => 1});
+ $node =~ s/[\s\"]/-/g;
+ return &$protect_text($node);
+}
+
+sub docbook_initialize_variables()
+{
+ $docbook_pending_node_id = undef;
+ $docbook_current_section = undef;
+ @docbook_multitable_stack = ();
+ @docbook_table_stack = ();
+}
+
+sub docbook_add_id($)
+{
+ my $element = shift;
+ my $result = "<$element";
+ if (defined($docbook_pending_node_id) and (!$docbook_in_footnote or
$element eq 'footnote'))
+ {
+ $result .= " id=\"$docbook_pending_node_id\"";
+ $docbook_pending_node_id = undef;
+ }
+ return $result;
+}
+
+sub docbook_heading($$$$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+
+ if (defined($command) and $command =~ /heading/)
+ {
+ my $text = '';
+ if (defined($line))
+ {
+ $text = $line;
+ # this isn't done in main program in that case...
+ chomp ($text);
+ $text =~ s/^\s*//;
+ }
+ return docbook_add_id('bridgehead')."
renderas=\"$docbook_sections{$command}\">$text</bridgehead>\n";
+ }
+
+ my $result = '';
+
+# FIXME verify xreflabel
+ if ($command ne 'node')
+ {
+ # close previous section
+ $result .= docbook_close_section();
+ my $title = $element->{'text_nonumber'};
+ my $label = '';
+ my $xreflabel = '';
+ if ($element->{'number'})
+ {
+ my $label_nr = $element->{'number'};
+ #$label_nr =~ s/\.$//;
+ $label = $label_nr;
+ }
+ else
+ {
+ my $xreftitle = $title;
+ $xreflabel = " xreflabel=\"$xreftitle\"";
+ }
+ $result .= docbook_add_id(docbook_element_tag($element) . "
label=\"${label}\"${xreflabel}");
+ $result .= ">\n<title>$title</title>\n";
+ $docbook_current_section = $element;
+ }
+ return $result;
+}
+
+sub docbook_element_label($$$$)
+{
+ my $id = shift;
+ my $element = shift;
+ my $command = shift;
+ my $line = shift;
+
+ if ($command eq 'node')
+ {
+ $docbook_pending_node_id = docbook_node_id($element->{'texi'});
+ }
+ return '';
+}
+
+sub docbook_paragraph($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $align = shift;
+ my $indent = shift;
+ my $paragraph_command = shift;
+ my $paragraph_command_formatted = shift;
+ my $paragraph_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+ if (defined($paragraph_number) and defined($$paragraph_number))
+ {
+ $$paragraph_number++;
+ }
+
+ # no para in multitables, caption and shortcaptions.
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+ return $text if ($top_stack eq 'multitable' or $top_stack eq
'shortcaption' or $top_stack eq 'caption' or $top_stack eq
'documentdescription');
+
+ if ($text =~ /\S/)
+ {
+ #return docbook_add_id('para').">$text</para>";
+ return "<para>$text</para>";
+ }
+ return $text;
+}
+
+
+sub docbook_def_line($$$$$$$$$$$$$$$)
+{
+ my $category_prepared = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ my $index_label = shift;
+ my $arguments_array = shift;
+ my $arguments_type_array = shift;
+ my $unformatted_arguments_array = shift;
+ my $command = shift;
+ my $class_name = shift;
+ my $category = shift;
+ my $class = shift;
+ my $style = shift;
+ my $original_command = shift;
+
+ my %unformatted_arguments = ();
+
+ my @unformatted_args = @$unformatted_arguments_array;
+ foreach my $type (@$arguments_type_array)
+ {
+ my $unformatted_arg = shift @unformatted_args;
+ $unformatted_arguments{$type} = $unformatted_arg;
+ }
+ # FIXME unformatted!
+ my $result = "<synopsis
role=\"$unformatted_arguments{'category'}\"><indexterm role=\""
+
.$main::index_prefix_to_name{$style}."\"><primary>$class_name</primary></indexterm>";
+
+ my %arguments = ( 'prepared_category' => $category_prepared,
+ 'category' => $category,
+ 'name' => $name,
+ 'type' => $type,
+ 'class' => $class
+ );
+ foreach my $type (keys(%arguments))
+ {
+ $arguments{$type} = '' if (!defined($arguments{$type}));
+ }
+
+ foreach my $mandatory_arg (@{$def_format_docbook{$command}})
+ {
+ my $elem = $mandatory_arg->[0];
+ #if ($elem eq 'returnvalue' and
$unformatted_arguments{$mandatory_arg->[1]} =~ /address@hidden/)
+ if ($elem eq 'returnvalue' and
$unformatted_arguments{$mandatory_arg->[1]} =~ /address@hidden/)
+ {
+ # FIXME unformatted
+ my $arg_without_at_command =
$unformatted_arguments{$mandatory_arg->[1]};
+ #$arg_without_at_command =~ s/address@hidden//;
+ #$arg_without_at_command =~ s/\}\s*$//;
+ while ($arg_without_at_command =~ /address@hidden([^\{\}]*)\}/)
+ {
+ $arg_without_at_command =~ s/address@hidden([^\{\}]*)\}/$1/;
+ }
+ $result .= "<$elem>$arg_without_at_command</$elem>";
+ }
+ else
+ {
+ $result .= "<$elem>$arguments{$mandatory_arg->[1]}</$elem>";
+ }
+ }
+
+ my @types = @$arguments_type_array;
+ @unformatted_args = @$unformatted_arguments_array;
+ foreach my $arg (@$arguments_array)
+ {
+ my $type = shift @types;
+ my $unformatted = shift @unformatted_args;
+ if (exists ($def_argument_types_docbook{$type}))
+ {
+ if ($def_argument_types_docbook{$type} and
+ ($type eq 'paramtype' or ($unformatted !~ /address@hidden/)))
+ {
+ $result .=
"<$def_argument_types_docbook{$type}>$arg</$def_argument_types_docbook{$type}>";
+ }
+ else
+ {
+ $result .= $arg;
+ }
+ }
+ }
+
+ $result .= "</synopsis>\n";
+ return $result;
+}
+
+# FIXME
+# @deffn
+# @c comment
+# @end deffn
+# leads to the creation of a <definitionitem> with a comment within,
+# while there should be no definitionitem
+sub docbook_def_item($)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+
+ if ($text =~ /\S/)
+ {
+ return '<blockquote>' . $text . '</blockquote>' unless
$only_inter_item_commands;
+ return $text;
+ }
+ return '';
+}
+
+sub docbook_def($)
+{
+ my $text = shift;
+ return docbook_add_id('informalfigure').'>'.$text.'</informalfigure>';
+}
+
+sub docbook_preformatted($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $pre_style = shift;
+ my $class = shift;
+ my $leading_command = shift;
+ my $leading_command_formatted = shift;
+ my $preformatted_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+ return $text;
+}
+
+sub docbook_misc_commands($$$$$)
+{
+ my $macro = shift;
+ my $line = shift;
+ my $args = shift;
+ my $stack = shift;
+ my $state = shift;
+#print STDERR "$macro $line";
+#print STDERR "ARGS @$args\n" if defined ($args);
+ #my $result_text = undef;
+ my $result_text = undef;
+ if ($macro eq 'c' or $macro eq 'comment' and scalar(@$args))
+ {
+ my $comment_line = $args->[0];
+ chomp ($comment_line);
+ # makeinfo remove all the leading spaces
+ $comment_line =~ s/^\s//;
+ $result_text = &$comment ($comment_line);
+ }
+ elsif ($macro eq 'settitle')
+ {
+ # FIXME to be formatted? Also maybe in line_command. And in html, it
+ # is handled by heading _text
+ my $arg = $args->[0];
+ $arg =~ s/^\s*//;
+ chomp($arg);
+ $result_text = "<title>$arg</title>\n";
+ }
+ return ($macro, $line, $result_text);
+}
+
+sub docbook_foot_line_and_ref($$$$$$$)
+{
+ my $number_in_doc = shift;
+ my $number_in_page = shift;
+ my $footnote_id = shift;
+ my $place_id = shift;
+ my $document_file = shift;
+ my $footnote_file = shift;
+ my $lines = shift;
+ my $state = shift;
+
+ my $result = docbook_add_id('footnote').'>';
+ foreach my $line (@$lines)
+ {
+ $result .= $line;
+ }
+ return ([], $result . '</footnote>');
+}
+
+sub docbook_any_ref($$$)
+{
+ my $type = shift;
+ my $args = shift;
+ my $unformatted_args = shift;
+
+ # FIXME?
+ if ($type eq 'inforef')
+ {
+ my $node_file = "($args->[2])$args->[0]";
+ if ($args->[1] ne '')
+ {
+ return "*note $args->[1]: $node_file";
+ }
+ else
+ {
+ return "*note ${node_file}::";
+ }
+ }
+ else
+ {
+ if (($args->[3] ne '') or ($args->[4] ne ''))
+ {
+ return '' if ($args->[4] eq '');
+ my $section_name = $args->[2];
+ $section_name = $args->[0] if ($section_name eq '');
+ if ($type eq 'ref')
+ {
+ return gdt('section address@hidden'@asis{}\' in
@cite{{book}}', { 'section_name' => $section_name, 'book' => $args->[4]
},{'duplicate'=>1});
+ }
+ elsif ($type eq 'xref')
+ {
+ return gdt('See section address@hidden'@asis{}\' in
@cite{{book}}', { 'section_name' => $section_name, 'book' => $args->[4]
},{'duplicate'=>1});
+ }
+ elsif ($type eq 'pxref')
+ {
+ return gdt('see section address@hidden'@asis{}\' in
@cite{{book}}', { 'section_name' => $section_name, 'book' => $args->[4]
},{'duplicate'=>1});
+ }
+ }
+ my $link = docbook_node_id($unformatted_args->[0]);
+ my $title = $args->[2];
+ $title = $args->[1] if ($title eq '');
+ if ($title eq '')
+ {
+ if ($type eq 'ref')
+ {
+ return gdt('{ref}', {'ref' => docbook_add_id('xref')."
linkend=\"$link\"></xref>"});
+ }
+ elsif ($type eq 'pxref')
+ {
+ return gdt('see {ref}', {'ref' => docbook_add_id('xref')."
linkend=\"$link\"></xref>"});
+ }
+ elsif ($type eq 'xref')
+ {
+ return gdt('See {ref}', {'ref' => docbook_add_id('xref')."
linkend=\"$link\"></xref>"});
+ }
+ }
+ else
+ {
+ if ($type eq 'ref')
+ {
+ return gdt('{title_ref}', {'title_ref' =>
docbook_add_id('link')." linkend=\"$link\">$title</link>"});
+ }
+ elsif ($type eq 'pxref')
+ {
+ return gdt('see {title_ref}', {'title_ref' =>
docbook_add_id('link')." linkend=\"$link\">$title</link>"},{'duplicate'=>1});
+ }
+ elsif ($type eq 'xref')
+ {
+ return gdt('See {title_ref}', {'title_ref' =>
docbook_add_id('link')." linkend=\"$link\">$title</link>"},{'duplicate'=>1});
+ }
+ }
+ }
+}
+
+sub docbook_external_ref($$$$$$$$$)
+{
+ my $type = shift;
+ my $section = shift;
+ my $book = shift;
+ my $file = shift;
+ my $href = shift;
+ my $cross_ref = shift;
+ my $args_texi = shift;
+ my $formatted_args = shift;
+ my $node = shift;
+
+ return docbook_any_ref ($type, $formatted_args, $args_texi);
+}
+
+sub docbook_internal_ref($$$$$)
+{
+ my $type = shift;
+ my $href = shift;
+ my $short_name = shift;
+ my $name = shift;
+ my $is_section = shift;
+ my $args_texi = shift;
+ my $formatted_args = shift;
+
+ return docbook_any_ref ($type, $formatted_args, $args_texi );
+}
+
+sub docbook_index_entry_command($$$$$)
+{
+ my $command = shift;
+ my $index_name = shift;
+ my $label = shift;
+ my $entry_texi = shift;
+ my $entry_formatted = shift;
+
+ return $label if (defined($label) and $label ne '');
+ return
docbook_index_entry_label('','','',$main::index_prefix_to_name{$index_name},
'', '', $entry_formatted, {});
+}
+
+sub docbook_index_entry_label($$$$$$$$$)
+{
+ my $identifier = shift;
+ my $preformatted = shift;
+ my $entry = shift;
+ my $index_name = shift;
+ my $index_command = shift;
+ my $texi_entry = shift;
+ my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry = shift;
+
+ return "<indexterm
role=\"${index_name}\"><primary>${formatted_entry}</primary></indexterm>";
+}
+
+sub docbook_close_section()
+{
+ my $element = $docbook_current_section;
+
+ if (!defined($element))
+ {
+ return '';
+ }
+
+ my $result = '';
+
+ # there is a special case for a @chapter that is a child of @top
+ # but should not be considered as is, since it is also toplevel.
+ # @part, however may have other toplevel elements as children.
+ return '' if ($element->{'child'} and (!$element->{'child'}->{'toplevel'}
or $element->{'tag'} ne 'top'));
+ $result .= '</'.docbook_element_tag($element).">\n";
+
+ my $current = $element;
+ # the second condition is such that top is closed only if it has
+ # sub-elements below chapter.
+ # the third condition is such that elements with a next element are
+ # only closed for the last element, except when the next element is
+ # toplevel and below top, such that @top is closed before the first
+ # @chapter if there are @section or the like below @top
+ while ($current->{'sectionup'} and !($current->{'sectionup'}->{'tag'} eq
'top' and $current->{'toplevel'}) and (!$current->{'childnext'} or
($current->{'childnext'}->{'toplevel'} and $current->{'sectionup'}->{'tag'} eq
'top')))
+ {
+ $current = $current->{'sectionup'};
+ $result .= '</'.docbook_element_tag($current).">\n";
+ }
+ return $result;
+}
+
+sub docbook_end_section($$$)
+{
+ my $fh = shift;
+ my $end_foot_navigation = shift;
+ my $element = shift;
+}
+
+sub docbook_print_Top_footer($$)
+{
+ my $fh = shift;
+ my $end_page = shift;
+ my $element = shift;
+}
+
+sub docbook_one_section($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ main::print_lines($fh);
+ &$print_page_foot($fh);
+}
+
+sub docbook_insertcopying($)
+{
+ my $text = shift;
+ my $comment = shift;
+ my $simple_text = shift;
+
+ return $text;
+}
+
+sub docbook_acronym_like($$$$$$)
+{
+ my $command = shift;
+ my $acronym_texi = shift;
+ my $acronym_text = shift;
+ my $with_explanation = shift;
+ my $explanation_lines = shift;
+ my $explanation_text = shift;
+ my $explanation_simply_formatted = shift;
+
+ $command = 'abbrev' if ($command eq 'abbr');
+ my $result = docbook_add_id($command).">$acronym_text</${command}>";
+ if ($with_explanation)
+ {
+ $result .= " ($explanation_text)";
+ }
+ return $result;
+}
+
+
+sub docbook_image_files($$$$)
+{
+ my $base = shift;
+ my $extension = shift;
+ my $texi_base = shift;
+ my $texi_extension = shift;
+ my @files = ();
+ return @files if (!defined($base) or ($base eq ''));
+# FIXME should look at extension argument? makeinfo doesn't
+# push @files,"$base.$extension" if (defined($extension) and ($extension ne
''));
+ foreach my $ext (@IMAGE_EXTENSIONS)
+ {
+ push @files, ["$base.$ext", "$texi_base.$ext"];
+ }
+ return @files;
+}
+
+
+sub docbook_image($$$$$$$$$$$$$$$$;$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ my $file_name = shift;
+ my $alt = shift;
+ my $width = shift;
+ my $height = shift;
+ my $raw_alt = shift;
+ my $extension = shift;
+ my $working_dir = shift;
+ my $file_path = shift;
+ my $in_paragraph = shift;
+ my $file_locations = shift;
+ my $base_simple_format = shift;
+ my $extension_simple_format = shift;
+ my $file_name_simple_format = shift;
+ my $line_nr = shift;
+
+# if (!defined($file_path) or $file_path eq '' or $file_path =~ /\.txt$/)
+# {
+# if (defined($extension) and $extension ne '')
+# {
+# $file = "$base.$extension";
+# }
+# else
+# {
+# $file = "$base.jpg";
+# $extension = 'jpg';
+# }
+# main::line_warn ("no image file for $base, (using $file)");
+# }
+ my $txt_path;
+ my @files = ();
+ my @extensions = @IMAGE_EXTENSIONS;
+ foreach my $file_location (@$file_locations)
+ {
+ my ($file_located, $path, $file_simple_format) = @$file_location;
+ my $extension = shift @extensions;
+ if (defined($path))
+ {
+ if ($extension eq 'txt' and !defined($txt_path))
+ {
+ $txt_path = $path;
+ }
+ else
+ {
+ push @files, [$file_located, uc($extension),
$file_simple_format];
+ }
+ }
+ }
+ push @files, ["$base.jpg", 'JPG', "$base_simple_format.jpg" ] unless
(@files);
+
+ my $begin = docbook_add_id('inlinemediaobject').'>';
+ my $end = '</inlinemediaobject>';
+ if ($preformatted or !$in_paragraph)
+ {
+ $begin = docbook_add_id('informalfigure').'><mediaobject>';
+ $end = '</mediaobject></informalfigure>';
+ }
+ my $result = $begin;
+ foreach my $file_spec (@files)
+ {
+ $result .= "<imageobject><imagedata fileref=\"$file_spec->[2]\"
format=\"$file_spec->[1]\"></imagedata></imageobject>";
+ }
+ if (defined($txt_path))
+ {
+ if (open(TXT, "<$txt_path"))
+ {
+ my $in_encoding = get_conf('IN_ENCODING');
+ if (defined($in_encoding) and get_conf('USE_UNICODE'))
+ {
+ binmode(TXT, ":encoding($in_encoding)");
+ }
+ $result.="<textobject><literallayout>";
+ while (my $img_txt = <TXT>)
+ {
+ $result .= $img_txt;
+ }
+ $result .= '</literallayout></textobject>';
+ close(TXT);
+ }
+ else
+ {
+ main::line_warn (sprintf(__("address@hidden file `%s' unreadable:
%s"), $txt_path, $!), $line_nr);
+ }
+ }
+ else
+ {
+ main::line_warn (sprintf(__("Cannot find address@hidden file
`%s.txt'"), $base), $line_nr);
+ }
+
+ return "$result$end";
+}
+
+sub docbook_format_list_item_texi($$$$)
+{
+ my $format = shift;
+ my $line = shift;
+ my $prepended = shift;
+ my $command = shift;
+
+ my $result_line = undef;
+
+ if (defined($command) and $command ne '' and !exists
$special_list_commands{$format}->{$command} and $format ne 'itemize')
+ {
+ address@hidden
+ $line =~ s/^\s*//;
+ $line =~ s/\s*$//;
+ if (exists ($style_map{$command}))
+ {
+ $result_line = "address@hidden";
+ }
+ elsif (exists ($things_map{$command}))
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ else
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ }
+
+ return ($result_line, 0);
+}
+
+
+# row in multitable
+sub docbook_row($$;$$)
+{
+ my $text = shift;
+ my $macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+
+ my $result = '';
+ if ($macro eq 'headitem')
+ {
+ if ($docbook_multitable_stack[-1] != 0)
+ {
+ $result .= "<thead>";
+ $result = "</tbody>" . $result if ($docbook_multitable_stack[-1]
== 1);
+ $docbook_multitable_stack[-1] = 0;
+ }
+ }
+ elsif ($docbook_multitable_stack[-1] != 1)
+ {
+ $result .= "<tbody>";
+ $result = "</thead>" . $result if ($docbook_multitable_stack[-1] ==
0);
+ $docbook_multitable_stack[-1] = 1;
+ }
+ $result .= "<row>$text</row>";
+
+ return $result;
+}
+
+# cell in multitable
+sub docbook_cell($$;$$)
+{
+ my $text = shift;
+ my $row_macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+
+ return "<entry>" . $text . '</entry>';
+}
+
+# if varlistentry_state is > 0 it means that a varlistentry is opened.
+# if varlistentry_state is == 2 it means that we are in a succession
+# of term
+# if varlistentry_state is == 1 it means that we are in the line
+# Having a listitem in a varlistentry is a must, so an empty
+# listitem is added if a varlistentry is closed and varlistentry_state == 2
+#
+# varlistentry acceps only term and listitem, so inter_item_commands
+# are put in the next term, or, if at the end of the table in a last
+# listitem
+sub docbook_table_item($$$$$$)
+{
+ my $text = shift;
+ my $index_label = shift;
+ my $format = shift;
+ my $command = shift;
+# my $formatted_command = shift;
+ my $style_stack = shift;
+# my $text_formatted = shift;
+# my $text_formatted_leading_spaces = shift;
+# my $text_formatted_trailing_spaces = shift;
+ my $item_cmd = shift;
+
+# $formatted_command = '' if (!defined($formatted_command));
+
+# if (defined($text_formatted))
+# {
+# $text_item = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
+# }
+# else
+# {
+# $text_item = $text;
+# }
+
+ my $result = '';
+ my $prepended = '';
+ if (defined($docbook_table_stack[-1]->{'inter_item'}))
+ {
+ #$formatted_command = $docbook_table_stack[-1]->{'inter_item'} .
$formatted_command;
+ $prepended = $docbook_table_stack[-1]->{'inter_item'};
+ delete $docbook_table_stack[-1]->{'inter_item'};
+ }
+ if ($item_cmd eq 'item')
+ {
+ if ($docbook_table_stack[-1]->{'varlistentry_state'} == 2)
+ {
+ $result .= "<listitem><para><!-- empty table line
--></para></listitem>";
+ }
+ if ($docbook_table_stack[-1]->{'varlistentry_state'} >= 1)
+ {
+ $result .= '</varlistentry>';
+ }
+ $docbook_table_stack[-1]->{'varlistentry_state'} = 2;
+ $result .= '<varlistentry>';
+ }
+ $result .= '<term>';
+ $result .= $prepended . $text ."</term>\n";
+ return $result;
+}
+
+sub docbook_table_line($$$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+#print STDERR
+
+ if ($text =~ /\S/)
+ {
+ if ($before_items)
+ {
+ return $text;
+ }
+
+ if ($only_inter_item_commands)
+ {
+ $docbook_table_stack[-1]->{'inter_item'} = $text;
+ return '';
+ }
+ else
+ {
+ $docbook_table_stack[-1]->{'varlistentry_state'} = 1;
+ return "<listitem>$text</listitem>";
+ }
+ #return $text;
+ }
+ else
+ {
+ return '';
+ }
+}
+
+sub docbook_list_item($$$$$$$$$)
+{
+ my $text = shift;
+ my $format = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+#my $prep_t = 'UNDEF'; $prep_t = $prepended if (defined($prepended));
+#$item_nr = 0 if (!defined($item_nr));
+#print STDERR " $item_nr --> $prep_t|${text}!!!!!\n";
+ #return $text if ($only_inter_item_commands and $before_items);
+ return $text if ($before_items);
+ return '<listitem>' . $text . "</listitem>\n";
+}
+
+sub docbook_table_list($$$$$$$$$)
+{
+ my $format_command = shift;
+ my $text = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+# enumerate
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+# itemize
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+# multitable
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $number = shift;
+
+ my $result = "<$format_command>";
+ if ($format_command eq 'itemize')
+ {
+ my $itemfunction;
+ #$prepended_formatted =~ s/^\s*// if (defined($prepended_formatted));
+ $prepended =~ s/^\s*// if (defined($prepended));
+ #if (defined($formatted_command) and $formatted_command ne '')
+ if (defined($command) and $command ne '')
+ {
+ #$itemfunction = $formatted_command;
+ $itemfunction = $command;
+ #$itemfunction .= " $prepended_formatted" if
(defined($prepended_formatted) and $prepended_formatted ne '');
+ $itemfunction .= " $prepended" if (defined($prepended) and
$prepended ne '');
+ }
+ #elsif (defined($prepended_formatted))
+ elsif (defined($prepended))
+ {
+ #$itemfunction = $prepended_formatted;
+ $itemfunction = $prepended;
+ }
+ my $mark = '';
+ $mark = " mark=\"$itemfunction\"" if (defined($itemfunction) and
$itemfunction ne '');
+ return docbook_add_id('itemizedlist')."${mark}>$text</itemizedlist>";
+ }
+ elsif ($format_command eq 'enumerate')
+ {
+ my $numeration='arabic';
+ if (defined($enumerate_style) and $enumerate_style ne '')
+ {
+ if ($enumerate_style =~ /^[A-Z]/)
+ {
+ $numeration = 'upperalpha';
+ }
+ elsif ($enumerate_style =~ /^[a-z]/)
+ {
+ $numeration = 'loweralpha';
+ }
+ }
+ return docbook_add_id('orderedlist') ."
numeration=\"$numeration\">$text</orderedlist>";
+ }
+ elsif ($format_command eq 'multitable')
+ {
+ my $result = docbook_add_id('informaltable').'><tgroup
cols="'.$number.'">';
+ my $fractions;
+ my $multiply = 1;
+ if (defined($columnfractions) and (ref($columnfractions) eq 'ARRAY')
+ and scalar(@$columnfractions))
+ {
+ $fractions = [ @$columnfractions ];
+ $multiply = 100;
+ }
+ elsif (defined($prototype_lengths) and (ref($prototype_lengths) eq
'ARRAY')
+ and scalar(@$prototype_lengths))
+ {
+ $fractions = [ @$prototype_lengths ];
+ }
+
+ if (defined ($fractions))
+ {
+ foreach my $fraction (@$fractions)
+ {
+ $result .= '<colspec
colwidth="'.($fraction*$multiply).'*"></colspec>';
+ }
+ }
+ $text .= "</tbody>" if ($docbook_multitable_stack[-1] == 1);
+ $text .= "</thead>" if ($docbook_multitable_stack[-1] == 0);
+ pop @docbook_multitable_stack;
+ return $result . "$text</tgroup></informaltable>";
+ }
+ elsif ($format_command =~ /^(v|f)?table$/)
+ {
+ $result = docbook_add_id('variablelist').'>';
+ if (defined($docbook_table_stack[-1]->{'inter_item'}))
+ { # there is a para in case there is only a comment, to avoid
+ # an empty listitem
+ $text .=
"<listitem><para>$docbook_table_stack[-1]->{'inter_item'}</para></listitem>";
+ }
+ elsif ($docbook_table_stack[-1]->{'varlistentry_state'} == 2)
+ {
+ $text .= "<listitem><para><!-- empty table line
--></para></listitem>";
+ }
+ $text .= '</varlistentry>' if
($docbook_table_stack[-1]->{'varlistentry_state'} >= 1);
+ pop @docbook_table_stack;
+ return $result . "$text</variablelist>\n";
+ }
+}
+
+sub docbook_begin_format_texi($$$)
+{
+ my $command = shift;
+ my $line = shift;
+ my $state = shift;
+
+ push (@docbook_multitable_stack, -1) if ($command eq 'multitable');
+ push (@docbook_table_stack, {'varlistentry_state' => 0}) if ($command =~
/^(v|f)?table/);
+ return $line;
+}
+
+# FIXME
+sub docbook_sp($$)
+{
+ my $number = shift;
+ my $preformatted = shift;
+ return "";
+}
+
+sub docbook_index_summary($$)
+{
+ my $alpha = shift;
+ my $nonalpha = shift;
+ return '';
+}
+
+sub docbook_printindex($$)
+{
+ my $name = shift;
+ my $printindex = shift;
+ return docbook_add_id('index')."></index>\n";
+}
+
+sub docbook_complex_format($$)
+{
+ my $name = shift;
+ my $text = shift;
+ return '' if ($text eq '');
+ my $result = docbook_add_id($docbook_complex_format{$name}).'>'
.$text."</$docbook_complex_format{$name}>";
+ return $result;
+}
+
+sub docbook_format($$)
+{
+ my $name = shift;
+ my $element = shift;
+ my $text = shift;
+ return '' if ($text eq '');
+ return $text if ($format_map{$name} eq '');
+ if ($name eq 'copying')
+ {
+ # FIXME is info in docbook 5.0
+ return "<bookinfo>\n<legalnotice>\n$text</legalnotice>\n</bookinfo>\n";
+ }
+ return docbook_add_id($format_map{$name}).'>'
.$text."</$format_map{$name}>";
+}
+
+sub docbook_quotation_prepend_text($$)
+{
+ my $command = shift;
+ my $argument_text = shift;
+
+ return undef if (!defined($argument_text) or $argument_text =~ /^$/);
+
+ chomp($argument_text);
+
+ return undef if (grep {lc($argument_text) eq $_}
@docbook_special_quotation);
+ return gdt('@b{{quotation_arg}:} ', {'quotation_arg' => $argument_text},
{'keep_texi' => 1});
+}
+
+
+sub docbook_quotation($$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $argument_text = shift;
+ my $argument_text_texi = shift;
+ my $authors = shift;
+
+ $argument_text_texi = '' if (!defined($argument_text_texi));
+ chomp($argument_text_texi);
+ my $docbook_command = 'blockquote';
+ if (grep {lc($argument_text_texi) eq $_} @docbook_special_quotation)
+ {
+ $docbook_command = lc($argument_text_texi);
+ }
+ my $attribution = '';
+ if ($authors)
+ {
+ foreach my $author (@$authors)
+ {
+ $attribution .= $author->{'author_text'};
+ }
+ $attribution = '<attribution>' .$attribution. '</attribution>' . "\n";
+ }
+ return docbook_add_id($docbook_command).'>' .$attribution . $text .
"</$docbook_command>\n";
+}
+
+sub docbook_style($$$$$$$$$)
+{
+ my $style = shift;
+ my $command = shift;
+ my $text = shift;
+ my $args = shift;
+ my $no_close =shift;
+ my $no_open = shift;
+ my $line_nr = shift;
+ my $state = shift;
+ my $command_stack = shift;
+ my $kept_line_nrs = shift;
+
+ my $result = $text;
+ if (exists($style->{'function'}))
+ {
+ my $function = $style->{'function'};
+ $result = &$function($command, $args, $command_stack, $state,
$line_nr, $kept_line_nrs);
+ }
+ elsif (exists($style->{'inline_attribute'}))
+ {
+ my $element = $style->{'inline_attribute'};
+ my $attribute_text = '';
+ if ($element =~ /^(\w+)(\s+.*)/)
+ {
+ $element = $1;
+ $attribute_text = $2;
+ }
+
+ if ($no_open)
+ {
+ $result = "<$element";
+ }
+ else
+ {
+ $result = docbook_add_id($element);
+ }
+ $result .= "$attribute_text>$text</$element>";
+ }
+ if (exists($style->{'begin'}) and !$no_open)
+ {
+ $result = $style->{'begin'} . $result;
+ }
+ if (exists($style->{'end'}) and !$no_close)
+ {
+ $result .= $style->{'end'};
+ }
+ return $result;
+}
+
+sub docbook_raw($$$)
+{
+ my $style = shift;
+ my $text = shift;
+ my $line_nr = shift;
+
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude')
+ {
+ return docbook_add_id('screen').'>' . &$protect_text($text) .
'</screen>';
+ }
+ return '' unless (grep {$style eq $_} @EXPAND);
+ if ($style eq 'docbook')
+ {
+ chomp ($text);
+ return $text;
+ }
+ else
+ {
+ main::line_warn (sprintf(__("Raw format %s is not converted"),
$style), $line_nr);
+ return &$protect_text($text);
+ }
+}
+
+sub docbook_cartouche($$)
+{
+ my $text = shift;
+
+ return $text;
+}
+
+sub docbook_anchor_label($$)
+{
+ my $id = shift;
+ my $anchor_text = shift;
+ # FIXME use docbook_node_id
+ return '<anchor id="'. &$protect_text($anchor_text) . '"></anchor>';
+}
+
+sub docbook_float($$$$$)
+{
+ my $text = shift;
+ my $float = shift;
+ my $caption = shift;
+ my $shortcaption = shift;
+
+ my $label_texi = $float->{'texi'};
+ return $text if (!defined($label_texi) or $label_texi eq '');
+
+ return docbook_anchor_label('',$label_texi) . $text;
+}
+
+sub docbook_normal_text($$$$$$$;$)
+{
+ my $text = shift;
+ my $in_raw_text = shift; # remove_texi
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+#print STDERR "Bug: in_raw_text in_simple $text\n" if ($in_raw_text and
$in_simple);
+ my $style_stack = shift;
+ my $state = shift;
+
+ #$text = uc($text) if (in_cmd($style_stack, 'sc'));
+ $text = &$protect_text($text) unless($in_raw_text);
+ if (! $in_code and !$in_preformatted)
+ {
+ if (!$in_raw_text)
+ {
+ $text =~ s/---/\&mdash\;/g;
+ $text =~ s/--/\&ndash\;/g;
+ $text =~ s/``/\&ldquo\;/g;
+ $text =~ s/''/\&rdquo\;/g;
+ }
+ else
+ {
+ #FIXME really do that ? It is done by makeinfo in html
+ $text =~ s/``/"/g;
+ $text =~ s/''/"/g;
+ # FIXME really do that in raw text?
+ $text =~ s/---/\x{1F}/g;
+ $text =~ s/--/-/g;
+ $text =~ s/\x{1F}/--/g;
+ }
+ }
+ return $text;
+}
+
+sub docbook_noop
+{
+ return '';
+}
+
+1;
Index: texi2html/formats/html.pm
===================================================================
RCS file: texi2html/formats/html.pm
diff -N texi2html/formats/html.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/formats/html.pm 9 Apr 2011 00:10:45 -0000 1.1
@@ -0,0 +1,2843 @@
+# -*-perl-*-
+# vim: set filetype=perl:
+######################################################################
+# File: html.pm
+# html output formatting
+#
+# A copy of this file is pasted into the beginning of texi2html by
+# running './configure'.
+#
+# This file is in the public domain. Thus it may easily be used as an
+# example for further customizations.
+#
+# Taken from texi2html.pm in 2009.
+# Originally written by Olaf Bachmann.
+#
+# $Id: html.pm,v 1.1 2011/04/09 00:10:45 pertusus Exp $
+
+use strict;
+
+use vars qw(@html_default_multitable_stack);
+# used in mediawiki.pm
+#my @html_default_multitable_stack;
+# tracks menu entry index
+my $html_menu_entry_index;
+# the simple_formatted document title
+my $html_default_title;
+
+# initialise the html output
+sub html_default_load(;$)
+{
+my $from_command_line = shift;
+
+t2h_default_set_variables_xml();
+
+###############################################################
+# defaults
+
+set_default('HEADERS', 1);
+
address@hidden = ('html');
+
+# The value is the 'SystemLiteral' which identifies the canonical DTD
+# for the document.
+# Definition: The SystemLiteral is called the entity's system
+# identifier. It is a URI, which may be used to retrieve the entity.
+# See http://www.xml.com/axml/target.html#NT-ExternalID
+set_default('DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>');
+
+# When frames are used, this SystemLiteral identifies the DTD used for
+# the file containing the frame description.
+set_default('FRAMESET_DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01
Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd";>');
+
+# if the value is true the Texinfo menus are shown.
+set_default('SHOW_MENU', 1);
+
+set_default('SHOW_TITLE', 1);
+
+# default is to use nodes only as elements.
+set_default('USE_SECTIONS', undef);
+
+set_default('TOP_FILE', 'index.html');
+
+# file name used for Top node when NODE_FILES is true
+set_default('TOP_NODE_FILE', 'index');
+
+##############################################################################
+#
+# The following can only be set in the init file
+#
+##############################################################################
+
+set_default('INLINE_INSERTCOPYING', 0);
+
+# if this variable is true, numeric entities are used when there is no
+# corresponding textual entity.
+set_default('USE_NUMERIC_ENTITY', 1);
+
+# if true, use the original command if the result is an entity
+set_default('ENABLE_ENCODING_USE_ENTITY', 1);
+
+# if set, do redirection files for renamed nodes
+set_default('RENAMED_NODES_REDIRECTIONS', 1);
+
+# used as identation for block enclosing command @example, etc
+# If not empty, must be enclosed in <td></td>
+$EXAMPLE_INDENT_CELL = '<td> </td>';
+
+# same as above, only for @small
+$SMALL_EXAMPLE_INDENT_CELL = '<td> </td>';
+
+# font size for @small
+$SMALL_FONT_SIZE = '-1';
+
+# horizontal rules
+# Not used
+$SMALL_RULE = '<hr size="1">';
+$MIDDLE_RULE = '<hr size="2">';
+# used almost everywhere
+$DEFAULT_RULE = '<hr>';
+# used for top element and before misc elements
+$BIG_RULE = '<hr size="6">';
+
+# symbol put at the beginning of nodes entry in menu (and optionnaly of
+# unnumbered in menus, see next variable)
+$MENU_SYMBOL = '•';
+#$MENU_SYMBOL = '*';
+
+set_default('SIMPLE_MENU', 0);
+
+# extension for nodes files when NODE_FILES is true
+set_default('NODE_FILE_EXTENSION', 'html');
+
+# extension
+set_default('EXTENSION', 'html');
+
+# default is to split the html output
+set_default('SPLIT', 'node');
+
+# this resets all the variables to the texi2html specific values if
+# called as texi2html
+
+t2h_default_set_variables_texi2html() if ($COMMAND_NAME eq 'texi2html');
+
+# this controls the pre style for menus
+$MENU_PRE_STYLE = 'font-family: serif';
+
+# on bug-texinfo is has been said the the style is not code_style
+# for menus (except for the node name).
+# this controls the menu preformatted format
+# FIXME this is not dynamic, so change in MENU_PRE_STYLE is not taken
+# into account.
+# This is used if the menu appears within a preformatted format (which
+# is certainly an invalid construct), and SIMPLE_MENU is not set.
+$MENU_PRE_COMPLEX_FORMAT = {
+ 'pre_style' => $MENU_PRE_STYLE,
+ 'class' => 'menu-preformatted',
+# 'style' => 'code'
+ };
+
+# This controls the ul style for toc
+$NO_BULLET_LIST_STYLE = 'list-style: none';
+$NO_BULLET_LIST_CLASS = 'no-bullet';
+$NO_BULLET_LIST_ATTRIBUTE = ' class="'.$NO_BULLET_LIST_CLASS.'"';
+
+# These lines are inserted before and after the shortcontents
+$BEFORE_OVERVIEW = "<div class=\"shortcontents\">\n";
+$AFTER_OVERVIEW = "</div>\n";
+
+# These lines are inserted before and after the contents
+$BEFORE_TOC_LINES = "<div class=\"contents\">\n";
+$AFTER_TOC_LINES = "</div>\n";
+
+# text inserted after <body ...>
+$AFTER_BODY_OPEN = '';
+
+# text inserted before </body>, this will be automatically inside <p></p>
+$PRE_BODY_CLOSE = '';
+
+# this is added inside <head></head> after <title> and some <meta name>
+# stuff, it can be used for eg. <style>, <script>, <meta> etc. tags.
+$EXTRA_HEAD = '';
+
+# Specifies the minimum page length required before a navigation panel
+# is placed at the bottom of a page
+set_default('WORDS_IN_PAGE', 300);
+
+# html version for latex2html
+set_default('L2H_HTML_VERSION', '4.0');
+
+# this is not set dynamically
+if (!get_conf('HEADER_IN_TABLE'))
+{
+ @SECTION_BUTTONS = ([ 'NodeNext', \&html_default_node_direction ],
+ [ 'NodePrev', \&html_default_node_direction ],
+ [ 'NodeUp', \&html_default_node_direction ], ' ',
+ 'Contents', 'Index');
+ @CHAPTER_BUTTONS = @SECTION_FOOTER_BUTTONS = @NODE_FOOTER_BUTTONS =
+ @MISC_BUTTONS = @TOP_BUTTONS = @SECTION_BUTTONS;
+ $BIG_RULE = $DEFAULT_RULE;
+}
+
+set_default('ICONS', 0);
+
+%BUTTONS_ACCESSKEY =
+(
+ 'Top', '',
+ 'Contents', '',
+ 'Overview', '',
+ 'Index', '',
+ 'This', '',
+ 'Back', 'p',
+ 'FastBack', '',
+ 'Prev', 'p',
+ 'Up', 'u',
+ 'Next', 'n',
+ 'NodeUp', 'u',
+ 'NodeNext', 'n',
+ 'NodePrev', 'p',
+ 'NodeForward', '',
+ 'NodeBack', '',
+ 'Forward', 'n',
+ 'FastForward', '',
+ 'About' , '',
+ 'First', '',
+ 'Last', '',
+ 'NextFile', '',
+ 'PrevFile', '',
+);
+
+# see http://www.w3.org/TR/REC-html40/types.html#type-links
+%BUTTONS_REL =
+(
+ 'Top', 'start',
+ 'Contents', 'contents',
+ 'Overview', '',
+ 'Index', 'index',
+ 'This', '',
+ 'Back', 'previous',
+ 'FastBack', '',
+ 'Prev', 'previous',
+ 'Up', 'up',
+ 'Next', 'next',
+ 'NodeUp', 'up',
+ 'NodeNext', 'next',
+ 'NodePrev', 'previous',
+ 'NodeForward', '',
+ 'NodeBack', '',
+ 'Forward', 'next',
+ 'FastForward', '',
+ 'About' , 'help',
+ 'First', '',
+ 'Last', '',
+ 'NextFile', 'next',
+ 'PrevFile', 'previous',
+);
+
+
+
+# PRE_ABOUT can be a function reference or a scalar.
+# Note that if it is a scalar, T2H_InitGlobals has not been called,
+# and all global variables like $ADDRESS are not available.
+$PRE_ABOUT = sub
+{
+ return ' ' . &$program_string() . "\n";
+};
+
+# If customizing $AFTER_ABOUT, be sure to put the content inside <p></p>.
+$AFTER_ABOUT = '';
+
+%BUTTONS_EXAMPLE =
+ (
+ 'Top', ' ',
+ 'Contents', ' ',
+ 'Overview', ' ',
+ 'Index', ' ',
+ 'This', '1.2.3',
+ 'Back', '1.2.2',
+ 'FastBack', '1',
+ 'Prev', '1.2.2',
+ 'Up', '1.2',
+ 'Next', '1.2.4',
+ 'NodeUp', '1.2',
+ 'NodeNext', '1.2.4',
+ 'NodePrev', '1.2.2',
+ 'NodeForward', '1.2.4',
+ 'NodeBack', '1.2.2',
+ 'Forward', '1.2.4',
+ 'FastForward', '2',
+ 'About', ' ',
+ 'First', '1.',
+ 'Last', '1.2.4',
+ 'NextFile', ' ',
+ 'PrevFile', ' ',
+ );
+
address@hidden = ('png','jpg','jpeg','gif');
+#, 'txt');
+
+#######################################################################
+#
+# Values guessed if not set here. The value used is in
+# $Texi2HTML::THISDOC{'VARNAME'}
+#
+#######################################################################
+
+set_default('BODYTEXT', undef);
+
+$translate_names = \&html_default_translate_names;
+
+t2h_default_push_handler(\&html_default_initialize, address@hidden);
+# This must be done after language has been set
+t2h_default_push_handler(\&html_default_bodytext, address@hidden);
+# This must be done after the fulltitle has been set
+t2h_default_push_handler(\&html_default_do_title, address@hidden);
+
+########################################################################
+# Control of Page layout:
+# There are the following subs which control the layout:
+#
+$print_section = \&HTML_DEFAULT_print_section;
+$end_section = \&HTML_DEFAULT_end_section;
+$one_section = \&HTML_DEFAULT_one_section;
+$print_Top_footer = \&HTML_DEFAULT_print_Top_footer;
+$print_Top = \&HTML_DEFAULT_print_Top;
+# changed in info format, but irrelevant for non-split formats
+$print_Footnotes = \&T2H_DEFAULT_print_Footnotes;
+$print_misc_header = \&HTML_DEFAULT_print_misc_header;
+$print_misc_footer = \&HTML_DEFAULT_print_misc_footer;
+$print_section_footer = \&HTML_DEFAULT_print_section_footer;
+$print_chapter_header = \&HTML_DEFAULT_print_chapter_header;
+$print_section_header = \&HTML_DEFAULT_print_section_header;
+$print_chapter_footer = \&HTML_DEFAULT_print_chapter_footer;
+$print_page_head = \&HTML_DEFAULT_print_page_head;
+$print_page_foot = \&HTML_DEFAULT_print_page_foot;
+$print_head_navigation = \&HTML_DEFAULT_print_head_navigation;
+$print_foot_navigation = \&HTML_DEFAULT_print_foot_navigation;
+$button_icon_img = \&HTML_DEFAULT_button_icon_img;
+$button_formatting = \&HTML_DEFAULT_button_formatting;
+
+$print_navigation = \&HTML_DEFAULT_print_navigation;
+$about_body = \&HTML_DEFAULT_about_body;
+
+$print_frame = \&HTML_DEFAULT_print_frame;
+$print_toc_frame = \&HTML_DEFAULT_print_toc_frame;
+$contents = \&HTML_DEFAULT_contents;
+$shortcontents = \&HTML_DEFAULT_shortcontents;
+$print_redirection_page = \&HTML_DEFAULT_print_redirection_page;
+
+########################################################################
+# Control of formatting:
+# 1.) For some changes, it is often enough to change the value of
+# some global map. It might necessitate building a little
+# function along with the change in hash, if the change is the use
+# of another function (in style_map).
+# 2.) For other changes, reimplement one of the t2h_default_<fnc>* routines,
+# give them another name, and assign them to the respective
+# $<fnc> variable (below).
+
+
+#
+# texinfo "simple things" (@foo) to HTML ones
+#
+%simple_map = %default_simple_map;
+$simple_map{'*'} = '<br>'; # HTML+
+$simple_map{' '} = ' ';
+$simple_map{"\t"} = ' ';
+$simple_map{"\n"} = ' ';
+ # "­" or "­" could also be possible for @-, but it seems
+ # that some browser will consider this as an always visible hyphen mark
+ # which is not what we want (see http://www.cs.tut.fi/~jkorpela/shy.html)
+#$simple_map{'-'} = ''; # hyphenation hint
+
+# this map is used in preformatted text
+%simple_map_pre = %simple_map;
+$simple_map_pre{'*'} = "\n";
+
+# use entities in the default case
+#$things_map{'dots'} = '<small class="dots">...</small>';
+$things_map{'enddots'} = '<small class="enddots">...</small>';
+
+%style_map = ();
+%style_map_pre = ();
+t2h_default_copy_style_map (\%default_style_map, \%style_map);
+t2h_default_copy_style_map (\%default_style_map_pre, \%style_map_pre);
+# default is {'args' => ['normal'], 'attribute' => ''},
+my %style_map_html = (
+ 'b', {'inline_attribute' => 'b'},
+ 'cite', {'inline_attribute' => 'cite'},
+ 'code', {'inline_attribute' => 'code'},
+ 'command', {'inline_attribute' => 'code'},
+ 'dfn', {'inline_attribute' => 'em'},
+ 'email', {'function' => \&html_default_email},
+ 'emph', {'inline_attribute' => 'em'},
+ 'env', {'inline_attribute' => 'code'},
+ 'file', {'inline_attribute' => 'tt', 'quote' => '"'},
+ 'headitemfont', {'inline_attribute' => 'b'}, # not really that, in fact
it is
+ # in <th> rather than <td>
+ 'i', {'inline_attribute' => 'i'},
+ 'slanted', {'inline_attribute' => 'i'},
+ 'sansserif', {'inline_attribute' => 'span class="sansserif"'},
+ 'kbd', {'inline_attribute' => 'kbd'},
+ 'key', {'begin' => '<', 'end' => '>'},
+ 'math', {'function' => \&html_default_math},
+ 'option', {'inline_attribute' => 'samp', 'quote' => '"'},
+ 'r', {'inline_attribute' => 'span class="roman"'},
+ 'samp', {'inline_attribute' => 'samp', 'quote' => '"'},
+ 'sc', {'inline_attribute' => 'small'},
+ 'strong', {'inline_attribute' => 'strong'},
+ 't', {'inline_attribute' => 'tt'},
+ 'uref', {'function' => \&html_default_uref},
+ 'url', {'function' => \&html_default_uref},
+ 'indicateurl', {'begin' => '<<code>', 'end' => '</code>>'},
+ 'var', {'inline_attribute' => 'var'},
+ 'verb', {'inline_attribute' => 'tt'},
+ );
+
+foreach my $style_command (keys(%style_map_html))
+{
+ foreach my $key (keys(%{$style_map_html{$style_command}}))
+ {
+ $style_map_pre{$style_command}->{$key} =
$style_map_html{$style_command}->{$key};
+ $style_map{$style_command}->{$key} =
$style_map_html{$style_command}->{$key};
+ }
+}
+
+%line_command_map = (
+ 'title' => 'h1',
+ 'subtitle' => 'h3 align="right"',
+ 'author' => 'strong',
+);
+
+foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
+{
+ $style_map{$accent_command} = { 'function' => \&xml_default_accent };
+ $style_map_pre{$accent_command} = { 'function' => \&xml_default_accent };
+}
+
+$style_map_pre{'sc'} = {};
+$style_map_pre{'titlefont'} = {};
+$style_map_pre{'click'}->{'function'} = \&t2h_default_click_pre;
+
+# uncomment to use the old interface
+#%style_map = %old_style_map;
+#%style_map_pre = %old_style_map_pre;
+
+%simple_format_simple_map_texi = %simple_map_pre;
+
+%format_map = (
+# 'quotation' => 'blockquote',
+ # lists
+# 'itemize' => 'ul',
+ 'enumerate' => 'ol',
+# 'multitable' => 'table',
+ 'table' => 'dl compact="compact"',
+ 'vtable' => 'dl compact="compact"',
+ 'ftable' => 'dl compact="compact"',
+ 'group' => '',
+ 'raggedright' => '',
+# 'detailmenu' => '',
+ );
+
+#%special_list_commands = (
+# 'table' => {},
+# 'vtable' => {},
+# 'ftable' => {},
+# 'itemize' => { 'bullet' => '' }
+# );
+
+$special_list_commands{'itemize'}->{ 'bullet'} = '';
+
+#
+# texinfo format to align attribute of paragraphs
+#
+
+%paragraph_style = (
+ 'center' => 'center',
+ 'flushleft' => 'left',
+ 'flushright' => 'right',
+ );
+
+# preformatted formats formatting
+if (get_conf('COMPLEX_FORMAT_IN_TABLE'))
+{
+ foreach my $indented_format ('example', 'display', 'lisp')
+ {
+ $complex_format_map{"small$indented_format"}->{'begin'} =
"<table><tr>$SMALL_EXAMPLE_INDENT_CELL<td>";
+ $complex_format_map{$indented_format}->{'begin'} =
"<table><tr>$EXAMPLE_INDENT_CELL<td>";
+ $complex_format_map{$indented_format}->{'end'} = "</td></tr></table>\n";
+ $complex_format_map{"small$indented_format"}->{'end'} =
"</td></tr></table>\n";
+ }
+
+ foreach my $non_indented_formats ('format', 'smallformat')
+ {
+ $complex_format_map{$non_indented_formats}->{'begin'} = '';
+ $complex_format_map{$non_indented_formats}->{'end'} = "\n";
+ }
+}
+else
+{
+ foreach my $format ('example', 'display', 'lisp', 'format')
+ {
+ $complex_format_map{$format}->{'begin'} =
html_default_attribute_class('div', $format).">\n";
+ $complex_format_map{"small$format"}->{'begin'} =
html_default_attribute_class('div', "small$format").">\n";
+ $complex_format_map{$format}->{'end'} = '</div>'."\n";
+ $complex_format_map{"small$format"}->{'end'} = '</div>'."\n";
+ }
+}
+
+foreach my $format ('menu', 'detailmenu', 'direntry')
+{
+ $complex_format_map{$format} = { 'begin' => '' , 'end' => '',
+ 'class' => 'menu-preformatted',
+ };
+}
+
+$complex_format_map{'menu_comment'} = {
+ 'begin' => "<tr><th colspan=\"3\" align=\"left\" valign=\"top\">",
+ 'end' => "</th></tr>", 'class' => 'menu-comment',
+};
+
+
+%format_in_paragraph = (
+ 'html' => 1,
+);
+# map mapping css specification to style
+
+%css_map =
+ (
+ "ul.$NO_BULLET_LIST_CLASS" => "$NO_BULLET_LIST_STYLE",
+ 'pre.menu-comment' => "$MENU_PRE_STYLE",
+ 'pre.menu-preformatted' => "$MENU_PRE_STYLE",
+ 'a.summary-letter' => 'text-decoration: none',
+ 'blockquote.smallquotation' => 'font-size: smaller',
+# 'pre.display' => 'font-family: inherit',
+# 'pre.smalldisplay' => 'font-family: inherit; font-size:
smaller',
+ 'pre.display' => 'font-family: serif',
+ 'pre.smalldisplay' => 'font-family: serif; font-size: smaller',
+ 'pre.smallexample' => 'font-size: smaller',
+ 'span.sansserif' => 'font-family:sans-serif;
font-weight:normal',
+ 'span.roman' => 'font-family:serif; font-weight:normal',
+ 'span.nocodebreak' => 'white-space:pre',
+ 'span.nolinebreak' => 'white-space:pre'
+ );
+
+$css_map{'pre.format'} = $css_map{'pre.display'};
+$css_map{'pre.smallformat'} = $css_map{'pre.smalldisplay'};
+$css_map{'pre.smalllisp'} = $css_map{'pre.smallexample'};
+
+foreach my $indented_format ('example', 'display', 'lisp')
+{
+ $css_map{"div.$indented_format"} = 'margin-left: 3.2em';
+ $css_map{"div.small$indented_format"} = 'margin-left: 3.2em';
+}
+
+# formatting functions
+
+$acronym_like = \&html_default_acronym_like;
+$anchor = \&html_default_anchor;
+$anchor_label = \&html_default_anchor_label;
+$begin_format_texi = \&html_default_begin_format_texi;
+$caption_shortcaption = \&html_default_caption_shortcaption;
+$caption_shortcaption_command = \&html_default_caption_shortcaption_command;
+$cartouche = \&html_default_cartouche;
+$cell = \&html_default_cell;
+$def = \&html_default_def;
+$def_item = \&html_default_def_item;
+$def_line = \&html_default_def_line;
+$element_label = \&html_default_element_label;
+$float = \&html_default_float;
+$foot_line_and_ref = \&html_default_foot_line_and_ref;
+$foot_section = \&html_default_foot_section;
+$format_list_item_texi = \&html_default_format_list_item_texi;
+$heading = \&t2h_default_heading;
+$heading_text = \&html_default_heading_text;
+$heading_text_preformatted = \&html_default_heading_text_preformatted;
+$image = \&html_default_image;
+$image_files = \&html_default_image_files;
+$index_entry = \&html_default_index_entry;
+$index_entry_command = \&html_default_index_entry_command;
+$index_entry_label = \&html_default_index_entry_label;
+$index_letter = \&html_default_index_letter;
+$index_summary = \&html_default_index_summary;
+$insertcopying = \&html_default_insertcopying;
+$line_command = \&html_default_line_command;
+$list_item = \&html_default_list_item;
+$listoffloats = \&html_default_listoffloats;
+$listoffloats_entry = \&html_default_listoffloats_entry;
+$listoffloats_caption = \&html_default_listoffloats_caption;
+$listoffloats_float_style = \&html_default_listoffloats_float_style;
+$menu_command = \&html_default_menu_command;
+$menu_link = \&html_default_menu_link;
+$menu_description = \&html_default_menu_description;
+$misc_element_label = \&html_default_misc_element_label;
+$normal_text = \&html_default_normal_text;
+$paragraph = \&html_default_paragraph;
+$preformatted = \&html_default_preformatted;
+$print_index = \&html_default_print_index;
+$protect_text = \&xml_default_protect_text;
+$quotation = \&html_default_quotation;
+$sp = \&html_default_sp;
+$summary_letter = \&html_default_summary_letter;
+$tab_item_texi = \&html_default_tab_item_texi;
+$table_item = \&html_default_table_item;
+$table_line = \&html_default_table_line;
+$table_list = \&html_default_table_list;
+$raw = \&html_default_raw;
+$row = \&html_default_row;
+
+}
+
+
+
+# The functions
+
+sub html_default_initialize()
+{
+ @html_default_multitable_stack = ();
+ $html_default_title = undef;
+}
+
+# We have to do this dynamically because of internationalization and because
+# in body ENCODING_NAME could be used.
+sub html_default_bodytext()
+{
+ # Set the default body text, inserted between <body ... >
+ set_from_document('BODYTEXT', 'lang="' . get_conf('documentlanguage') .
'" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080"
alink="#FF0000"');
+}
+
+sub html_default_translate_names()
+{
+ t2h_default_translate_names();
+
+ %NAVIGATION_TEXT =
+ (
+ 'Top', gdt('Top'),
+ 'Contents', gdt('Contents'),
+ 'Overview', gdt('Overview'),
+ 'Index', gdt('Index'),
+ ' ', ' ',
+ 'This', gdt('current'),
+ 'Back', ' < ',
+ 'FastBack', ' << ',
+ 'Prev', gdt('Prev'),
+ 'Up', gdt(' Up '),
+ 'Next', gdt('Next'),
+ 'NodeUp', gdt('Node up'),
+ 'NodeNext', gdt('Next node'),
+ 'NodePrev', gdt('Previous node'),
+ 'NodeForward', gdt('Forward node'),
+ 'NodeBack', gdt('Back node'),
+ 'Forward', ' > ',
+ 'FastForward', ' >> ',
+ 'About', ' ? ',
+ 'First', ' |< ',
+ 'Last', ' >| ',
+ 'NextFile', gdt('Next file'),
+ 'PrevFile', gdt('Previous file'),
+ );
+
+}
+
+sub html_default_do_title()
+{
+ $html_default_title = "$Texi2HTML::THISDOC{'fulltitle_simple_format'}";
+ if ($html_default_title !~ /\S/)
+ {
+ $html_default_title = gdt('Untitled Document',{},{'simple_format' =>
1});
+ main::document_warn("Must specify a title with a title command or
address@hidden");
+ }
+}
+
+########################################################################
+# Page formatting functions
+#
+
+########################################################################
+# Layout for html for every sections
+#
+
+sub HTML_DEFAULT_print_section
+{
+ my $fh = shift;
+ my $first_in_page = shift;
+ my $previous_is_top = shift;
+ my $element = shift;
+ my $buttons = address@hidden;
+
+ my $nw = main::print_lines($fh);
+ if ((get_conf('SPLIT') eq 'node') && get_conf('HEADERS'))
+ {
+ my $buttons = address@hidden;
+ &$print_foot_navigation($fh, $buttons, $DEFAULT_RULE,
+ (!get_conf('WORDS_IN_PAGE') or (defined ($nw) and $nw >=
get_conf('WORDS_IN_PAGE'))),
+ $element);
+ }
+}
+
+sub HTML_DEFAULT_one_section($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ main::print_lines($fh);
+ print $fh "$DEFAULT_RULE\n";
+ &$print_page_foot($fh);
+}
+
+###################################################################
+# Layout of top-page I recommend that you use @ifnothtml, @ifhtml,
+# @html within the Top texinfo node to specify content of top-level
+# page.
+#
+sub HTML_DEFAULT_print_Top_footer($$$)
+{
+ my $fh = shift;
+ my $end_page = shift;
+ my $element = shift;
+ my $buttons = address@hidden;
+ my $rule = $DEFAULT_RULE;
+ $rule = $BIG_RULE if (!$end_page);
+ #print STDERR "end_page: $end_page\n";
+ &$print_foot_navigation($fh, $buttons, $rule,
+ ($end_page and (get_conf('HEADERS') or (get_conf('SPLIT') and
get_conf('SPLIT') ne 'node'))), $element);
+ if ($end_page)
+ {
+ &$print_page_foot($fh);
+ }
+}
+
+sub HTML_DEFAULT_print_Top($$$)
+{
+ my $fh = shift;
+ my $has_top_heading = shift;
+ my $element = shift;
+
+ main::print_lines($fh, $Texi2HTML::THIS_SECTION);
+}
+
+###################################################################
+# Layout of Toc, Overview, and Footnotes pages
+# By default, we use "normal" layout
+# Texi2HTML::HREF of Next, Prev, Up, Forward, Back, etc are not defined
+# use: my $buttons = [...] to redefine navigation buttons
+sub HTML_DEFAULT_print_Footnotes
+{
+ return &$print_misc(@_);
+}
+
+sub HTML_DEFAULT_print_misc_header
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $new_file = shift;
+ my $misc_page = shift;
+ &$print_page_head($fh) if ($new_file);
+ print $fh "".&$misc_element_label($misc_pages_targets{$misc_page},
$misc_page);
+ &$print_head_navigation($fh, $buttons) if ($new_file or
get_conf('HEADERS'));
+}
+
+sub HTML_DEFAULT_print_misc_footer
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $new_file = shift;
+ &$print_foot_navigation($fh, $buttons, $DEFAULT_RULE,
+ ($new_file and (get_conf('HEADERS') or (get_conf('SPLIT') and
get_conf('SPLIT') ne 'node'))), undef);
+ if ($new_file)
+ {
+ &$print_page_foot($fh);
+ }
+}
+
+##################################################################
+# section_footer is only called if SPLIT eq 'section'
+# section_footer: after print_section of last section, before print_page_foot
+#
+
+sub HTML_DEFAULT_print_section_footer
+{
+ my $fh = shift;
+ my $element = shift;
+ my $buttons = address@hidden;
+ &$print_foot_navigation($fh, $buttons, $DEFAULT_RULE, 1, $element);
+}
+
+###################################################################
+# chapter_header and chapter_footer are only called if
+# SPLIT eq 'chapter'
+# chapter_header: after print_page_head, before print_section
+# chapter_footer: after print_section of last section, before print_page_foot
+#
+# If you want to get rid of navigation stuff after each section,
+# redefine print_section such that it does not call print_navigation,
+# and put print_navigation into print_chapter_header
+sub HTML_DEFAULT_print_chapter_header($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ # nothing to do there, by default, the navigation panel
+ # is the element navigation panel
+ if (! get_conf('HEADERS'))
+ { # in this case print_navigation is called here.
+ my $buttons = address@hidden;
+ &$print_head_navigation($fh, $buttons);
+ print $fh "\n$DEFAULT_RULE\n" unless
(get_conf('VERTICAL_HEAD_NAVIGATION'));
+ }
+}
+
+sub HTML_DEFAULT_print_chapter_footer($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ my $buttons = address@hidden;
+ &$print_foot_navigation($fh, $buttons, $DEFAULT_RULE, 1, $element);
+}
+
+sub HTML_DEFAULT_print_section_header($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ # nothing to do there, by default
+ if (! get_conf('HEADERS'))
+ { # in this case print_navigation is called here.
+ my $buttons = address@hidden;
+ &$print_head_navigation($fh, $buttons);
+ }
+}
+
+
+###################################################################
+# Layout of standard header and footer
+#
+
+sub HTML_DEFAULT_print_page_head($)
+{
+ my $fh = shift;
+ my $longtitle = $html_default_title;
+ $longtitle .= ": $Texi2HTML::SIMPLE_TEXT{'This'}" if (defined
($Texi2HTML::SIMPLE_TEXT{'This'}) and ($Texi2HTML::SIMPLE_TEXT{'This'} !~
/^\s*$/) and get_conf('SPLIT') and ($html_default_title ne
$Texi2HTML::SIMPLE_TEXT{'This'}));
+ my $description = get_conf('documentdescription');
+ $description = $longtitle if (!defined($description));
+ $description = "<meta name=\"description\" content=\"$description\">" if
+ ($description ne '');
+ my $encoding = '';
+ $encoding = "<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=".get_conf('ENCODING_NAME')."\">" if
(defined(get_conf('ENCODING_NAME')) and (get_conf('ENCODING_NAME') ne ''));
+ my $date = '';
+ my $today = get_conf('today');
+ $today = '' if (!defined($today));
+ $date = "\n<meta name=\"date\" content=\"$today\">" if
(get_conf('DATE_IN_HEADER') and $today ne '');
+ my $links = '';
+ if (get_conf('USE_LINKS'))
+ {
+ foreach my $link (@LINKS_BUTTONS)
+ {
+#print STDERR "$link!!$Texi2HTML::HREF{$link}\n";
+ if (defined($Texi2HTML::HREF{$link}) and $Texi2HTML::HREF{$link}
ne '')
+ {
+ my $title = '';
+ $title = " title=\"$Texi2HTML::SIMPLE_TEXT{$link}\"" if
(defined($Texi2HTML::SIMPLE_TEXT{$link}));
+ my $rel = '';
+ $rel = " rel=\"$BUTTONS_REL{$link}\"" if
(defined($BUTTONS_REL{$link}));
+ $links .= "<link
href=\"$Texi2HTML::HREF{$link}\"${rel}${title}>\n";
+ }
+ }
+ }
+
+ my $css_text = '';
+ $css_text = get_conf('CSS_LINES') if (defined(get_conf('CSS_LINES')));
+ my $doctype = get_conf('DOCTYPE');
+ my $bodytext = get_conf('BODYTEXT');
+ print $fh <<EOT;
+$doctype
+<html>
+$Texi2HTML::THISDOC{'copying_comment'}<!-- Created by
$Texi2HTML::THISDOC{'program_and_version'},
$Texi2HTML::THISDOC{'program_homepage'} -->
+<head>
+<title>$longtitle</title>
+
+$description
+<meta name="keywords" content="$longtitle">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="$Texi2HTML::THISDOC{'program'}">$date
+$encoding
+${links}$css_text
+$EXTRA_HEAD
+</head>
+
+<body $bodytext>
+$AFTER_BODY_OPEN
+EOT
+}
+
+sub HTML_DEFAULT_end_section($$$)
+{
+ my $fh = shift;
+ my $misc_or_top_and_section_separation = shift;
+ my $element = shift;
+ if ($misc_or_top_and_section_separation)
+ {
+ my $rule = $BIG_RULE;
+ # in that case we are almost surely at the end of the document
+ $rule = $DEFAULT_RULE if (! get_conf('MONOLITHIC'));
+ &$print_foot_navigation($fh, undef, $rule, 0, $element, 1);
+ }
+ else
+ {
+ print $fh "$DEFAULT_RULE\n";
+ }
+}
+
+sub HTML_DEFAULT_print_page_foot($)
+{
+ my $fh = shift;
+ my $program_text = '';
+ if (get_conf('PROGRAM_NAME_IN_FOOTER'))
+ {
+ my $program_string = &$program_string();
+ $program_text = " <font size=\"-1\">
+ $program_string
+ </font>
+ <br>";
+ }
+ print $fh <<EOT;
+<p>
+$program_text
+$PRE_BODY_CLOSE
+</p>
+</body>
+</html>
+EOT
+}
+
+###################################################################
+# Layout of navigation panel
+
+sub HTML_DEFAULT_print_head_navigation($$$$$)
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $first_in_page = shift;
+ my $previous_is_top = shift;
+ my $element = shift;
+
+ my $result = '';
+ if (get_conf('VERTICAL_HEAD_NAVIGATION'))
+ {
+ $result .= <<EOT;
+<table border="0" cellpadding="0" cellspacing="0">
+<tr valign="top">
+<td align="left">
+EOT
+ }
+ $result .= &$print_navigation($buttons,
get_conf('VERTICAL_HEAD_NAVIGATION'));
+ if (get_conf('VERTICAL_HEAD_NAVIGATION'))
+ {
+ $result .= <<EOT;
+</td>
+<td align="left">
+EOT
+ }
+ elsif (get_conf('SPLIT') eq 'node')
+ {
+ $result .= "$DEFAULT_RULE\n";
+ }
+
+ print $fh $result if (defined($fh));
+ return $result;
+}
+
+sub HTML_DEFAULT_print_foot_navigation($$$$$;$)
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $rule = shift;
+ my $print_navigation_panel = shift;
+ my $element = shift;
+ # set if called between sections and top or between sections and misc.
+ # could also be the last element
+ my $maybe_in_page = shift;
+
+ $rule = '' if (!defined($rule));
+ $print_navigation_panel = 1 if (!defined($print_navigation_panel)
+ and defined($buttons));
+
+ # avoid the rule if at the end of a page and there is nothing below
+ $rule = '' if (!get_conf('PROGRAM_NAME_IN_FOOTER') and
!$print_navigation_panel and !$maybe_in_page);
+
+ if (get_conf('VERTICAL_HEAD_NAVIGATION'))
+ {
+ print $fh <<EOT;
+</td>
+</tr>
+</table>
+EOT
+ }
+ print $fh "$rule\n" if ($rule ne '');
+ print $fh "".&$print_navigation($buttons) if ($print_navigation_panel);
+}
+
+######################################################################
+# navigation panel
+#
+# how to create IMG tag
+sub HTML_DEFAULT_button_icon_img
+{
+ my $button = shift;
+ my $icon = shift;
+ my $name = shift;
+ return '' if (!defined($icon));
+ $button = "" if (!defined ($button));
+ $name = '' if (!defined($name));
+ my $alt = '';
+ if ($name ne '')
+ {
+ if ($button ne '')
+ {
+ $alt = "$button: $name";
+ }
+ else
+ {
+ $alt = $name;
+ }
+ }
+ else
+ {
+ $alt = $button;
+ }
+ return qq{<img src="$icon" border="0" alt="$alt" align="middle">};
+}
+
+sub HTML_DEFAULT_button_formatting($$)
+{
+ my $button = shift;
+ my $vertical = shift;
+
+ my ($active, $passive);
+ if (ref($button) eq 'CODE')
+ {
+ $active = &$button($vertical);
+ }
+ elsif (ref($button) eq 'SCALAR')
+ {
+ $active = "$$button" if defined($$button);
+ }
+ elsif (ref($button) eq 'ARRAY')
+ {
+ my $text = $button->[1];
+ my $button_href = $button->[0];
+ # verify that $button_href is simple text and text is a reference
+ if (defined($button_href) and !ref($button_href)
+ and defined($text) and (ref($text) eq 'SCALAR') and defined($$text))
+ { # use given text
+ if ($Texi2HTML::HREF{$button_href})
+ {
+ my $anchor_attributes = '';
+ if (get_conf('USE_ACCESSKEY') and
(defined($BUTTONS_ACCESSKEY{$button_href})) and
($BUTTONS_ACCESSKEY{$button_href} ne ''))
+ {
+ $anchor_attributes =
"accesskey=\"$BUTTONS_ACCESSKEY{$button_href}\"";
+ }
+ if (get_conf('USE_REL_REV') and
(defined($BUTTONS_REL{$button_href})) and ($BUTTONS_REL{$button_href} ne ''))
+ {
+ $anchor_attributes .= "
rel=\"$BUTTONS_REL{$button_href}\"";
+ }
+ $active = "" .
+ &$anchor('',
+ $Texi2HTML::HREF{$button_href},
+ $$text,
+ $anchor_attributes
+ );
+ }
+ else
+ {
+ $passive = $$text;
+ }
+ }
+ elsif (defined($button_href) and !ref($button_href)
+ and defined($text) and (ref($text) eq 'CODE'))
+ {
+ $active = &$text($button_href);
+ }
+ }
+ elsif ($button eq ' ')
+ { # handle space button
+ $active =
+ (get_conf('ICONS') && $ACTIVE_ICONS{' '}) ?
+ &$button_icon_img($BUTTONS_NAME{$button}, $ACTIVE_ICONS{' '}) :
+ $NAVIGATION_TEXT{' '};
+ #next;
+ }
+ elsif ($Texi2HTML::HREF{$button})
+ { # button is active
+ my $btitle = $BUTTONS_GOTO{$button} ?
+ 'title="' . $BUTTONS_GOTO{$button} . '"' : '';
+ if (get_conf('USE_ACCESSKEY') and
(defined($BUTTONS_ACCESSKEY{$button})) and ($BUTTONS_ACCESSKEY{$button} ne ''))
+ {
+ $btitle .= " accesskey=\"$BUTTONS_ACCESSKEY{$button}\"";
+ }
+ if (get_conf('USE_REL_REV') and (defined($BUTTONS_REL{$button})) and
($BUTTONS_REL{$button} ne ''))
+ {
+ $btitle .= " rel=\"$BUTTONS_REL{$button}\"";
+ }
+ if (get_conf('ICONS') && $ACTIVE_ICONS{$button})
+ { # use icon
+ $active = '' .
+ &$anchor('',
+ $Texi2HTML::HREF{$button},
+ &$button_icon_img($BUTTONS_NAME{$button},
+ $ACTIVE_ICONS{$button},
+ $Texi2HTML::SIMPLE_TEXT{$button}),
+ $btitle
+ );
+ }
+ else
+ { # use text
+ $active =
+ '[' .
+ &$anchor('',
+ $Texi2HTML::HREF{$button},
+ $NAVIGATION_TEXT{$button},
+ $btitle
+ ) .
+ ']';
+ }
+ }
+ else
+ { # button is passive
+ $passive =
+ get_conf('ICONS') && $PASSIVE_ICONS{$button} ?
+ &$button_icon_img($BUTTONS_NAME{$button},
+ $PASSIVE_ICONS{$button},
+ $Texi2HTML::SIMPLE_TEXT{$button}) :
+ "[" . $NAVIGATION_TEXT{$button} . "]";
+ }
+ return ($active, $passive);
+}
+
+my %html_default_node_directions;
+foreach my $node_directions ('NodeNext', 'NodePrev', 'NodeUp')
+{
+ $html_default_node_directions{$node_directions} = 1;
+}
+
+sub HTML_DEFAULT_print_navigation($;$)
+{
+ my $buttons = shift;
+ my $vertical = shift;
+
+ my $first_button = 1;
+ my $result = '';
+ if (get_conf('HEADER_IN_TABLE'))
+ {
+ $result .= html_default_attribute_class('table', 'header').'
cellpadding="1" cellspacing="1" border="0">'."\n";
+ $result .= "<tr>" unless $vertical;
+ }
+ else
+ {
+ $result .= html_default_attribute_class('div', 'header').">\n<p>\n";
+ }
+ for my $button (@$buttons)
+ {
+ if (get_conf('HEADER_IN_TABLE'))
+ {
+ $result .= qq{<tr valign="top" align="left">\n} if $vertical;
+ $result .= qq{<td valign="middle" align="left">};
+ }
+ my $direction;
+ if (ref($button) eq 'ARRAY' and defined($button->[0]) and
!ref($button->[0]))
+ {
+ $direction = $button->[0];
+ }
+ elsif (defined($button) and !ref($button))
+ {
+ $direction = $button;
+ }
+
+ my ($active, $passive) = &$button_formatting($button, $vertical);
+ if (get_conf('HEADER_IN_TABLE'))
+ {
+ if (defined($active))
+ {
+ $first_button = 0 if ($first_button);
+ $result .= $active;
+ }
+ elsif (defined($passive))
+ {
+ $first_button = 0 if ($first_button);
+ $result .= $passive;
+ }
+ $result .= "</td>\n";
+ $result .= "</tr>\n" if $vertical;
+ }
+ elsif (defined($active))
+ { # only active buttons are print out when not in table
+ if (defined($direction) and
$html_default_node_directions{$direction} and !$first_button)
+ {
+ $active = ', ' .$active;
+ }
+ $result .= $active;
+ $first_button = 0 if ($first_button);
+ }
+ }
+ if (get_conf('HEADER_IN_TABLE'))
+ {
+ $result .= "</tr>" unless $vertical;
+ $result .= "</table>\n";
+ }
+ else
+ {
+ $result .= "</p>\n</div>\n";
+ }
+ return $result;
+}
+
+sub html_default_node_direction($)
+{
+ my $direction = shift;
+ my $result = undef;
+ if ($Texi2HTML::HREF{$direction} and $Texi2HTML::NODE{$direction})
+ {
+ my $anchor_attributes = '';
+ if (get_conf('USE_ACCESSKEY') and
(defined($BUTTONS_ACCESSKEY{$direction})) and ($BUTTONS_ACCESSKEY{$direction}
ne ''))
+ {
+ $anchor_attributes =
"accesskey=\"$BUTTONS_ACCESSKEY{$direction}\"";
+ }
+ if (get_conf('USE_REL_REV') and (defined($BUTTONS_REL{$direction}))
and ($BUTTONS_REL{$direction} ne ''))
+ {
+ $anchor_attributes .= " rel=\"$BUTTONS_REL{$direction}\"";
+ }
+ my $anchor = &$anchor('',
+ $Texi2HTML::HREF{$direction},
+ $Texi2HTML::NODE{$direction},
+ $anchor_attributes
+ )
+ ;
+ # i18n
+ $result = "$BUTTONS_TEXT{$direction}: $anchor";
+ }
+ return $result;
+}
+
+######################################################################
+# Frames: this is from "Richard Y. Kim" <address@hidden>
+# Should be improved to be more conforming to other _print* functions
+# toc_file and main_file passed as args are relative to the texinfo manual
+# location, and therefore are not used.
+
+sub HTML_DEFAULT_print_frame
+{
+ my $fh = shift;
+ my $toc_file = shift;
+ my $main_file = shift;
+ $main_file = $Texi2HTML::THISDOC{'filename'}->{'top'};
+ $toc_file = $Texi2HTML::THISDOC{'filename'}->{'toc_frame'};
+ my $doctype = get_conf('FRAMESET_DOCTYPE');
+ print $fh <<EOT;
+$doctype
+<html>
+<head><title>$Texi2HTML::THISDOC{'fulltitle'}</title></head>
+<frameset cols="140,*">
+ <frame name="toc" src="$toc_file">
+ <frame name="main" src="$main_file">
+</frameset>
+</html>
+EOT
+}
+
+sub HTML_DEFAULT_print_toc_frame
+{
+ my $fh = shift;
+ my $stoc_lines = shift;
+ &$print_page_head($fh);
+ print $fh <<EOT;
+<h2>Content</h2>
+EOT
+ print $fh map {s/\bhref=/target="main" href=/; $_;} @$stoc_lines;
+ print $fh "</body></html>\n";
+}
+
+######################################################################
+# About page
+#
+
+sub HTML_DEFAULT_about_body
+{
+ return undef if (!get_conf('HEADER_IN_TABLE'));
+ my $about = "<p>\n";
+ if (ref($PRE_ABOUT) eq 'CODE')
+ {
+ $about .= &$PRE_ABOUT();
+ }
+ else
+ {
+ $about .= $PRE_ABOUT;
+ }
+ $about .= <<EOT;
+</p>
+<p>
+EOT
+ $about .= gdt(' The buttons in the navigation panels have the following
meaning:') . "\n";
+ $about .= <<EOT;
+</p>
+<table border="1">
+ <tr>
+EOT
+ $about .= ' <th> ' . gdt('Button') . " </th>\n" .
+' <th> ' . gdt('Name') . " </th>\n" .
+' <th> ' . gdt('Go to') . " </th>\n" .
+' <th> ' . gdt('From 1.2.3 go to') . "</th>\n" . " </tr>\n";
+
+ for my $button (@SECTION_BUTTONS)
+ {
+ next if $button eq ' ' || ref($button) eq 'CODE' || ref($button) eq
'SCALAR' || ref($button) eq 'ARRAY';
+ $about .= " <tr>\n <td align=\"center\">";
+ $about .=
+ (get_conf('ICONS') && $ACTIVE_ICONS{$button} ?
+ &$button_icon_img($BUTTONS_NAME{$button}, $ACTIVE_ICONS{$button})
:
+ ' [' . $NAVIGATION_TEXT{$button} . '] ');
+ $about .= "</td>\n";
+ $about .= <<EOT;
+ <td align="center">$BUTTONS_NAME{$button}</td>
+ <td>$BUTTONS_GOTO{$button}</td>
+ <td>$BUTTONS_EXAMPLE{$button}</td>
+ </tr>
+EOT
+ }
+
+ $about .= <<EOT;
+</table>
+
+<p>
+EOT
+ $about .= gdt(' where the @strong{ Example } assumes that the current
position is at @strong{ Subsubsection One-Two-Three } of a document of the
following structure:') . "\n";
+
+# where the <strong> Example </strong> assumes that the current position
+# is at <strong> Subsubsection One-Two-Three </strong> of a document of
+# the following structure:
+ $about .= <<EOT;
+</p>
+
+<ul>
+EOT
+ $about .= ' <li> 1. ' . gdt('Section One') . "\n" .
+" <ul>\n" .
+' <li>1.1 ' . gdt('Subsection One-One') . "\n";
+ $about .= <<EOT;
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+EOT
+ $about .= ' <li>1.2 ' . gdt('Subsection One-Two') . "\n" .
+" <ul>\n" .
+' <li>1.2.1 ' . gdt('Subsubsection One-Two-One') . "</li>\n" .
+' <li>1.2.2 ' . gdt('Subsubsection One-Two-Two') . "</li>\n" .
+' <li>1.2.3 ' . gdt('Subsubsection One-Two-Three') . "
\n"
+.
+' <strong><== ' . gdt('Current Position') . " </strong></li>\n" .
+' <li>1.2.4 ' . gdt('Subsubsection One-Two-Four') . "</li>\n" .
+" </ul>\n" .
+" </li>\n" .
+' <li>1.3 ' . gdt('Subsection One-Three') . "\n";
+ $about .= <<EOT;
+ <ul>
+ <li>...</li>
+ </ul>
+ </li>
+EOT
+ $about .= ' <li>1.4 ' . gdt('Subsection One-Four') . "</li>\n";
+ $about .= <<EOT;
+ </ul>
+ </li>
+</ul>
+$AFTER_ABOUT
+EOT
+ return $about;
+}
+
+sub HTML_DEFAULT_print_redirection_page()
+{
+ #my $fh = shift;
+ my $longtitle = $html_default_title;
+ $longtitle .= ": $Texi2HTML::SIMPLE_TEXT{'This'}" if (defined
($Texi2HTML::SIMPLE_TEXT{'This'}) and ($Texi2HTML::SIMPLE_TEXT{'This'} !~
/^\s*$/) and ($html_default_title ne $Texi2HTML::SIMPLE_TEXT{'This'}));
+ my $description = get_conf('documentdescription');
+ $description = $longtitle if (!defined($description));
+ my $encoding = '';
+ $encoding = "<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=".get_conf('ENCODING_NAME')."\">" if
(defined(get_conf('ENCODING_NAME')) and (get_conf('ENCODING_NAME') ne ''));
+ my $href = &$anchor('', $Texi2HTML::HREF{'This'},
$Texi2HTML::NAME{'This'});
+ my $string = gdt('The node you are looking for is at {href}.',
+ { 'href' => $href });
+ my $doctype = get_conf('DOCTYPE');
+ my $css_text = '';
+ $css_text = get_conf('CSS_LINES') if (defined(get_conf('CSS_LINES')));
+ my $today = get_conf('today');
+ my $bodytext = get_conf('BODYTEXT');
+ my $result = <<EOT;
+$doctype
+<html>
+<!-- Created by $Texi2HTML::THISDOC{'program_and_version'},
$Texi2HTML::THISDOC{'program_homepage'} -->
+<!-- This file redirects to the location of a node or anchor -->
+<head>
+<title>$longtitle</title>
+
+<meta name="description" content="$description">
+<meta name="keywords" content="$longtitle">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<meta name="Generator" content="$Texi2HTML::THISDOC{'program'}">
+$encoding
+$css_text
+<meta http-equiv="Refresh" content="2; url=$Texi2HTML::HREF{'This'}">
+$EXTRA_HEAD
+</head>
+
+<body $bodytext>
+$AFTER_BODY_OPEN
+<p>$string</p>
+</body>
+EOT
+ return $result;
+}
+
+sub html_default_uref($$)
+{
+ shift;
+ my $args = shift;
+ my $url = shift @$args;
+ my $text = shift @$args;
+ my $replacement = shift @$args;
+ $url = main::normalise_space($url);
+ $replacement = '' if (!defined($replacement));
+ $replacement = main::normalise_space($replacement);
+ $text = '' if (!defined($text));
+ $text = main::normalise_space($text);
+ $text = $replacement if ($replacement ne '');
+ $text = $url unless ($text ne '');
+ return $text if ($url eq '');
+ return &$anchor('', $url, $text);
+}
+
+sub html_default_math($$)
+{
+ shift;
+ my $args = shift;
+ my $text = shift @$args;
+ return "<em>$text</em>";
+}
+
+sub html_default_email($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $mail = shift @$args;
+ my $text = shift @$args;
+ $mail = main::normalise_space($mail);
+ $text = $mail unless (defined($text) and ($text ne ''));
+ $text = main::normalise_space($text);
+ return $text if ($mail eq '');
+ return &$anchor('', "mailto:$mail";, $text);
+}
+
+sub html_default_attribute_class($$)
+{
+ my $element = shift;
+ my $class = shift;
+ return "<$element" if (!defined($class) or $class eq '' or
get_conf('NO_CSS'));
+ my $style = '';
+ if (get_conf('INLINE_CSS_STYLE') and defined($css_map{"$element.$class"}))
+ {
+ $style = ' style="'.$css_map{"$element.$class"}.'"';
+ }
+ return "<$element class=\"$class\"$style";
+}
+
+# this is called each time a format begins. Here it is used to keep a
+# record of the multitables to have a faithful count of the cell nr.
+sub html_default_begin_format_texi($$$)
+{
+ my $command = shift;
+ my $line = shift;
+ my $state = shift;
+
+ # first array element is the number of cell in a row
+ # second is the number of paragraphs in a cell
+ push (@html_default_multitable_stack, [-1,-1]) if ($command eq
'multitable');
+
+ return $line;
+}
+
+sub html_default_caption_shortcaption($)
+{
+ my $float = shift;
+ my $caption_lines;
+ my $shortcaption_lines;
+ my $style = $float->{'style_texi'};
+ if (defined($float->{'nr'}))
+ {
+ my $nr = $float->{'nr'};
+ if ($style ne '')
+ {
+ $style = gdt('{style} {number}', { 'style' => $style, 'number' =>
$nr});
+ }
+ else
+ {
+ $style = $nr;
+ }
+ }
+
+ if (defined($float->{'caption_texi'}))
+ {
+ @$caption_lines = @{$float->{'caption_texi'}};
+ $caption_lines->[0] =~ s/^\s*//;
+ if (defined($style))
+ {
+ $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' . gdt('{style}:
{caption_first_line}', { 'style' => $style, 'caption_first_line' =>
$caption_lines->[0] });
+ }
+ else
+ {
+ $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
$caption_lines->[0];
+ }
+ push @$caption_lines, "}\n";
+ }
+ elsif (defined($style))
+ {
+ $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' . $style . '}' . "\n";
+ }
+ if (defined($float->{'shortcaption_texi'}))
+ {
+ @$shortcaption_lines = @{$float->{'shortcaption_texi'}};
+ if (defined($style))
+ {
+ $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
gdt('{style}: {shortcaption_first_line}', { 'style' => $style,
'shortcaption_first_line' => $shortcaption_lines->[0] });
+ }
+ else
+ {
+ $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
$shortcaption_lines->[0];
+ }
+ push @$shortcaption_lines, "}\n";
+ }
+ elsif (defined($style))
+ {
+ $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' . $style . '}' .
"\n";
+ }
+ return ($caption_lines, $shortcaption_lines);
+}
+
+# everything is done in &$float
+sub html_default_caption_shortcaption_command($$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $texi_lines = shift;
+ my $float_element = shift;
+ return '';
+}
+
+sub html_default_float($$$$$)
+{
+ my $text = shift;
+ my $float = shift;
+ my $caption = shift;
+ my $shortcaption = shift;
+
+ my $label = '';
+ if (exists($float->{'id'}))
+ {
+ $label = &$anchor($float->{'id'});
+ }
+ my $caption_text = '';
+
+ if (defined($float->{'caption_texi'}))
+ {
+ $caption_text = $caption;
+ }
+ elsif (defined($float->{'shortcaption_texi'}))
+ {
+ $caption_text = $shortcaption;
+ }
+ elsif (defined($caption))
+ {
+ $caption_text = $caption;
+ }
+
+ return html_default_attribute_class('div','float'). '>' . "$label\n" .
$text . '</div>' . $caption_text;
+}
+
+sub html_default_listoffloats_float_style($$)
+{
+ my $style_texi = shift;
+ my $float = shift;
+
+ my $style = $float->{'style_texi'};
+ #print STDERR "listoffloat/float style mismatch $style_texi $style\n" if
($style_texi ne $style);
+ if (defined($float->{'nr'}))
+ {
+ my $nr = $float->{'nr'};
+ if ($style ne '')
+ {
+ $style = gdt('{style} {number}', { 'style' => $style, 'number'
=> $nr});
+ }
+ else
+ {
+ $style = $nr;
+ }
+ }
+ return $style;
+}
+
+sub html_default_listoffloats_caption($)
+{
+ my $float = shift;
+ if (defined($float->{'shortcaption_texi'}))
+ {
+ return ([ @{$float->{'shortcaption_texi'}} ], 'shortcaption');
+ }
+ elsif (defined($float->{'caption_texi'}))
+ {
+ return ([ @{$float->{'caption_texi'}} ], 'caption');
+ }
+ return ([ ], undef);
+}
+
+sub html_default_listoffloats_entry($$$$)
+{
+ my $style_texi = shift;
+ my $float = shift;
+ my $float_style = shift;
+ my $caption = shift;
+ my $href = shift;
+
+ return '<dt>' . &$anchor('', $href, $float_style) . '</dt><dd>' . $caption
+. '</dd>' . "\n";
+}
+
+sub html_default_listoffloats($$$)
+{
+ my $style_texi = shift;
+ my $style = shift;
+ my $float_entries = shift;
+
+ my $result = html_default_attribute_class('dl', 'listoffloats').">\n" ;
+ foreach my $float_entry (@$float_entries)
+ {
+ $result .= $float_entry;
+ }
+ return $result . "</dl>\n";
+}
+
+sub html_default_insertcopying($$$)
+{
+ my $text = shift;
+ my $comment = shift;
+ my $simple_text = shift;
+ return $text;
+}
+
+sub html_default_protect_space_codebreak($$$$$)
+{
+ my $text = shift;
+ my $in_raw_text = shift; # remove_texi
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $style_stack = shift;
+
+ return $text if ($in_preformatted or $in_raw_text);
+
+ my $in_w = 1 if (in_cmd($style_stack, 'w'));
+
+ if ($in_w or ($in_code and get_conf('allowcodebreaks') eq 'false'))
+ {
+ my $class = 'nolinebreak';
+ $class = 'nocodebreak' if ($in_code and get_conf('allowcodebreaks') eq
'false');
+ my $open = html_default_attribute_class('span', $class).'>';
+ # protect spaces in the html leading attribute in case we are in 'w'
+ $open =~ s/ /\x{1F}/g if ($in_w);
+ $text =~ s/(\S*[_-]\S*)/${open}$1<\/span>/g;
+ }
+
+ if ($in_w)
+ {
+ $text .= ' ' if (chomp($text));
+ # protect spaces within text
+ $text =~ s/ / /g;
+ # revert protected spaces in leading html attribute
+ $text =~ s/\x{1F}/ /g;
+ }
+ return $text;
+}
+
+sub html_default_normal_text($$$$$$$;$)
+{
+ my @initial_args = @_;
+ my $text = shift;
+ my $in_raw_text = shift; # remove_texi
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ # like utf8.pm
+ if (get_conf('ENABLE_ENCODING') and !get_conf('ENABLE_ENCODING_USE_ENTITY')
and defined(get_conf('ENCODING_NAME')) and get_conf('ENCODING_NAME') eq 'utf-8')
+ {
+ my $result = &t2h_utf8_normal_text(@initial_args);
+ $result = html_default_protect_space_codebreak($result, $in_raw_text,
$in_preformatted, $in_code, $style_stack);
+ return $result;
+ }
+
+ $text = uc($text) if (in_cmd($style_stack, 'sc'));
+ $text = &$protect_text($text) unless($in_raw_text);
+ #$text =~ s/ / /g
+ # if (!$in_raw_text and !$in_preformatted and in_cmd($style_stack, 'w'));
+ if (! $in_code and !$in_preformatted)
+ {
+ if (get_conf('USE_ISO') and !$in_raw_text)
+ {
+ $text =~ s/---/\&mdash\;/g;
+ $text =~ s/--/\&ndash\;/g;
+ $text =~ s/``/\&ldquo\;/g;
+ $text =~ s/''/\&rdquo\;/g;
+ }
+ else
+ {
+ if ($in_raw_text) #FIXME really do that ? It is done by makeinfo
+ {
+ $text =~ s/``/"/g;
+ $text =~ s/''/"/g;
+ }
+ else
+ {
+ $text =~ s/``/"/g;
+ $text =~ s/''/"/g;
+ # to be like texinfo
+ #$text =~ s/'/\&rsquo\;/g;
+ #$text =~ s/`/\&lsquo\;/g;
+ }
+ # FIXME really do that in raw text?
+ $text =~ s/---/\x{1F}/g;
+ $text =~ s/--/-/g;
+ $text =~ s/\x{1F}/--/g;
+ }
+ }
+ $text = html_default_protect_space_codebreak($text, $in_raw_text,
$in_preformatted, $in_code, $style_stack);
+ $text = t2h_text_substitutions($text, $in_raw_text, ($in_preformatted or
$in_code), $in_simple);
+ return $text;
+}
+
+# This function produces an anchor
+#
+# arguments:
+# $name : anchor name
+# $href : anchor href
+# text : text displayed
+# extra_attribs : added to anchor attributes list
+sub html_default_anchor($;$$$)
+{
+ my $name = shift;
+ my $href = shift;
+ my $text = shift;
+ my $attributes = shift;
+ my $class = '';
+#print STDERR "!$name!$href!$text!$attributes!\n";
+ if (!defined($attributes) or ($attributes !~ /\S/))
+ {
+ $attributes = '';
+ }
+ else
+ {
+ if ($attributes =~ s/^class=\"([^\"]+)\"//)
+ {
+ $class = $1;
+ }
+
+ $attributes = ' ' . $attributes if ($attributes ne '');
+ }
+ $name = '' if (!defined($name) or ($name !~ /\S/));
+ $href = '' if (!defined($href) or ($href !~ /\S/));
+ $text = '' if (!defined($text));
+ return $text if (($name eq '') and ($href eq ''));
+ $name = "name=\"$name\"" if ($name ne '');
+ $href = "href=\"$href\"" if ($href ne '');
+ $href = ' ' . $href if (($name ne '') and ($href ne ''));
+#print STDERR "!!!$name!$href!$text!$attributes!\n";
+ return html_default_attribute_class('a', $class). "
${name}${href}${attributes}>$text</a>";
+}
+
+# This function is used to format the text associated with a @deff/@end deff
+#
+# argument:
+# text
+#
+# DEF_TABLE should be used to distinguish between @def formatted as table
+# and as definition lists.
+sub html_default_def_item($$$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $command = shift;
+ if ($text =~ /\S/)
+ {
+ if (! get_conf('DEF_TABLE'))
+ {
+ return '<dd>' . $text . '</dd>';# unless $only_inter_item_commands;
+ #return $text; # invalid without dd in ul
+ }
+ else
+ {
+ return '<tr><td colspan="2">' . $text . '</td></tr>';
+ }
+ }
+ return '';
+}
+
+# format the container for the @deffn line and text
+#
+# argument
+# text of the whole @def, line and associated text.
+#
+# DEF_TABLE should be used.
+sub html_default_def($$)
+{
+ my $text = shift;
+ my $command = shift;
+ if ($text =~ /\S/)
+ {
+ if (! get_conf('DEF_TABLE'))
+ {
+ return "<dl>\n" . $text . "</dl>\n";
+ }
+ else
+ {
+ return "<table width=\"100%\">\n" . $text . "</table>\n";
+ }
+ }
+ return '';
+
+}
+
+# a whole menu
+#
+# argument:
+# the whole menu text (entries and menu comments)
+#
+# argument:
+# whole menu text.
+sub html_default_menu_command($$$)
+{
+ my $format = shift;
+ my $text = shift;
+ my $in_preformatted = shift;
+
+ $html_menu_entry_index=0;
+
+ my $begin_row = '';
+ my $end_row = '';
+ if ($in_preformatted)
+ {
+ $begin_row = '<tr><td>';
+ $end_row = '</td></tr>';
+ }
+ if ($text =~ /\S/)
+ {
+ return '' if ($format eq 'direntry');
+ return $text if ($format eq 'detailmenu');
+ return html_default_attribute_class('table', 'menu')." border=\"0\"
cellspacing=\"0\">${begin_row}\n"
+ . $text . "${end_row}</table>\n";
+ }
+}
+
+# formats a menu entry link pointing to a node or section
+#
+# arguments:
+# the entry text
+# the state, a hash reference holding informations about the context, with a
+# usefull entry, 'preformatted', true if we are in a preformatted format
+# (a format keeping space between words). In that case a function
+# of the main program, main::do_preformatted($text, $state) might
+# be used to format the text with the current format style.
+# href is optionnal. It is the reference to the section or the node anchor
+# which should be used to make the link (typically it is the argument
+# of a href= attribute in a <a> element).
+sub html_default_menu_link($$$$$$$$)
+{
+ my $element_name = shift;
+ my $state = shift;
+ my $href = shift;
+ my $node = shift;
+ my $title = shift;
+ my $ending = shift;
+ my $has_title = shift;
+ my $command_stack = shift;
+ my $preformatted = shift;
+
+ my $in_commands = 0;
+ $in_commands = 1 if ($command_stack->[-1] and $command_stack->[-1] ne
'menu' and $command_stack->[-1] ne 'detailmenu' and $command_stack->[-1] ne
'direntry');
+
+ $title = '' unless ($has_title);
+#print STDERR "MENU_LINK($in_commands)($state->{'preformatted'})\n";
+ my $entry;
+ my $symbol = '';
+ if ($preformatted)
+ {
+ $title .= ':' if ($title ne '');
+ $entry = "$MENU_SYMBOL$title$node";
+ }
+ elsif ($element_name eq '' or get_conf('NODE_NAME_IN_MENU'))
+ {
+ if ($has_title)
+ {
+ $entry = "$title";
+ }
+ else
+ {
+ $entry = "$node";
+ }
+ $entry =~ s/^\s*//;
+ $symbol = "$MENU_SYMBOL ";
+ }
+ else
+ {
+ $entry = $element_name;
+ }
+ $html_menu_entry_index++;
+ my $accesskey;
+ $accesskey = "accesskey=\"$html_menu_entry_index\"" if
(get_conf('USE_ACCESSKEY') and ($html_menu_entry_index < 10));
+ $entry = &$anchor ('', $href, $entry, $accesskey) if (defined($href));
+
+ return $entry.$ending if ($preformatted);
+ # FIXME conditionalise to not having a description
+ return "$symbol$entry$MENU_ENTRY_COLON" .' ' if ($in_commands);
+ return "<tr><td align=\"left\"
valign=\"top\">$symbol$entry$MENU_ENTRY_COLON</td><td> </td>";
+}
+
+sub html_simplify_text($)
+{
+ my $text = shift;
+ $text =~ s/[^\w]//og;
+ return $text;
+}
+
+# formats a menu entry description, ie the text appearing after the node
+# specification in a menu entry an spanning until there is another
+# menu entry, or empty line
+#
+# arguments:
+# the description text
+# the state. See menu_entry.
+# the heading of the element associated with the node.
+sub html_default_menu_description($$$$)
+{
+ my $text = shift;
+ my $state = shift;
+ my $element_text = shift;
+ my $command_stack = shift;
+ my $preformatted = shift;
+
+ my $in_commands = 0;
+ $in_commands = 1 if ($command_stack->[-1] and $command_stack->[-1] ne
'menu' and $command_stack->[-1] ne 'detailmenu' and $command_stack->[-1] ne
'direntry');
+ return $text if ($preformatted);
+ return $text."<br>" if ($in_commands);
+ if (get_conf('AVOID_MENU_REDUNDANCY'))
+ {
+ $text = '' if (html_simplify_text($element_text) eq
html_simplify_text($text));
+ }
+ return "<td align=\"left\" valign=\"top\">$text</td></tr>\n";
+}
+
+sub html_teletyped_in_stack($)
+{
+ my $stack = shift;
+ foreach my $element(reverse(@$stack))
+ {
+ return 1 if ($complex_format_map{$element} and
+ $complex_format_map{$element}->{'style'} and
+ $complex_format_map{$element}->{'style'} eq 'code');
+ }
+ return 0;
+}
+
+# text after @item in table, vtable and ftable
+sub html_default_table_item($$$$$$$)
+{
+ my $text = shift;
+ my $index_label = shift;
+ my $format = shift;
+ my $command = shift;
+# my $formatted_command = shift;
+ my $style_stack = shift;
+# my $text_formatted = shift;
+# my $text_formatted_leading_spaces = shift;
+# my $text_formatted_trailing_spaces = shift;
+ my $item_cmd = shift;
+ my $formatted_index_entry = shift;
+
+# if (defined($text_formatted) and !exists
$special_list_commands{$format}->{$command})
+# {
+# $text = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
+# }
+# $formatted_command = '' if (!defined($formatted_command) or
+# exists($special_list_commands{$format}->{$command}));
+ if (html_teletyped_in_stack($style_stack))
+ {
+# $text .= '</tt>';
+# $formatted_command = '<tt>' . $formatted_command;
+ $text = '<tt>' . $text . '</tt>';
+ }
+ $text .= "\n" . $index_label if (defined($index_label));
+# return '<dt>' . $formatted_command . $text . '</dt>' . "\n";
+ return '<dt>' . $text . '</dt>' . "\n";
+}
+
+# format text on the line following the @item line (in table, vtable and
ftable)
+sub html_default_table_line($$$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ if ($text =~ /\S/)
+ {
+ return '<dd>' . $text . '</dd>' . "\n";# unless
($only_inter_item_commands);
+ #return $text; # invalid without dd in ul
+ }
+ return '';
+}
+
+#my $cell_nr = -1;
+
+# row in multitable
+sub html_default_row($$$$$$$$)
+{
+ my $text = shift;
+ my $macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ # this is used to keep the cell number
+ $html_default_multitable_stack[-1]->[0] = -1;
+
+ if ($text =~ /\S/)
+ {
+ if ($macro eq 'headitem')
+ {
+ return '<thead><tr>' . $text . '</tr></thead>' . "\n";
+ }
+ return '<tr>' . $text . '</tr>' . "\n";
+ }
+ return '';
+}
+
+# cell in multitable
+sub html_default_cell($$$$$$$$)
+{
+ my $text = shift;
+ my $row_macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ $html_default_multitable_stack[-1]->[0]++;
+ my $cell_nr = $html_default_multitable_stack[-1]->[0];
+ my $fractions = '';
+
+ if (defined($columnfractions) and (ref($columnfractions) eq 'ARRAY')
+ and exists($columnfractions->[$cell_nr]))
+ {
+ my $fraction = sprintf('%d', 100*$columnfractions->[$cell_nr]);
+ $fractions = " width=\"$fraction%\"";
+ }
+
+ # in constructs like
+ # @strong{
+ # @multitable ....
+ # }
+ # the space won't be removed since the <strong> is put before the space.
+ $text =~ s/^\s*//;
+ $text =~ s/\s*$//;
+
+ if ($row_macro eq 'headitem')
+ {
+ return "<th${fractions}>" . $text . '</th>';
+ }
+ return "<td${fractions}>" . $text . '</td>';
+}
+
+sub html_default_format_list_item_texi($$$$$)
+{
+ my $format = shift;
+ my $line = shift;
+ my $prepended = shift;
+ my $command = shift;
+ my $number = shift;
+
+ my $result_line;
+ my $open_command = 0;
+ if (defined($command) and $command ne '' and !exists
$special_list_commands{$format}->{$command} and $format ne 'itemize')
+ {
+ address@hidden
+ $open_command = 1;
+ $line =~ s/^\s*//;
+ $line =~ s/\s*$//;
+ if (exists ($style_map{$command}))
+ {
+ $result_line = "address@hidden";
+ }
+ elsif (exists ($things_map{$command}))
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ else
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ }
+ elsif (defined($prepended) and $prepended ne '')
+ {
+ $prepended =~ s/^\s*//;
+ $prepended =~ s/\s*$//;
+ $line =~ s/^\s*//;
+ $result_line = $prepended . ' ' . $line;
+ }
+ return ($result_line, $open_command);
+}
+
+
+# format an item in a list
+#
+# argument:
+# text of the item
+# format of the list (itemize or enumerate)
+# command passed as argument to the format
+# formatted_command leading command formatted, if it is a thing command
+sub html_default_list_item($$$$$$$$$$$)
+{
+ my $text = shift;
+ my $format = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ $formatted_command = '' if (!defined($formatted_command) or
+ exists($special_list_commands{$format}->{$command}));
+ my $prepend = '';
+# if (defined($prepended) and $prepended ne '')
+# {
+# $prepend = $prepended;
+# }
+# elsif ($formatted_command ne '')
+ if ($formatted_command ne '')
+ {
+ $prepend = $formatted_command;
+ }
+ if ($text =~ /\S/)
+ {
+ return '<li>' . $prepend . $text . '</li>';
+ }
+ return '';
+}
+
+sub html_default_table_list($$$$$$$$$)
+{
+ my $format_command = shift;
+ my $text = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+# enumerate
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+# itemize
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+# multitable
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+# my $number = shift;
+ $formatted_command = '' if (!defined($formatted_command) or
+ exists($special_list_commands{$format}->{$command}));
+ if ($format_command eq 'itemize')
+ {
+ return "<ul>\n" . $text . "</ul>\n" if (($command eq 'bullet') or
(($command eq '') and ($prepended eq '')));
+ return html_default_attribute_class('ul',$NO_BULLET_LIST_CLASS).">\n"
. $text . "</ul>\n";
+ }
+ elsif ($format_command eq 'multitable')
+ {
+ pop @html_default_multitable_stack;
+ return &$format('multitable', 'table', $text);
+ }
+}
+
+# a paragraph
+# arguments:
+# $text of the paragraph
+# $align for the alignement
+# $indent for the indent style (indent or noindent)
+# The following is usefull if the paragraph is in an itemize.
+# $paragraph_command is the leading formatting command (like @minus)
+# $paragraph_command_formatted is the leading formatting command formatted
+# $paragraph_number is a reference on the number of paragraphs appearing
+# in the format. The value should be increased if a paragraph is done
+# $format is the format name (@itemize)
+sub html_default_paragraph($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $align = shift;
+ my $indent = shift;
+ my $paragraph_command = shift;
+ my $paragraph_command_formatted = shift;
+ my $paragraph_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+#print STDERR "format: $format\n" if (defined($format));
+#print STDERR "paragraph @$command_stack_at_end; @$command_stack_at_begin\n";
+# $paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
+# exists($special_list_commands{$format}->{$paragraph_command}));
+ return '' if ($text =~ /^\s*$/);
+
+ if (defined($paragraph_number) and defined($$paragraph_number))
+ {
+ $$paragraph_number++;
+ return $text if (($format eq 'itemize' or $format eq 'enumerate') and
+ ($$paragraph_number == 1));
+ }
+
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+ if ($top_stack eq 'multitable')
+ {
+ $html_default_multitable_stack[-1]->[1]++;
+ if ($html_default_multitable_stack[-1]->[1] == 0)
+ {
+ return $text;
+ }
+ }
+
+ my $open = '<p>';
+ if ($align)
+ {
+ $open = "<p align=\"$paragraph_style{$align}\">";
+ }
+ return $open.$text.'</p>';
+}
+
+# a preformatted region
+# arguments:
+# $text of the preformatted region
+# $pre_style css style
+# $class identifier for the preformatted region (example, menu-comment)
+# The following is usefull if the preformatted is in an itemize.
+# $leading_command is the leading formatting command (like @minus)
+# $leading_command_formatted is the leading formatting command formatted
+# $preformatted_number is a reference on the number of preformatteds appearing
+# in the format. The value should be increased if a preformatted is done
+sub html_default_preformatted($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $pre_style = shift;
+ my $class = shift;
+ my $leading_command = shift;
+ my $leading_command_formatted = shift;
+ my $preformatted_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+#print STDERR "preformatted @$command_stack_at_end;
@$command_stack_at_begin\n";
+ return '' if ($text eq '');
+ $leading_command_formatted = '' if (!defined($leading_command_formatted)
or
+ exists($special_list_commands{$format}->{$leading_command}));
+ if (defined($preformatted_number) and defined($$preformatted_number))
+ {
+ $$preformatted_number++;
+ }
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+ if ($top_stack eq 'multitable')
+ {
+ $text =~ s/^\s*//;
+ $text =~ s/\s*$//;
+ }
+
+ return html_default_attribute_class('pre', $class).">".$text."</pre>";
+}
+
+sub html_default_heading_text($$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $level = shift;
+
+ return '' if ($text !~ /\S/);
+ # FIXME use a class=*contents?
+ my $class = '';
+ if ($command =~ /^@/ and $command !~ /address@hidden/)
+ {
+ $class = $command;
+ $class =~ s/^@//;
+ $class = 'node-heading' if ($command eq '@node');
+ }
+ my $align = '';
+ $align = ' align="center"' if ($command eq '@centerchap' or $command eq
'@settitle');
+ $level = 1 if ($level == 0);
+ my $result = html_default_attribute_class ("h$level", $class)
."$align>$text</h$level>";
+ # FIXME titlefont appears inline in text, so no end of line is
+ # added. The end of line should be added by the user if needed.
+ $result .= "\n" unless ($command eq '@titlefont');
+ $result .= $DEFAULT_RULE . "\n" if ($command eq '@part' and
defined($DEFAULT_RULE) and $DEFAULT_RULE ne '');
+ return $result;
+}
+
+sub html_default_heading_text_preformatted($$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $level = shift;
+
+ return '' if ($text !~ /\S/);
+ return '<strong>'.$text.'</strong>'."\n";
+}
+
+# formatting of raw regions
+# if L2H is true another mechanism is used for tex
+sub html_default_raw($$;$)
+{
+ my $style = shift;
+ my $text = shift;
+ my $line_nr = shift;
+ my $expanded = 1 if (grep {$style eq $_} @EXPAND);
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($style eq
'tex' and $expanded))
+ {
+ $style = 'verbatim' if ($style eq 'verbatiminclude');
+ return html_default_attribute_class('pre', $style).">" .
&$protect_text($text) . '</pre>';
+ }
+ elsif ($style eq 'html' and $expanded)
+ {
+ chomp ($text);
+ return $text;
+ }
+ elsif ($expanded)
+ {
+ main::line_warn (sprintf(__("Raw format %s is not converted"),
$style), $line_nr);
+ return &$protect_text($text);
+ }
+ else
+ {
+ return '';
+ }
+}
+
+# This function formats a footnote reference and the footnote text associated
+# with a given footnote.
+# The footnote reference is the text appearing in the main document pointing
+# to the footnote text.
+#
+# arguments:
+# absolute number of the footnote (in the document)
+# relative number of the footnote (in the page)
+# identifier for the footnote
+# identifier for the footnote reference in the main document
+# main document file
+# footnote text file
+# array with the footnote text lines
+# the state. See menu entry.
+#
+# returns:
+# reference on an array containing the footnote text lines which should
+# have been updated
+# the text for the reference pointing on the footnote text
+sub html_default_foot_line_and_ref($$$$$$$$$)
+{
+ my $number_in_doc = shift;
+ my $number_in_page = shift;
+ my $footnote_id = shift;
+ my $place_id = shift;
+ my $document_file = shift;
+ my $footnote_file = shift;
+ my $lines = shift;
+ my $document_state = shift;
+
+ if ($document_file eq $footnote_file)
+ {
+ $document_file = $footnote_file = '';
+ }
+
+ $number_in_doc = $NO_NUMBER_FOOTNOTE_SYMBOL if
(!get_conf('NUMBER_FOOTNOTES'));
+
+ unshift (@$lines, '<h3>' .
+ &$anchor($footnote_id, $document_file . "#$place_id",
+ "($number_in_doc)")
+ . "</h3>\n");
+ # this is a bit obscure, this allows to add an anchor only if formatted
+ # as part of the document.
+ #$place_id = '' if ($document_state->{'outside_document'} or
$document_state->{'multiple_pass'} or $document_state->{'expansion'});
+ $place_id = '' if ($document_state->{'outside_document'} or
(defined($document_state->{'multiple_pass'}) and
$document_state->{'multiple_pass'} > 0));
+ return ($lines, &$anchor($place_id, $footnote_file . "#$footnote_id",
+ "($number_in_doc)"));
+}
+
+# formats a group of footnotes.
+#
+# argument:
+# array reference on the footnotes texts lines
+#
+# returns an array reference on the group of footnotes lines
+sub html_default_foot_section($)
+{
+ my $lines = shift;
+ unshift (@$lines, html_default_attribute_class('div', 'footnote').">\n"
,"$DEFAULT_RULE\n",
+ &$heading_text('footnotes', gdt('Footnotes'), 3)
+ );
+ push (@$lines, "</div>\n");
+ return $lines;
+}
+
+sub html_default_image_files($$$$)
+{
+ my $base = shift;
+ my $extension = shift;
+ my $texi_base = shift;
+ my $texi_extension = shift;
+ my @files = ();
+ return @files if (!defined($base) or ($base eq ''));
+ if (defined($extension) and ($extension ne ''))
+ {
+ push @files,["$base.$extension", "$texi_base.$texi_extension"];
+ }
+ foreach my $ext (@IMAGE_EXTENSIONS)
+ {
+ push @files,["$base.$ext", "$texi_base.$ext"];
+ }
+ return @files;
+}
+
+# format an image
+#
+# arguments:
+# image file name with path
+# image basename
+# a boolean true if we are in a preformatted format
+# image file name without path
+# alt text
+# width
+# height
+# raw alt
+# extension
+# path to working dir
+# path to file relative from working dir
+sub html_default_image($$$$$$$$$$$$$$$$$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ my $file_name = shift;
+ my $alt = shift;
+ my $width = shift;
+ my $height = shift;
+ my $raw_alt = shift;
+ my $extension = shift;
+ my $working_dir = shift;
+ my $file_path = shift;
+ my $in_paragraph = shift;
+ my $file_locations = shift;
+ my $base_simple_format = shift;
+ my $extension_simple_format = shift;
+ my $file_name_simple_format = shift;
+ my $line_nr = shift;
+
+ if (!defined($file_path) or $file_path eq '')
+ {
+ if (defined($extension) and $extension ne '')
+ {
+ $file = "$base.$extension";
+ }
+ else
+ {
+ $file = "$base.jpg";
+ }
+ main::line_warn (sprintf(__("address@hidden file `%s' (for HTML) not
found, using `%s'"), $base, $file), $line_nr);
+ }
+ elsif (! get_conf('COMPLETE_IMAGE_PATHS'))
+ {
+ $file = $file_name;
+ }
+ $alt = &$protect_text($base) if (!defined($alt) or ($alt eq ''));
+ return "[ $alt ]" if ($preformatted);
+ # it is possible that $file_name is more correct as it allows the user
+ # to chose the relative path.
+ $file = &$protect_text($file);
+ return "<img src=\"$file\" alt=\"$alt\">";
+}
+
+# format a target in the main document for an index entry.
+#
+# arguments:
+# target identifier
+# boolean true if in preformatted format
+# FIXME document the remaining
+sub html_default_index_entry_label($$$$$$$$$)
+{
+ my $identifier = shift;
+ my $preformatted = shift;
+ my $entry = shift;
+ my $index_name = shift;
+ my $index_command = shift;
+ my $texi_entry = shift;
+ my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ return '' if (!defined($identifier) or ($identifier !~ /\S/));
+ my $label = &$anchor($identifier);
+ return $label . "\n" if (!$preformatted);
+ return $label;
+}
+
+sub html_default_index_entry_command($$$$$$)
+{
+ my $command = shift;
+ my $index_name = shift;
+ my $label = shift;
+ my $entry_texi = shift;
+ my $entry_formatted = shift;
+ my $index_entry_ref = shift;
+
+ return $label;
+}
+
+# process definition commands line @deffn for example
+sub html_default_def_line($$$$$$$$$$$$$$$$)
+{
+ my $category_prepared = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ my $index_label = shift;
+ my $arguments_array = shift;
+ my $arguments_type_array = shift;
+ my $unformatted_arguments_array = shift;
+ my $command = shift;
+ my $class_name = shift;
+ my $category = shift;
+ my $class = shift;
+ my $style = shift;
+ my $original_command = shift;
+
+ $index_label = '' if (!defined($index_label));
+ chomp($index_label);
+ $category_prepared = '' if (!defined($category_prepared) or
($category_prepared =~ /^\s*$/));
+ $name = '' if (!defined($name) or ($name =~ /^\s*$/));
+ $type = '' if (!defined($type) or $type =~ /^\s*$/);
+ if (!defined($arguments) or $arguments =~ /^\s*$/)
+ {
+ $arguments = '';
+ }
+ else
+ {
+ chomp ($arguments);
+ $arguments = '<em>' . $arguments . '</em>';
+ }
+ my $type_name = '';
+ $type_name = " <em>$type</em>" if ($type ne '');
+ $type_name .= ' <strong>' . $name . '</strong>' if ($name ne '');
+ $type_name .= $arguments;
+ if (! get_conf('DEF_TABLE'))
+ {
+ return '<dt>'. $index_label. $category_prepared . ':' . $type_name .
"</dt>\n";
+ }
+ else
+ {
+ return "<tr><td align=\"left\">" . $type_name .
+ "</td><td align=\"right\">" . $category_prepared . $index_label .
"</td></tr>\n";
+ }
+}
+
+# a cartouche
+sub html_default_cartouche($$)
+{
+ my $text = shift;
+
+ if ($text =~ /\S/)
+ {
+ return html_default_attribute_class('table', 'cartouche')."
border=\"1\"><tr><td>\n" . $text . "</td></tr></table>\n";
+ }
+ return '';
+}
+
+sub html_default_sp($$)
+{
+ my $number = shift;
+ my $preformatted = shift;
+ return "<br>\n" x $number if (!$preformatted);
+ return "\n" x $number;
+}
+
+sub html_default_acronym_like($$$$$$)
+{
+ my $command = shift;
+ my $acronym_texi = shift;
+ my $acronym_text = shift;
+ my $with_explanation = shift;
+ my $explanation_lines = shift;
+ my $explanation_text = shift;
+ my $explanation_simply_formatted = shift;
+
+ my $attribute = $command;
+ my $opening = "<$attribute>";
+ if (defined($explanation_simply_formatted))
+ {
+ $opening = "<$attribute title=\"$explanation_simply_formatted\">";
+ }
+ if ($with_explanation)
+ {
+ return gdt('{acronym_like} ({explanation})', {'acronym_like' =>
$opening . $acronym_text . "</$attribute>", 'explanation' =>
$explanation_text},{'duplicate'=>1})
+ }
+ else
+ {
+ return $opening . $acronym_text . "</$attribute>";
+ }
+}
+
+sub html_default_quotation($$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $argument_text = shift;
+ my $argument_text_texi = shift;
+ my $authors = shift;
+ my $class = '';
+ $class = $command if ($command ne 'quotation');
+ my $attribution = '';
+ if ($authors)
+ {
+ foreach my $author (@$authors)
+ {
+ my $author_texi = $author->{'author_texi'};
+ chomp($author_texi);
+ $attribution .= gdt("address@hidden --- address@hidden", {'author'
=> $author_texi}, {'duplicate' => 1, 'allow_paragraph' => 1});
+ }
+ }
+ return html_default_attribute_class('blockquote', $class).">\n" . $text
."</blockquote>\n" . $attribution;
+}
+
+# format a whole index
+#
+# argument:
+# index text
+# index name
+sub html_default_print_index($$)
+{
+ my $text = shift;
+ my $name = shift;
+ return '' if (!defined($text));
+ return html_default_attribute_class('table', "index-$name")."
border=\"0\">\n" .
+ "<tr><td></td><th align=\"left\">" . gdt('Index Entry') .
"</th><td> </td><th align=\"left\"> " . gdt('Section') . "</th></tr>\n"
+ . "<tr><td colspan=\"4\"> $DEFAULT_RULE</td></tr>\n" . $text .
+ "</table>\n";
+}
+
+# format a letter entry in an index page. The letter entry contains
+# the index entries for the words beginning with that letter. It is
+# a target for links pointing from the summary of the index.
+#
+# arguments:
+# the letter
+# identifier for the letter entry. This should be used to make the target
+# identifier
+# text of the index entries
+sub html_default_index_letter($$$)
+{
+ my $letter = shift;
+ my $id = shift;
+ my $text = shift;
+ return $text if ($letter =~ /^\s*$/);
+ return '<tr><th>' . &$anchor($id,'',&$normal_text($letter, 0, 0, 0, 0, 0,
[])) .
+ "</th><td></td><td></td></tr>\n" . $text .
+ "<tr><td colspan=\"4\"> $DEFAULT_RULE</td></tr>\n";
+}
+
+# format an index entry (in a letter entry).
+#
+# arguments:
+# href to the main text, linking to the place where the index entry appears
+# entry text
+# href to the main text, linking to the section or node where the index
+# entry appears
+# section or node heading
+sub html_default_index_entry($$$$$$$$$$)
+{
+ my $text_href = shift;
+ my $entry = shift;
+ my $element_href = shift;
+ my $element_text = shift;
+ my $entry_file = shift;
+ my $current_element_file = shift;
+ my $entry_target = shift;
+ my $entry_element_target = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ return '' if ($entry !~ /\S/);
+ my $element = $index_entry_ref->{'real_element'};
+ if (defined($element))
+ {
+ my $element_set = 0;
+ if (get_conf('NODE_NAME_IN_INDEX'))
+ {
+ if ($element->{'node'})
+ {
+ $element_set = 1;
+ }
+ elsif ($element->{'with_node'})
+ {
+ $element = $element->{'with_node'};
+ $element_set = 1;
+ }
+ }
+ elsif (defined(get_conf('NODE_NAME_IN_INDEX')))
+ {
+ if (!$element->{'node'})
+ {
+ $element_set = 1;
+ }
+ elsif ($element->{'with_section'})
+ {
+ $element = $element->{'with_section'};
+ $element_set = 1;
+ }
+ }
+ if ($element_set)
+ {
+ $element_href = main::href($element,
$Texi2HTML::THIS_ELEMENT->{'file'},
+ $Texi2HTML::THISDOC{'line_nr'});
+ $element_text = $element->{'text'};
+ }
+ }
+
+ return '<tr><td></td><td valign="top">' . &$anchor('', $text_href, $entry)
+ . $INDEX_ENTRY_COLON . '</td><td> </td><td valign="top">' .
&$anchor('', $element_href, $element_text)
+ . "</td></tr>\n";
+}
+
+
+# format an index summary. This is a list of letters linking to the letter
+# entries.
+#
+# arguments:
+# array reference containing the formatted alphabetical letters
+# array reference containing the formatted non lphabetical letters
+sub html_default_index_summary($$)
+{
+ my $alpha = shift;
+ my $nonalpha = shift;
+
+ my $join = '';
+ my $nonalpha_text = '';
+ my $alpha_text = '';
+ $join = " \n<br>\n" if (@$nonalpha and @$alpha);
+ if (@$nonalpha)
+ {
+ $nonalpha_text = join("\n \n", @$nonalpha) . "\n";
+ }
+ if (@$alpha)
+ {
+ $alpha_text = join("\n \n", @$alpha) . "\n \n";
+ }
+ return "<table><tr><th valign=\"top\">" . gdt('Jump to') .":
</th><td>" .
+ $nonalpha_text . $join . $alpha_text . "</td></tr></table>\n";
+}
+
+sub html_default_element_label($$$$)
+{
+ my $id = shift;
+ my $element = shift;
+ my $command = shift;
+ my $line = shift;
+
+ return &$anchor($id) . "\n";
+}
+
+sub html_default_misc_element_label($$)
+{
+ my $id = shift;
+ my $misc_page_name = shift;
+ return &$anchor($id) . "\n";
+}
+
+sub html_default_anchor_label($$$$)
+{
+ my $id = shift;
+ my $anchor_text = shift;
+ my $anchor_reference = shift;
+ my $in_special_region = shift;
+ return &$anchor($id);
+}
+
+sub html_default_tab_item_texi($$$$$$)
+{
+ my $command = shift;
+ my $commands_stack = shift;
+ my $stack = shift;
+ my $state = shift;
+ my $line = shift;
+ my $line_nr = shift;
+
+ if (defined($commands_stack) and @$commands_stack and $commands_stack->[-1]
eq 'multitable' and @html_default_multitable_stack)
+ {
+ $html_default_multitable_stack[-1]->[1] = -1;
+ }
+ return undef;
+}
+
+sub html_default_line_command($$$$)
+{
+ my $command = shift;
+ my $arg_text = shift;
+ my $arg_texi = shift;
+ my $state = shift;
+
+ return '' if ($arg_text eq '' or ($command eq 'author' and
(!$state->{'region'} or $state->{'region'} ne 'titlepage')));
+ my $style = $line_command_map{$command};
+ if ($style)
+ {
+ my $attribute_text = '';
+ if ($style =~ /^(\w+)(\s+.*)/)
+ {
+ $style = $1;
+ $attribute_text = $2;
+ }
+ $arg_text = "<${style}$attribute_text>$arg_text</$style>";
+ }
+ $arg_text .= "<br>" if ($command eq 'author');
+ $arg_text .= "\n";
+ return $arg_text;
+}
+
+1;
Index: texi2html/formats/info.pm
===================================================================
RCS file: texi2html/formats/info.pm
diff -N texi2html/formats/info.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/formats/info.pm 9 Apr 2011 00:10:45 -0000 1.1
@@ -0,0 +1,3662 @@
+# vim: set filetype=perl:
+#
+#+##############################################################################
+#
+# info.pm: convert to info
+#
+# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+#
+# Some error messages come from texinfo (makeinfo), so copyright holder
+# is the FSF or the individual who wrote them. All come from before the
+# switch of texinfo to GPLv3+.
+#
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+use Data::Dumper;
+
+use strict;
+
+$Data::Dumper::Maxdepth = 25;
+
+my %info_default_indented_commands;
+my %info_default_format;
+my %info_default_enable_encoding_accents;
+my @simple_quoted_commands;
+my @asis_commands;
+my @chevron_commands;
+my %info_default_accent_commands = ();
+my %info_default_leaf_command = ();
+my $info_default_end_sentence_character;
+my $info_default_after_punctuation_characters;
+my $info_default_indent_length;
+my %info_default_indent_format_length;
+my $info_default_index_length_to_node;
+my $info_default_listoffloat_caption_entry_length;
+my $info_default_listoffloat_append;
+my %info_default_index_entries_counts;
+
+sub info_default_load(;$)
+{
+my $from_command_line = shift;
+
+t2h_default_set_variables_default();
+set_default('USE_SECTIONS', 0);
+set_default('USE_NODES', 1);
+set_default('SPLIT', '');
address@hidden = ('info', 'direntry');
+set_default('EXTENSION', 'info');
+set_default('SHOW_MENU', 1);
+set_default('SHOW_TITLE', 0);
+set_default('USE_SETFILENAME_EXTENSION', 1);
+set_default('INLINE_INSERTCOPYING', 1);
+set_default('SIMPLE_MENU', 1);
+$MENU_SYMBOL = '*';
+set_default('ENABLE_ENCODING_USE_ENTITY', 0);
+set_default('ENABLE_ENCODING', 1);
address@hidden = ('png', 'jpg', 'txt');
+$CAPTION_STYLE = 'asis';
+set_default('DEFAULT_ENCODING', 'ascii');
+set_default('HEADERS', 1);
+set_default('INLINE_CONTENTS', 0);
+
+
+$no_paragraph_commands{'anchor'} = 1;
+
+%simple_map = %default_simple_map;
+%simple_map_pre = %simple_map;
+%simple_map_texi = %simple_map;
+
+%things_map = %default_things_map;
+%pre_map = %things_map;
+
+%line_command_map = (
+ 'dircategory' => ''
+);
+
+# sc and var upcase.
address@hidden = ('cite', 'code', 'command', 'env', 'file', 'kbd',
+ 'option', 'samp');
address@hidden = ('asis', 'w', 'b', 'ctrl', 'i', 'math', 'sc', 't', 'r',
+ 'slanted', 'sansserif', 'var', 'titlefont', 'verb', 'clickstyle',
+ 'headitemfont');
address@hidden = ('key', 'indicateurl');
+
+%info_default_accent_commands = ();
+%info_default_leaf_command = ();
+
+%style_map = ();
+t2h_default_copy_style_map (\%default_style_map, \%style_map);
+
+foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents),
keys(%accent_map))
+{
+ $info_default_accent_commands{$accent_command} = 1;
+ $style_map{$accent_command} = { 'function' => \&info_default_accent };
+}
+
+foreach my $command (keys(%style_map))
+{
+ delete $style_map{$command}->{'quote'} if
(exists($style_map{$command}->{'quote'}));
+ if (grep {$_ eq $command} @simple_quoted_commands)
+ {
+ delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
+ $style_map{$command}->{'begin'} = '`';
+ $style_map{$command}->{'end'} = "'";
+ next;
+ }
+ elsif (grep {$_ eq $command} @asis_commands)
+ {
+ delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
+ delete $style_map{$command}->{'begin'} if
(exists($style_map{$command}->{'begin'}));
+ delete $style_map{$command}->{'end'} if
(exists($style_map{$command}->{'end'}));
+ }
+ if (grep {$_ eq $command} @chevron_commands)
+ {
+ delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
+ $style_map{$command}->{'begin'} = '<';
+ $style_map{$command}->{'end'} = '>';
+ next;
+ }
+ $info_default_leaf_command{$command} = 1 if
($style_map{$command}->{'type'} and $style_map{$command}->{'type'} eq
'simple_style');
+}
+
+$style_map{'strong'}->{'begin'} = '*';
+$style_map{'strong'}->{'end'} = '*';
+$style_map{'dfn'}->{'begin'} = '"';
+$style_map{'dfn'}->{'end'} = '"';
+$style_map{'emph'}->{'begin'} = '_';
+$style_map{'emph'}->{'end'} = '_';
+
+
+foreach my $command (keys(%info_default_leaf_command))
+{
+ if (defined ($style_map{$command}->{'args'}))
+ {
+ $style_map{$command}->{'orig_args'} = [
@{$style_map{$command}->{'args'}} ];
+ }
+ else
+ {
+ $style_map{$command}->{'orig_args'} = [ 'normal' ];
+ }
+ $style_map{$command}->{'args'} = [];
+ foreach my $arg (@{$style_map{$command}->{'orig_args'}})
+ {
+ push @{$style_map{$command}->{'args'}}, 'keep';
+ }
+}
+
+$style_map{'uref'}->{'function'} = \&info_default_uref;
+$style_map{'url'}->{'function'} = \&info_default_uref;
+$style_map{'email'}->{'function'} = \&info_default_email;
+
+%style_map_pre = ();
+%style_map_texi = ();
+t2h_default_copy_style_map (\%style_map, \%style_map_pre);
+t2h_default_copy_style_map (\%style_map, \%style_map_texi);
+
+$special_list_commands{'itemize'} = {};
+
+%info_default_indent_format_length = ('enumerate' => 2,
+ 'itemize' => 3,
+ 'table' => 0,
+ 'vtable' => 0,
+ 'ftable' => 0,
+ );
+
+
+%format_map = ();
+foreach my $format ('group', 'raggedright', 'cartouche')
+{
+ $format_map{$format} = '';
+}
+
+foreach my $menu_command('menu', 'detailmenu', 'direntry', 'menu_comment')
+{
+ $complex_format_map{$menu_command} = {'begin' => '' , 'end' => ''};
+}
+
+foreach my $command (keys (%complex_format_map),
keys(%info_default_indent_format_length), 'quotation', 'smallquotation',
'deff_item', 'deff_itemx')
+{
+ $info_default_indented_commands{$command} = 1;
+}
+
+foreach my $command (keys(%info_default_indented_commands), 'multitable',
'float', 'flushright', 'flushleft', 'center')
+{
+ $info_default_format{$command} = 1;
+}
+
+# it doesn't change anything for multitable
+foreach my $non_indented_command('format', 'smallformat', 'menu',
+ 'detailmenu', 'direntry', 'multitable')
+{
+ $info_default_indented_commands{$non_indented_command} = 0;
+}
+
+$info_default_end_sentence_character = quotemeta($punctuation_characters);
+$info_default_after_punctuation_characters =
quotemeta($after_punctuation_characters);
+$info_default_indent_length = 5;
+
+$info_default_index_length_to_node = 41;
+
+$info_default_listoffloat_caption_entry_length = 41;
+$info_default_listoffloat_append = '...';
+
+t2h_default_push_handler(\&info_default_init_accent_enable_encoding,
address@hidden);
+t2h_default_push_handler(\&info_default_init_variables, address@hidden);
+
+
+$style = \&info_default_style;
+$print_page_head = \&info_default_print_page_head;
+$contents = \&info_default_noop;
+$shortcontents = \&info_default_noop;
+$about_body = \&info_default_noop;
+$print_Footnotes = \&info_default_noop;
+$copying_comment = \&info_default_copying_comment;
+$element_heading = \&info_default_element_heading;
+$heading = \&info_default_heading;
+$normal_text = \&info_default_normal_text;
+$paragraph = \&info_default_paragraph;
+$preformatted = \&info_default_preformatted;
+$empty_preformatted = \&info_default_preformatted;
+$empty_line = \&info_default_empty_line;
+# maybe should not be called from the main program?
+$print_page_foot = \&info_default_print_page_foot;
+$print_Top_footer = \&info_default_print_Top_footer;
+$print_Top = \&info_default_print_section;
+$print_section = \&info_default_print_section;
+$end_section = \&info_default_end_section;
+$one_section = \&info_default_one_section;
+$begin_format_texi = \&info_default_begin_format_texi;
+$begin_style_texi = \&info_default_begin_style_texi;
+$begin_paragraph_texi = \&info_default_begin_paragraph_texi;
+$simple_command = \&info_default_simple_command;
+$thing_command = \&info_default_thing_command;
+$begin_special_region = \&info_default_begin_special_region;
+$end_special_region = \&info_default_end_special_region;
+$anchor_label = \&info_default_anchor_label;
+$element_label = \&info_default_noop;
+$menu_link = \&info_default_menu_link;
+#$menu_command = \&info_default_menu_command;
+$complex_format = \&info_default_complex_format;
+$quotation = \&info_default_quotation;
+$misc_command_line = \&info_default_misc_commands;
+$external_ref = \&info_default_external_ref;
+$internal_ref = \&info_default_internal_ref;
+$image = \&info_default_image;
+$image_files = \&info_default_image_files;
+$index_summary = \&info_default_index_summary;
+$summary_letter = \&info_default_summary_letter;
+$index_entry = \&info_default_index_entry;
+$index_entry_command = \&t2h_default_index_entry_command;
+$index_letter = \&info_default_index_letter;
+$printindex = \&info_default_printindex;
+$print_index = \&info_default_print_index;
+$index_entry_label = \&info_default_index_entry_label;
+$foot_section = \&info_default_foot_lines;
+$foot_line_and_ref = \&info_default_foot_line_and_ref;
+$footnote_texi = \&info_default_footnote_texi;
+$list_item = \&info_default_list_item;
+$format_list_item_texi = \&info_default_format_list_item_texi;
+$format = \&info_default_format;
+$tab_item_texi = \&info_default_tab_item_texi;
+$acronym_like = \&info_default_acronym_like;
+$sp = \&info_default_sp;
+$paragraph_style_command = \&info_default_paragraph_style_command;
+$cell = \&info_default_cell;
+$row = \&info_default_row;
+$table_list = \&info_default_table_list;
+$def_item = \&info_default_def_item;
+$def = \&info_default_def;
+$def_line = \&info_default_def_line;
+$float = \&info_default_float;
+$listoffloats_entry = \&info_default_listoffloats_entry;
+$listoffloats = \&info_default_listoffloats;
+$colon_command = \&info_default_colon_command;
+$raw = \&info_default_raw;
+$line_command = \&info_default_line_command;
+$comment = \&t2h_default_comment;
+$unknown_style = \&info_default_unknown_style;
+$heading_text = \&t2h_default_heading_text;
+
+}
+
+my %info_default_state_map = ();
+my $info_default_out_file_nr = 1;
+my $info_default_dir_specification = '';
+my @info_default_pending_indirect = ();
+my @info_default_pending_footnotes = ();
+my $info_default_state_nr = 0;
+
+# maximal length of index entries line number information. Each entry is
+# an index name.
+my %info_default_index_line_string_length = ();
+my %info_default_index_entries = ();
+my $info_default_footnote_index = 0;
+my $info_default_current_node = undef;
+
+my %info_default_command_handler_expand;
+
+sub info_default_intercept_handler
+{
+ my $command = $_[0];
+ my $result = &{$info_default_command_handler_expand{$command}}(@_);
+ return info_default_store_text (undef, $result, $command);
+}
+
+sub info_default_init_variables()
+{
+ %info_default_state_map = ();
+ $info_default_out_file_nr = 1;
+ $info_default_dir_specification = '';
+ @info_default_pending_indirect = ();
+ @info_default_pending_footnotes = ();
+ $info_default_state_nr = 0;
+
+ %info_default_index_line_string_length = ();
+ %info_default_index_entries = ();
+ $info_default_footnote_index = 0;
+ $info_default_current_node = undef;
+ #$Texi2HTML::THISDOC{'SPLIT'} = 0 if ($OUTPUT_FORMAT eq 'info');
+ #$FRAMES = 0 if ($OUTPUT_FORMAT eq 'info');
+
+ foreach my $command (keys (%command_handler))
+ {
+ if ($command_handler{$command}->{'expand'})
+ {
+ $info_default_command_handler_expand{$command} =
$command_handler{$command}->{'expand'};
+ $command_handler{$command}->{'expand'} =
\&info_default_intercept_handler;
+ }
+ }
+}
+
+# this is put in command_handler_init such that it sets things right
+# in case ENABLE_ENCODING is set and has lead to modification of the
+# accent functions
+sub info_default_init_accent_enable_encoding()
+{
+ return unless (get_conf('ENABLE_ENCODING') and get_conf('USE_UNICODE'));
+ foreach my $key (keys(%unicode_accents), 'dotless')
+ {
+ $info_default_enable_encoding_accents{$key} = 1;
+ $t2h_enable_encoding_default_accent{'normal'}->{$key} =
\&t2h_default_accent;
+ $t2h_enable_encoding_default_accent{'texi'}->{$key} =
\&t2h_default_accent;
+ $t2h_enable_encoding_default_accent{'pre'}->{$key} = \&t2h_default_accent;
+ $style_map{$key}->{'function'} = \&info_default_accent;
+ $style_map_texi{$key}->{'function'} = \&info_default_accent;
+ $style_map_pre{$key}->{'function'} = \&info_default_accent;
+ }
+}
+
+sub info_default_uref($$)
+{
+ shift;
+ my $args = shift;
+ my $url = shift @$args;
+ my $text = shift @$args;
+ my $replacement = shift @$args;
+ $url = main::normalise_space($url);
+ $replacement = '' if (!defined($replacement));
+ $replacement = main::normalise_space($replacement);
+ return $replacement if ($replacement ne '');
+ $text = '' if (!defined($text));
+ $text = main::normalise_space($text);
+ return "`$url'" if ($text eq '');
+ return "$text ($url)";
+}
+
+sub info_default_email($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $mail = shift @$args;
+ my $text = shift @$args;
+ $mail = main::normalise_space($mail);
+ $text = '' if (!defined($text));
+ $text = main::normalise_space($text);
+ $mail = "<$mail>";
+ return $mail unless ($text ne '');
+ return "$text $mail";
+}
+
+
+sub info_default_accent($$$)
+{
+ my @args = @_;
+ my $command = shift;
+ my $args = shift;
+ my $text = $args->[0];
+ my $style_stack = shift;
+ my $state = shift;
+
+ my $result;
+ if (get_conf('ENABLE_ENCODING') and
$info_default_enable_encoding_accents{$command})
+ {
+ $result = &t2h_enable_encoding_normal_accent(@args);
+ }
+ else
+ {
+ $result = &t2h_default_accent(@args);
+ }
+ if (scalar(@$style_stack) and
$info_default_accent_commands{$style_stack->[-1]})
+ { # still more accents on the stack
+ return $result;
+ }
+ return info_default_store_text($state,$result,'accents_commands');
+}
+
+sub info_default_noop
+{
+ return '';
+}
+
+sub info_default_copying_comment($$$$)
+{
+ my $copying_lines = shift;
+ my $copying_text = shift;
+ my $copying_no_texi = shift;
+ my $copying_simple_text = shift;
+ return '' if ($copying_text eq '');
+ return $copying_text;
+}
+
+sub info_default_byte_count($)
+{
+ my $string = shift;
+ my $out_encoding = get_conf('OUT_ENCODING');
+ if ($out_encoding and lc($out_encoding) ne 'us-ascii' and
get_conf('USE_UNICODE'))
+ {
+ return length (Encode::encode($out_encoding, $string));
+ }
+ # There is no default encoding. We assume it is us-ascii. Not sure
+ # about what perl thinks it is...
+ #print STDERR "Unknown encoding for: $string\n" if (!$out_encoding);
+ return length($string);
+}
+
+sub info_default_count_lines($;$$)
+{
+ my $text = shift;
+ my $indent_length = shift;
+ my $indentation_done = shift;
+
+ my $blank_line;
+ my $no_indentation = 0;
+
+ if (!defined($indentation_done) or $indentation_done)
+ {
+ $no_indentation = 1;
+ $indent_length = 0;
+ }
+ my @lines = split /^/, $text;
+ # don't accept empty text.
+ @lines = ('') if (address@hidden);
+ my $line_passed = scalar(@lines);
+ $line_passed-- if ($line_passed);
+
+ my $end_of_line = 0;
+ if (($#lines > 1) and !$end_of_line and ($lines[-1] !~ /\S/) and
($lines[-2] !~ /\S/))
+ {
+ $blank_line = 1;
+ }
+ my $last_line = $lines[-1];
+
+ my $indented_text = shift (@lines);
+ #print STDERR "COUNT info_default_count_lines(i_done $no_indentation,
i_l $indent_length) i_t `$indented_text'\n";
+ foreach my $line (@lines)
+ {
+ if ($indent_length and $line =~ /\S/)
+ {
+ $indented_text .= ' ' x $indent_length . $line;
+ }
+ else
+ {
+ $indented_text .= $line;
+ }
+ }
+ if (chomp($text))
+ {
+ $line_passed++;
+ $end_of_line = 1;
+ }
+ return ($line_passed, $end_of_line, $last_line, $indented_text,
$blank_line);
+}
+
+sub info_default_get_state($)
+{
+ my $state = shift;
+ if (!exists $info_default_state_map{$state})
+ {
+ #print STDERR "NEW state $info_default_state_nr\n";
+ my ($current_command, $top_stack);
+ $info_default_state_map{$state} = {};
+ info_default_reset_state($info_default_state_map{$state});
+ # since the page head always leave a blank line, and the state may be
+ # used for text right after the page head, we set it to 1 here.
+ # it may be wrong in other contexts, to be seen.
+ $info_default_state_map{$state}->{'blank_line'} = 1;
+ $info_default_state_map{$state}->{'only_spaces'} = 1;
+ # this is the first line, so set to 1. This is reset later in
+ # most cases, when a node is seen, but may still be useful in
+ # @footnote, for example
+ $info_default_state_map{$state}->{'line_count'} = 1;
+ $info_default_state_map{$state}->{'offset_in_file'} = 0;
+ $info_default_state_map{$state}->{'nr'} = $info_default_state_nr;
+ $info_default_state_map{$state}->{'state'} = $state;
+ $info_default_state_map{$state}->{'multitable_stack'} = [];
+ @{$info_default_state_map{$state}->{'align_stack'}} =
({'command'=>'normal'});
+ $info_default_state_nr++;
+ }
+ #print STDERR "RETURN state $state $info_default_state_map{$state}
$info_default_state_map{$state}->{'nr'}\n";
+ return $info_default_state_map{$state};
+}
+
+sub info_default_reset_state($)
+{
+ my $info_state = shift;
+ $info_state->{'top'} = {};
+ $info_state->{'current'} = $info_state->{'top'};
+}
+
+sub info_default_iterator_next($$$)
+{
+ my $current_command = shift;
+ my $command_index = shift;
+ my $command_close = shift;
+ #print STDERR "NNNNNNNNNNNNNN iterator_next current $current_command idx
$command_index close $command_close\n";
+
+ my $sub_command = $current_command->{'content'}->[$command_index];
+
+ if ($sub_command->{'content'} and !$command_close)
+ {
+ return ($sub_command, 0, 0);
+ }
+
+ if ($current_command->{'content'}->[$command_index+1])
+ {
+ return ($current_command, $command_index+1, 0);
+ }
+ elsif (defined($current_command->{'parent'}))
+ {
+ return ($current_command->{'parent'},
$current_command->{'index_in_parent'}, 1);
+ }
+ else
+ {
+ return (undef, undef, undef);
+ }
+}
+
+# return ($current_next, $index_next, $close_next, $text, $command);
+#
+# returns the next in tree, identified by the triplet
+# ($current_next, $index_next, $close_next) and also the command
+# and/or text if defined, in $text and $command.
+sub info_default_next($$$)
+{
+ my $current = shift;
+ my $index = shift;
+ my $close = shift;
+
+ my $text;
+ my $command;
+
+ my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
+ return ($current_next, $index_next, $close_next, $text, $command) if
(!defined($current_next));
+
+ my $content = $current_next->{'content'}->[$index_next];
+ $command = $content->{'command'} if (defined($content->{'command'}));
+ if ($close_next)
+ {
+ return ($current_next, $index_next, $close_next, $content->{'end'},
$command);
+ }
+ if (defined($content->{'text'}))
+ {
+ return ($current_next, $index_next, $close_next, $content->{'text'},
$command);
+ }
+ if (defined($content->{'begin'}))
+ {
+ $text = $content->{'begin'};
+ }
+ if (defined($content->{'end'}) and !defined($content->{'content'}))
+ {
+ if (!defined($text))
+ {
+ $text = $content->{'end'};
+ }
+ else
+ {
+ $text .= $content->{'end'};
+ }
+ }
+ return ($current_next, $index_next, $close_next, $text, $command);
+}
+
+
+sub info_default_process_line_text($$$)
+{
+ my $text = shift;
+ my $line_width_counter = shift;
+ my $indent_length = shift;
+ $indent_length = 0 if (!defined($indent_length));
+
+ my $line_passed = 0;
+ my $chomped_text = $text;
+ my $end_of_line = chomp($chomped_text);
+ if ($indent_length > $line_width_counter and $chomped_text ne '')
+ {
+ $text = ' ' x ($indent_length - $line_width_counter) . $text;
+ }
+ $line_width_counter += t2h_default_string_width($text);
+ # it seems like it never happens in the tests.
+ if ($end_of_line)
+ {
+ $line_passed = 1;
+ $line_width_counter = 0;
+ }
+ return ($line_width_counter, $line_passed, $text);
+}
+
+# Beware that there is a pending word if the text doesn't end with
+# a space
+sub info_default_process_para_text($$$$$;$$)
+{
+ my $text = shift;
+ my $line_char_counter = shift;
+ my $pending_spaces_word = shift;
+ my $indent_length = shift;
+ my $max_column = shift;
+ my $keep_end_of_lines = shift;
+ $keep_end_of_lines = 0 if (!$keep_end_of_lines);
+# indentation for the lines except for the first one
+ my $indent_length_next = shift;
+ $indent_length = 0 if (!defined($indent_length));
+ $indent_length_next = $indent_length if (!defined($indent_length_next));
+
+ my $line_passed = 0;
+ my $result = '';
+
+ #print STDERR
"process_text(indent($indent_length,$indent_length_next),keep_eol
$keep_end_of_lines) spaces `$pending_spaces_word->{'spaces'}')
line_char_counter $line_char_counter |$text|\n";
+
+ while ($text ne '')
+ {
+ #print STDERR "l_c_c $line_char_counter pending_word
".var_to_str($pending_spaces_word->{'word'}).", pending_spaces
`$pending_spaces_word->{'spaces'}', result `$result'\n";
+ if (!$keep_end_of_lines and $text =~ s/^(\s+)//)
+ {
+ my $new_spaces = $1;
+ # in general there are no end of lines in the lines cut, since they
+ # are replaced by spaces in the main loop. However, it may happen
+ # with @* in @def* lines
+ my @lines = split /^/, $new_spaces;
+ my $eol_spaces;
+ # last line is in $new_spaces, other lines are in $eol_spaces
+ if (@lines > 1)
+ {
+ $new_spaces = pop @lines;
+ $eol_spaces = join ("", @lines);
+ #print STDERR
"EOL_SPACES[$line_char_counter](+$pending_spaces_word->{'spaces'})
`$eol_spaces'\n";
+ }
+ if (defined($pending_spaces_word->{'word'}))
+ {
+ # add spaces in front if needed for the indentation
+ if ($indent_length > $line_char_counter +
t2h_default_string_width($pending_spaces_word->{'spaces'}))
+ {
+ $pending_spaces_word->{'spaces'} = ' ' x ($indent_length -
$line_char_counter) . $pending_spaces_word->{'spaces'};
+ }
+ $result .= $pending_spaces_word->{'spaces'} .
$pending_spaces_word->{'word'};
+ $line_char_counter +=
t2h_default_string_width($pending_spaces_word->{'spaces'})+t2h_default_string_width($pending_spaces_word->{'word'});
+ $pending_spaces_word->{'spaces'} = $new_spaces;
+ $pending_spaces_word->{'word'} = undef;
+ }
+ elsif (!$eol_spaces)
+ {
+ $pending_spaces_word->{'spaces'} .= $new_spaces;
+ }
+ if ($eol_spaces)
+ {
+ $result .= $eol_spaces;
+ $line_passed += scalar(@lines);
+ $indent_length = $indent_length_next;
+ $line_char_counter = 0;
+ $pending_spaces_word->{'spaces'} = '';
+ }
+ if ((t2h_default_string_width($pending_spaces_word->{'spaces'}) +
$line_char_counter > $max_column))
+ {
+ $pending_spaces_word->{'spaces'} = '';
+ $result .= "\n";
+ $line_passed++;
+ $indent_length = $indent_length_next;
+ $line_char_counter = 0;
+ }
+ }
+ else
+ {
+ my $word;
+ if ($keep_end_of_lines)
+ {
+ $word = $text;
+ $text = '';
+ }
+ elsif ($text =~ s/^([^\s]+)//)
+ {
+ $word = $1;
+ }
+ #else
+ #{
+ # die "BUG: Impossible situation.\n";
+ #}
+ $pending_spaces_word->{'word'} = '' if
(!defined($pending_spaces_word->{'word'}));
+ $pending_spaces_word->{'word'} .= $word;
+ # The $line_char_counter != 0 is here to cope with the case of a
+ # word longer than $line_char_counter followed by more text:
+ # a line would be passed each time some piece text is appended.
+ if
((t2h_default_string_width($pending_spaces_word->{'spaces'})+t2h_default_string_width($pending_spaces_word->{'word'})
+ $line_char_counter > $max_column) and $line_char_counter != 0)
+ {
+ $pending_spaces_word->{'spaces'} = '';
+ $result .= "\n";
+ $line_passed++;
+ $indent_length = $indent_length_next;
+ $line_char_counter = 0;
+ }
+ }
+ }
+ return ($line_char_counter, $pending_spaces_word, $line_passed, $result)
+}
+
+sub info_default_skip_spaces($$$)
+{
+ my $current = shift;
+ my $index = shift;
+ my $close = shift;
+
+ #print STDERR "SKIP_SPACES\n";
+ while(1)
+ {
+ my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
+ return if ($close_next or (!defined($current_next)));
+ my $content = $current_next->{'content'}->[$index_next];
+ if (defined($content->{'begin'}))
+ {
+ $content->{'begin'} =~ s/^\s*//;
+ #print STDERR "SKIP_SPACES begin\n";
+ return if ($content->{'begin'} ne '');
+ }
+ if (defined($content->{'content'}) or
defined($content->{'format_name'})
+ or $content->{'definition_line'})
+ { # non empty commands stop space skipping, even if they contain
+ # only spaces, like @asis{ }
+ # also for item(x) that have format_name defined
+ #print STDERR "SKIP_SPACES command?\n";
+ return;
+ }
+ if (defined($content->{'text'}))
+ {
+ my $command = '';
+ $command = $content->{'command'} if
(defined($content->{'command'}));
+ #print STDERR "SKIP_SPACES($command) text\n";
+ $content->{'text'} =~ s/^\s*//;
+ return if ($content->{'text'} ne '');
+ }
+ if (defined($content->{'end'}))
+ {
+ #print STDERR "SKIP_SPACES end\n";
+ $content->{'end'} =~ s/^\s*//;
+ return if ($content->{'end'} ne '');
+ }
+ ($current, $index, $close) = ($current_next, $index_next, $close_next);
+ }
+}
+
+sub info_default_store_pending($$;$)
+{
+ my $line_char_counter = shift;
+ my $pending_spaces_word = shift;
+ my $indent_length = shift;
+
+ $indent_length = 0 if (!defined($indent_length));
+ my $indent_text = '';
+ $indent_text = ' ' x $indent_length;
+
+ #print STDERR "store_pending(spaces `$pending_spaces_word->{'spaces'}',
indent($indent_length) `$indent_text' word
`".var_to_str($pending_spaces_word->{'word'})."'\n";
+ my $result = $pending_spaces_word->{'spaces'};
+ $pending_spaces_word->{'spaces'} = '';
+ if (defined($pending_spaces_word->{'word'}))
+ {
+ $result .= $pending_spaces_word->{'word'};
+ $pending_spaces_word->{'word'} = undef;
+ }
+
+ my $chomped_result = $result;
+ chomp ($chomped_result);
+ if ($line_char_counter == 0 and $chomped_result ne '')
+ {
+ $result = $indent_text . $result;
+ }
+
+ $line_char_counter += t2h_default_string_width($result);
+ return ($line_char_counter, $pending_spaces_word, $result);
+}
+
+sub info_default_output($)
+{
+ my $info_state = shift;
+ my $result = '';
+ #print STDERR "Storing the stack\n";
+ print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]) if
(get_conf('DEBUG'));
+ my ($bytes_count, $lines_count);
+ ($bytes_count, $result, $lines_count) =
info_default_process_content($info_state->{'top'}, $info_state);
+ $info_state->{'offset_in_file'} += $bytes_count;
+ $info_state->{'line_count'} += $lines_count;
+ #print STDERR "HHHHHH($lines_count) $info_state->{'line_count'}: $result\n";
+ info_default_reset_state($info_state)
+ if (!defined($info_state->{'current'}->{'command'}));
+ return $result;
+}
+
+sub info_default_process_content($$)
+{
+ my $current_command = shift;
+ my $info_state = shift;
+
+ my $length = 0;
+ my $result = '';
+
+ my $line_char_counter = 0;
+ my $all_line_passed = 0;
+
+ my $pending_spaces_word;
+ $pending_spaces_word->{'spaces'} = '';
+ my $preformatted = 0;
+ my $indent_level = 0;
+ my $item_pending;
+ my $in_exdent = 0;
+ my $in_para = 0;
+ my $in_w = 0;
+ my $table_item_line = 0;
+ my $in_table_item = 0;
+ my $max_column = get_conf('FILLCOLUMN');
+ my $direntry = 0;
+ my $preformatted_format = 0;
+ my $indent_length = 0;
+
+ # for formats that needs to process a full line (center and flushright)
+ # to know the line length before outputing
+ my $current_line = undef;
+
+ my ($current, $index, $close) = ($current_command, 0, 0);
+
+ #print STDERR "info_default_process_content: $current_command\n";
+ while(1)
+ {
+ last if (!defined($current));
+ my $content = $current->{'content'}->[$index];
+ my $text_added = '';
+ my $line_added_before_item = 0;
+ my $indentation_done = 0;
+ my $prepend_newline;
+
+ if (get_conf('DEBUG'))
+ {
+ my $text_item_pending = '';
+ $text_item_pending = $item_pending if (defined($item_pending));
+ my $text_length = '';
+ $text_length = "$content->{'text'}" if defined($content->{'text'});
+ my $text_command = '';
+ $text_command = $content->{'command'} if
defined($content->{'command'});
+ my $in_node_count = 0;
+ $in_node_count = $info_state->{'line_count'} if
defined($info_state->{'line_count'});
+ print STDERR
"($text_command|$text_length|$close|${all_line_passed}+$in_node_count|l_c_cnt
$line_char_counter) prfrmted $preformatted para $in_para indent_lvl
$indent_level($indent_length) in_exdent $in_exdent in_w $in_w only_spaces
$info_state->{'only_spaces'} blank_line $info_state->{'blank_line'}
table_item_line $table_item_line in_table_item $in_table_item item_pending
$text_item_pending spaces: `$pending_spaces_word->{'spaces'}' word:
".main::var_to_str($pending_spaces_word->{'word'})."\n";
+ }
+
+ if ($close)
+ {
+ if (defined($content->{'end'}))
+ {
+ $text_added .= $content->{'end'};
+ }
+ if ($complex_format_map{$content->{'command'}} and
$content->{'content'})
+ {
+ $preformatted_format--;
+ }
+ # the format is always empty in the main program so the warning
+ # has to be done here
+ if (defined($content->{'total_item_nr'}) and
!$content->{'total_item_nr'} and $content->{'content'})
+ {
+ main::line_warn (sprintf(__("address@hidden has text but no
address@hidden"), $content->{'command'}), $content->{'line_nr'});
+ }
+ # check whether there is a blank line following, to avoid adding
+ # one when closing a format.
+ # This is not a required check if not in preformatted since doubled
+ # blank lines are discarded.
+ my $followed_by_blank_line = 0;
+ if ($preformatted_format)
+ {
+ my ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current, $index, $close);
+ if (defined($command_next) and $command_next eq 'preformatted')
+ {
+ ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current_next, $index_next, $close_next);
+ $followed_by_blank_line = 1 if (defined($text_next) and
$text_next =~ /^\s*$/);
+ }
+ }
+
+ if ($info_default_indented_commands{$content->{'command'}})
+ {
+ $indent_level--;
+ $indent_length = $indent_level * $info_default_indent_length;
+ # $preformatteed cannot be used here since preformatted
+ # is closed before the end of a format
+ #if ($indent_level > 0 and !$info_state->{'blank_line'} and
$content->{'command'} !~ /^deff_item/ and !$preformatted_format)
+ if ($indent_level > 0 and !$info_state->{'blank_line'} and
$content->{'command'} !~ /^deff_item/ and !$followed_by_blank_line)
+ {
+ $text_added .= "\n";
+ }
+ # this nullify a potential noindent in a random format
+ $info_state->{'indent_para'} = undef;
+ }
+ elsif (($complex_format_map{$content->{'command'}} and
$content->{'command'} ne 'menu') or $content->{'command'} eq 'cartouche')
+ {
+ if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level > 0) and
!$followed_by_blank_line)
+ {
+ $text_added .= "\n";
+ }
+ }
+ if ($content->{'command'} eq 'paragraph' and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal')
+ {
+ # if there is no space at the end of a paragraph, there may be
+ # pending text, for example, if there is an ending line like
+ # Some address@hidden a comment
+ my $pending;
+ ($line_char_counter, $pending_spaces_word, $pending) =
info_default_store_pending($line_char_counter, $pending_spaces_word,
$indent_length);
+ $text_added .= $pending if (defined($pending));
+ $text_added =~ s/\s*$//;
+ $pending_spaces_word->{'spaces'} = '';
+ $in_para = 0;
+ $info_state->{'indent_para'} = undef;
+ $text_added .= "\n" unless (($line_char_counter +
t2h_default_string_width($text_added)) == 0);
+ }
+ elsif ($content->{'command'} eq 'preformatted')
+ {
+ # if preformatted doesn't end with a newline, it is added here
+ $text_added .= "\n" unless ($line_char_counter == 0);
+ $preformatted--;
+ }
+ elsif ($content->{'command'} eq 'menu')
+ {
+ $text_added .= "\n" unless ($info_state->{'blank_line'});
+ }
+ elsif ($content->{'command'} eq 'float')
+ {
+ #$text_added = "\n" . $text_added unless
($info_state->{'blank_line'});
+ $prepend_newline = 1 unless ($info_state->{'blank_line'});
+ }
+ elsif ($content->{'command'} eq 'w')
+ {
+ $in_w--;
+ }
+ elsif ($paragraph_style{$content->{'command'}})
+ {
+ my $popped = pop @{$info_state->{'align_stack'}};
+ print STDERR "BUG".main::format_line_number().": align_stack,
popped $popped->{'command'} ne command $content->{'command'}\n" if
($popped->{'command'} ne $content->{'command'});
+ }
+ elsif ($content->{'command'} eq 'multitable')
+ {
+ my $multitable = pop @{$info_state->{'multitable_stack'}};
+ if (!defined($multitable->{'cells'}) and ($result ne ''))
+ {
+ $multitable->{'result'} .= $result;
+ $multitable->{'length'} += $length;
+ $multitable->{'line_count'} += $all_line_passed;
+ }
+ $max_column = $multitable->{'max_column_kept'};
+ $result = $multitable->{'result_kept'};
+ $line_char_counter = $multitable->{'line_char_counter_kept'};
+ $all_line_passed = $multitable->{'all_line_passed_kept'};
+ $indent_level = $multitable->{'indent_level_kept'};
+ $indent_length = $multitable->{'indent_length_kept'};
+ #$indent_length_next_line = undef;
+ $length = $multitable->{'length_kept'};
+ $info_state->{'offset_in_file'} =
$multitable->{'offset_in_file_kept'};
+ $info_state->{'line_count'} = $multitable->{'line_count_kept'};
+ #print STDERR "MULTITABLE close, lines:
$multitable->{'line_count_kept'} + $all_line_passed\n";
+ foreach my $anchor_and_index (@{$multitable->{'anchors'}},
@{$multitable->{'index_entries'}})
+ {
+ $anchor_and_index->{'line_nr'} +=
$multitable->{'line_count_kept'} + $all_line_passed;
+ }
+ if (! scalar(@{$info_state->{'multitable_stack'}}))
+ {
+ #print STDERR "MULTITABLE close, lengths:
$multitable->{'offset_in_file_kept'} + $length\n";
+ foreach my $anchor (@{$multitable->{'anchors'}})
+ {
+ $anchor->{'info_offset'} +=
$multitable->{'offset_in_file_kept'} + $length;
+ }
+ }
+ else
+ {
+ push
@{$info_state->{'multitable_stack'}->[-1]->{'anchors'}},
@{$multitable->{'anchors'}};
+ push
@{$info_state->{'multitable_stack'}->[-1]->{'index_entries'}},
@{$multitable->{'index_entries'}};
+ }
+ $text_added .= $multitable->{'result'};
+ $indentation_done = 1;
+
+ goto new_text;
+ }
+ elsif ($content->{'command'} eq 'multitable_cell')
+ {
+ my $cell =
$info_state->{'multitable_stack'}->[-1]->{'cells'}->[-1];
+ $cell->{'result'} = $result;
+ $cell->{'length'} = $length;
+ $cell->{'line_passed'} = $all_line_passed;
+ }
+ elsif ($content->{'command'} eq 'direntry')
+ {
+ $direntry--;
+ # this has to be done here, otherwise, at the end, $direntry
+ # would be 0
+ $info_default_dir_specification .= $text_added;
+ $text_added = '';
+ }
+ elsif ($content->{'command'} eq 'multitable_row')
+ {
+ my $multitable = $info_state->{'multitable_stack'}->[-1];
+ my $indent_len = $multitable->{'indent_length_kept'};
+ #print STDERR "INDENT: $indent_len\n";
+ my $row_length = 0;
+ my $row = '';
+ my $max_lines = 0;
+ my $cell_beginning = 0;
+ my @anchor_lines_array;
+ my $cell_idx = 0;
+ my @anchors;
+ my @indices;
+ foreach my $cell (@{$multitable->{'cells'}})
+ {
+ $cell->{'beginning'} = $cell_beginning;
+ $cell_beginning += $cell->{'cell_width'}+1;
+ @{$cell->{'lines'}} = split /^/, $cell->{'result'};
+ $max_lines = scalar(@{$cell->{'lines'}}) if
(scalar(@{$cell->{'lines'}}) > $max_lines);
+ foreach my $anchor (@{$cell->{'anchors'}})
+ {
+ push @{$anchor_lines_array[$anchor->{'line_nr'}]},
$anchor;
+ $anchor->{'cell_idx'} = $cell_idx;
+ push @anchors, $anchor;
+ }
+ push @indices, @{$cell->{'index_entries'}};
+ $cell_idx++;
+ }
+ my $previous_last_cell = scalar(@{$multitable->{'cells'}});
+ #print STDERR "ROW cell_beginning $cell_beginning, max_lines
$max_lines, previous_last_cell $previous_last_cell\n";
+ for (my $line_idx = 0; $line_idx < $max_lines; $line_idx++)
+ {
+ my $line_width = $indent_len;
+ my $line_bytes = info_default_byte_count(' ' x$indent_len);
+ my $line = '';
+ # determine the last cell in the line, to fill spaces in
+ # cells preceding that cell on the line
+ my $last_cell = 0;
+ for (my $cell_idx = 0; $cell_idx < $previous_last_cell;
$cell_idx++)
+ {
+ $last_cell = $cell_idx+1 if
(defined($multitable->{'cells'}->[$cell_idx]->{'lines'}->[$line_idx]));
+ }
+ #print STDERR " L(last_cell $last_cell): $line_idx\n";
+ for (my $cell_idx = 0; $cell_idx < $last_cell; $cell_idx++)
+ {
+ my $cell_text =
$multitable->{'cells'}->[$cell_idx]->{'lines'}->[$line_idx];
+ #print STDERR " C($cell_idx) ";
+ if (defined($cell_text))
+ {
+ chomp($cell_text);
+ #print STDERR "$cell_text";
+ if ($line eq '' and $cell_text ne '')
+ {
+ $line = ' ' x $indent_len;
+ }
+ $line .= $cell_text;
+ $line_width += t2h_default_string_width($cell_text);
+ $line_bytes += info_default_byte_count($cell_text);
+ }
+ if ($cell_idx+1 < $last_cell)
+ {
+ if ($line_width < $indent_len +
$multitable->{'cells'}->[$cell_idx+1]->{'beginning'})
+ {
+ if ($line eq '')
+ {
+ $line = ' ' x $indent_len;
+ }
+ my $spaces = ' ' x ($indent_len +
$multitable->{'cells'}->[$cell_idx+1]->{'beginning'} - $line_width);
+ $line_width += t2h_default_string_width($spaces);
+ $line_bytes += info_default_byte_count($spaces);
+ $line .= $spaces;
+ #print STDERR " Csp($line_width) `$spaces'";
+ }
+ }
+ }
+ if (defined($anchor_lines_array[$line_idx]))
+ {
+ foreach my $anchor (@{$anchor_lines_array[$line_idx]})
+ {
+ my $anchor_position = $indent_len +
$anchor->{'line_char_counter'} +
$multitable->{'cells'}->[$anchor->{'cell_idx'}]->{'beginning'};
+ if ($anchor_position > $line_width)
+ {
+ my $spaces = ' ' x ($anchor_position -
$line_width);
+ $line .= $spaces;
+ $line_width += t2h_default_string_width($spaces);
+ $line_bytes += info_default_byte_count($spaces);
+ }
+ $anchor->{'info_offset'} = $line_bytes + $row_length
+ $multitable->{'length'};
+ #print STDERR "ROW anchor close:
anchor[$anchor->{'cell_idx'}]($multitable->{'cells'}->[$anchor->{'cell_idx'}]->{'beginning'}+$anchor->{'line_char_counter'})
$anchor_position $anchor->{'info_offset'}\n";
+ $anchor->{'line_char_counter'} = $anchor_position;
+ }
+ }
+ $line .= "\n";
+ $row_length += info_default_byte_count($line);
+ #print STDERR " ($line_width,".length($line).") $line";
+ $row .= $line;
+ $previous_last_cell = $last_cell;
+ }
+ foreach my $anchor_and_index (@anchors, @indices)
+ {
+ $anchor_and_index->{'line_nr'} +=
$multitable->{'line_count'};
+ #print STDERR "ROW close: new line count:
$anchor_and_index->{'line_nr'} + \n";
+ }
+ if ($content->{'item_command'} eq 'headitem')
+ {
+ # at this point cell_beginning is at the beginning of
+ # the cell following the end of the table -> full width
+ my $line = ' ' x $indent_len . '-' x $cell_beginning . "\n";
+ $row .= $line;
+ $row_length += info_default_byte_count($line);
+ }
+ #print STDERR "ROW_LENGTH $row_length\n";
+ $multitable->{'result'} .= $row;
+ $multitable->{'length'} += $row_length;
+ $multitable->{'line_count'} += $max_lines;
+ $multitable->{'cells'} = [];
+ push @{$multitable->{'anchors'}}, @anchors;
+ push @{$multitable->{'index_entries'}}, @indices;
+ }
+ }
+ else
+ {
+ if ($content->{'command'})
+ {
+ # if processing a paragraph, there may be some pending text
+ # and spaces, as the idea is to write them down only when
+ # there is a space in case of pending text, or when there is some
+ # text in case of pending space. So all the commands
+ # that should write something within paragraph must flush the
+ # pending text/spaces _before_ they output something, or the
+ # text order will be reversed, with the pending things output
+ # after the other commands text.
+ my $pending_added_length = 0;
+ my $pending_added_bytes = 0;
+
+ if ($content->{'command'} eq 'anchor' or $content->{'command'}
eq 'image' or $content->{'command'} eq 'index_command' or $content->{'command'}
eq 'sp' or $content->{'raw_command'})
+ {
+ my $pending;
+ ($line_char_counter, $pending_spaces_word, $pending) =
info_default_store_pending($line_char_counter, $pending_spaces_word,
$indent_length);
+ # here spaces out of any environment are ignored.
+ if ($in_para or $preformatted or $pending =~ /\S/)
+ { # this has to be done before the anchor related code
+ # to have the right count.
+ # FIXME this is wrong if an end of line was passed.
+ # in that case line_char_counter has been increased and
+ # $pending ends with an end of line
+ $pending_added_length +=
t2h_default_string_width($pending);
+ $pending_added_bytes +=
info_default_byte_count($pending);
+ $text_added .= $pending;
+ }
+ }
+ if ($content->{'command'} eq 'strong')
+ {
+ my ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current, $index, $close);
+ if (defined($text_next) and $text_next =~ /^Note\b/i)
+ {
+ main::line_warn(__("address@hidden produces a spurious
cross-reference in Info; reword to avoid that"), $content->{'line_nr'});
+ }
+ }
+ elsif ($content->{'command'} eq 'w')
+ {
+ $in_w++ if ($content->{'content'});
+ }
+ elsif ($content->{'command'} eq 'anchor' or
($content->{'command'} eq 'float' and $content->{'anchor_reference'}))
+ {
+ #print STDERR "anchor: offset_in_file
$info_state->{'offset_in_file'}, line_count $info_state->{'line_count'},
line_char_counter $line_char_counter pending_added_length
$pending_added_length\n";
+ $content->{'anchor_reference'}->{'info_offset'} = $length +
$info_state->{'offset_in_file'} + $pending_added_bytes;
+ $content->{'anchor_reference'}->{'line_nr'} =
$all_line_passed + $info_state->{'line_count'};
+ $content->{'anchor_reference'}->{'line_char_counter'} =
$line_char_counter + $pending_added_length;
+ if (@{$info_state->{'multitable_stack'}})
+ {
+ if ($info_state->{'multitable_stack'}->[-1]->{'cells'})
+ {
+ push
@{$info_state->{'multitable_stack'}->[-1]->{'cells'}->[-1]->{'anchors'}},
$content->{'anchor_reference'};
+ }
+ else
+ {
+ push
@{$info_state->{'multitable_stack'}->[-1]->{'anchors'}},
$content->{'anchor_reference'};
+ }
+ }
+ push @{$info_state->{'pending_tags'}},
$content->{'anchor_reference'};
+ push @{$info_state->{'align_stack'}->[-1]->{'anchors'}},
$content->{'anchor_reference'} if
($info_state->{'align_stack'}->[-1]->{'command'} eq 'center' or
$info_state->{'align_stack'}->[-1]->{'command'} eq 'flushright');
+ }
+ elsif ($content->{'command'} eq 'index_label')
+ {
+ #print STDERR "FFFFFFFFF($content->{'index_command'})
$all_line_passed + $info_state->{'line_count'} `$content->{'texi_entry'}'\n";
+ my $index_line_nr = $all_line_passed +
$info_state->{'line_count'};
+ if ($info_state->{'blank_line'} and
$content->{'index_command'} =~ /index$/)
+ {
+ my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
+ $index_line_nr-- if (!defined($current_next));
+ }
+ elsif ($content->{'index_command'} =~ /^[vf]table$/)
+ {
+ # if in a table, index label is systematically entered after
+ # the line is processed, as the line is processed with the
+ # item command, while the index entry is entered with the
+ # index_label callback that is done much later.
+ $index_line_nr--;
+ }
+ #print STDERR "index in a blank_line
$content->{'index_command'} `$content->{'texi_entry'}'\n" if
($info_state->{'blank_line'});
+ my $index_name =
$content->{'index_entry_reference'}->{'index_name'};
+ $info_default_index_line_string_length{$index_name} =
t2h_default_string_width($index_line_nr)
+ if
(!defined($info_default_index_line_string_length{$index_name}) or
$info_default_index_line_string_length{$index_name} <
t2h_default_string_width($index_line_nr));
+ #print STDERR
"RRRRRRRRRRRRR($content->{'index_entry_reference'})
$content->{'index_entry_reference'}->{'texi'} name: $index_name line:
$index_line_nr max: $info_default_index_line_string_length{$index_name}\n";
+ my $index_ref = { 'index_entry_reference' =>
$content->{'index_entry_reference'}, 'line_nr' => $index_line_nr };
+#print STDERR "INDEX($index_name) line $index_line_nr\n";
+
$info_default_index_entries{$content->{'index_entry_reference'}} = $index_ref;
+ # there may be no cell in case of an empty multitable
+ if (@{$info_state->{'multitable_stack'}})
+ {
+ if ($info_state->{'multitable_stack'}->[-1]->{'cells'})
+ {
+ push
@{$info_state->{'multitable_stack'}->[-1]->{'cells'}->[-1]->{'index_entries'}},
$index_ref;
+ }
+ else
+ {
+ push
@{$info_state->{'multitable_stack'}->[-1]->{'index_entries'}}, $index_ref;
+ }
+ }
+ push @{$info_state->{'pending_index_entries'}}, $index_ref;
+ }
+ elsif ($content->{'command'} eq '*' and !$preformatted)
+ {
+ if (defined($pending_spaces_word->{'word'}))
+ {
+ $text_added .= $pending_spaces_word->{'spaces'} .
$pending_spaces_word->{'word'};
+ $pending_spaces_word->{'word'} = undef;
+ }
+ # spaces preceding @* are skipped
+ $pending_spaces_word->{'spaces'} = '';
+ $text_added .= $content->{'text'};
+ # just like following spaces
+ info_default_skip_spaces($current, $index, $close);
+ # this isn't done otherwise, though, here it is not important
+ # since this end the line
+ $line_char_counter +=
t2h_default_string_width($content->{'text'});
+ goto new_text;
+ }
+ elsif ($content->{'command'} eq 'paragraph' and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal')
+ {
+ # empty paragraph
+ goto new_text if (!$content->{'content'});
+ my $paragraphindent = get_conf('paragraphindent');
+ $paragraphindent = 0 if ($paragraphindent eq 'none');
+ if ($paragraphindent ne 'asis')
+ {
+ info_default_skip_spaces($current, $index, $close);
+ }
+ # if within a format $content->{'paragraph_in_element_nr'}
+ # should not be defined so no indentation will take place
+ if ($paragraphindent ne 'asis' and $paragraphindent and
$line_char_counter == 0 and (defined($content->{'paragraph_in_element_nr'}))
and ($info_state->{'indent_para'} or (!defined($info_state->{'indent_para'})
and ($content->{'paragraph_in_element_nr'} or (get_conf('firstparagraphindent')
eq 'insert')))))
+ {
+ $text_added .= ' ' x $paragraphindent;
+ }
+ $in_para = 1;
+ }
+ elsif ($content->{'command'} eq 'preformatted')
+ {
+ $preformatted++ if ($content->{'content'});
+ }
+ elsif ($content->{'command'} eq 'exdent')
+ {
+ # if an end of line is added, in_exdent is set to 2 and
+ # set to one when processing the end of line that was just
+ # added, and set to 0 at the end of the line.
+ # if there is no end of line added, it is only set to 1.
+ if ($line_char_counter != 0)
+ {
+ $text_added .= "\n";
+ $in_exdent = 2;
+ }
+ else
+ {
+ $in_exdent = 1;
+ }
+ $indent_length = ($indent_level -1) *
$info_default_indent_length if ($indent_level > 0);
+ #goto new_text;
+ }
+ elsif ($content->{'command'} eq 'indent')
+ {
+ $info_state->{'indent_para'} = 1;
+ }
+ elsif ($content->{'command'} eq 'noindent')
+ {
+ $info_state->{'indent_para'} = 0;
+ }
+ elsif ($content->{'command'} eq 'sp')
+ {
+ $text_added .= $content->{'text'};
+ goto new_text;
+ }
+ elsif ($content->{'command'} eq 'image')
+ {
+ # @image result count isn't counted in line_char_counter
+ # since it is not displayed in info
+ my $indent_added = 0;
+ $indent_added = ($indent_length - $line_char_counter) if
($indent_length - $line_char_counter > 0);
+ $text_added .= ' ' x $indent_added . $content->{'text'};
+ $line_char_counter += $indent_added;
+ goto new_text;
+ }
+ elsif ($content->{'command'} eq 'ref')
+ { # adds a . if needed.
+ if ($content->{'text'} !~ /[\.,]$/ and $content->{'text'} !~
/::$/)
+ {
+ my ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current, $index, $close);
+ if (!defined($text_next) or $text_next !~ /^[\.,]/)
+ {
+ $content->{'text'} .= '.';
+ }
+ }
+ }
+ elsif ($content->{'command'} eq 'xref')
+ { # warn if there is no punctuation following
+ my ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current, $index, $close);
+ if (!defined($text_next) or $text_next !~ /^./)
+ { # in makeinfo it is
+ # "End of file reached while looking for `.' or `,'"
+ # but maybe it may not be true.
+ main::line_warn(__("`.' or `,' must follow
address@hidden"), $Texi2HTML::THISDOC{'line_nr'});
+ }
+ elsif ($text_next !~ /^[\.,]/)
+ {
+ my $char = substr($text_next, 0, 1);
+ main::line_warn(sprintf(__("`.' or `,' must follow
address@hidden, not %s"), $char), $Texi2HTML::THISDOC{'line_nr'});
+ }
+ }
+ elsif ($content->{'definition_line'})
+ {
+
+ my $dummy_line_passed;
+ print STDERR "BUG: defined pending_word before
DEFINITION_LINE\n" if defined($pending_spaces_word->{'word'});
+ #print STDERR
"DEFINITION_LINE($line_char_counter,$pending_spaces_word->{'spaces'},$indent_length,$in_para,$max_column):
$content->{'text'}";
+ ($line_char_counter, $pending_spaces_word,
$dummy_line_passed, $text_added) =
info_default_process_para_text($content->{'text'}, $line_char_counter,
$pending_spaces_word, $indent_length, $max_column, 0,
$indent_length+2*$info_default_indent_length);
+ $text_added .= $pending_spaces_word->{'spaces'};
+ $pending_spaces_word->{'spaces'} = '';
+ #print STDERR
"DEFINITION_LINE($line_char_counter,$pending_spaces_word->{'spaces'}) ->
$text_added";
+ print STDERR "BUG: defined pending_word after
DEFINITION_LINE\n" if defined($pending_spaces_word->{'word'});
+ $indentation_done = 1;
+
+ goto new_text;
+ }
+ elsif (($content->{'command'} eq 'item' or $content->{'command'}
eq 'itemx') and exists
$info_default_indent_format_length{$content->{'format_name'}})
+ {
+ $item_pending = $content->{'format_name'};
+ #if (!$info_state->{'blank_line'} and $content->{'command'}
eq 'item')
+ my $first_item = 0;
+
+ if ($content->{'command'} eq 'item')
+ {
+ if (!defined($content->{'parent'}->{'item_nr'}))
+ {
+ $content->{'parent'}->{'item_nr'} = 1;
+ $first_item = 1;
+ }
+ else
+ {
+ $content->{'parent'}->{'item_nr'}++;
+ }
+ }
+
+ if ($item_pending =~ /table$/)
+ {
+ $table_item_line = 1;
+ $indent_length = ($indent_level -1) *
$info_default_indent_length if ($indent_level > 0);
+ $in_table_item = 0;
+ }
+ else
+ {
+ $indent_length =
($info_default_indent_format_length{$item_pending}
+ +($indent_level -1)* $info_default_indent_length);
+ }
+ if (!$info_state->{'blank_line'} and ($content->{'command'}
ne 'itemx') and (!$first_item or $indent_level > 1))
+ {
+ my $dummy_line_passed;
+ ($line_char_counter, $dummy_line_passed, $text_added) =
info_default_process_line_text($text_added, $line_char_counter, $indent_length);
+ $indentation_done = 1;
+ $line_added_before_item = 1;
+ $prepend_newline = 1;
+ #$text_added = "\n" . $text_added;
+ }
+
+ if ($item_pending =~ /table$/)
+ {
+ # one less indentation level and no line break
+ # adding line_added_before_item allows the table_item_line
to
+ # still be active after the additional blank line
+ $table_item_line = 1+$line_added_before_item;
+ }
+ else
+ {
+ info_default_skip_spaces($current, $index, $close);
+ }
+ }
+ elsif ($content->{'command'} eq 'menu' or $content->{'command'}
eq 'listoffloats' or $content->{'heading_command'})
+ {
+ $text_added .= "\n" unless ($info_state->{'blank_line'});
+ }
+ elsif ($content->{'command'} eq 'direntry')
+ {
+ if ($content->{'content'})
+ {
+ $direntry++;
+ }
+ }
+ elsif ($paragraph_style{$content->{'command'}})
+ {
+ goto new_text if (!$content->{'content'});
+ push @{$info_state->{'align_stack'}}, {'command' =>
$content->{'command'}};
+ }
+ elsif ($content->{'command'} eq 'verbatim' or
$content->{'command'} eq 'verbatiminclude')
+ {
+ # $preformatted cannot be used here since preformatted
+ # is closed before a verbatim, $preformatted_format is used
+ if (!$preformatted_format and $indent_level != 0)
+ {
+ if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'})
+ {
+ $text_added .= "\n";
+ }
+ my $verb_text = $content->{'text'};
+ my ($line_passed, $end_of_line, $last_line,
$text_indented, $blank_line) = info_default_count_lines($verb_text);
+ $content->{'text'} .= "\n" unless ($blank_line or
($last_line =~ /^\s*$/));
+ }
+ }
+ # other raw commands
+ elsif ($content->{'raw_command'})
+ {
+ # not considered as in a paragraph even if in a paragraph
+ $text_added .= $content->{'text'};
+ goto new_text;
+ }
+ elsif ($content->{'command'} eq 'multitable' and
$content->{'content'})
+ {
+ my $indent_length_kept = $indent_level *
$info_default_indent_length;
+ my $multitable = {
+ 'offset_in_file_kept' => $info_state->{'offset_in_file'},
+ 'line_count_kept' => $info_state->{'line_count'},
+ 'columns_size' => [ @{$content->{'columns_size'}}
],
+ 'result' => '',
+ 'length' => 0,
+ 'line_count' => 0,
+ 'result_kept' => $result,
+ 'length_kept' => $length,
+ 'all_line_passed_kept' => $all_line_passed,
+ 'line_char_counter_kept' => $line_char_counter,
+ 'max_column_kept' => $max_column,
+ 'indent_level_kept' => $indent_level,
+ 'indent_length_kept' => $indent_length_kept,
+ };
+ push @{$info_state->{'multitable_stack'}}, $multitable;
+ $info_state->{'offset_in_file'} = 0;
+ $info_state->{'line_count'} = 0;
+ $result = '';
+ $length = 0;
+ $all_line_passed = 0;
+ $line_char_counter = 0;
+ $indent_level = 0;
+ $indent_length = 0;
+ }
+ elsif ($content->{'command'} eq 'multitable_row')
+ {
+ my $multitable = $info_state->{'multitable_stack'}->[-1];
+ if (!defined($multitable->{'cells'}) and ($result ne ''))
+ {
+ $multitable->{'result'} .= $result;
+ $multitable->{'length'} += $length;
+ $multitable->{'line_count'} += $all_line_passed;
+ $multitable->{'cells'} = [];
+ }
+ $multitable->{'cell_index'} = -1;
+ }
+ elsif ($content->{'command'} eq 'multitable_cell')
+ {
+ my $multitable = $info_state->{'multitable_stack'}->[-1];
+ $multitable->{'cell_index'}++;
+ my $cell_width =
$content->{'parent'}->{'parent'}->{'columns_size'}->[$multitable->{'cell_index'}];
+ #$max_column = $cell_width-1;
+ $max_column = $cell_width -2;
+ my $cell = {'cell_width' => $cell_width, 'index_entries' =>
[], 'anchors' => []};
+ push @{$multitable->{'cells'}}, $cell;
+ $result = '';
+ $length = 0;
+ $all_line_passed = 0;
+ $line_char_counter = 0;
+ $indent_level = 0;
+ $indent_length = 0;
+ if (!$content->{'content'})
+ {# empty cell
+ $cell->{'result'} = $result;
+ $cell->{'length'} = $length;
+ $cell->{'line_passed'} = $all_line_passed;
+ }
+ #info_default_skip_spaces($current, $index, $close);
+ }
+ if ($info_default_indented_commands{$content->{'command'}})
+ {
+ if ($content->{'command'} =~ /^deff_item/)
+ {
+ info_default_skip_spaces($current, $index, $close);
+ }
+ #elsif (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0) and !$preformatted)
+ elsif (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0))
+ {
+ $text_added .= "\n";
+ }
+ # there is no close if !$content->{'content'}
+ $indent_level++ if ($content->{'content'});
+ $indent_length = $indent_level * $info_default_indent_length;
+ }
+ elsif (($complex_format_map{$content->{'command'}} and
$content->{'command'} ne 'menu') or $content->{'command'} eq 'cartouche')
+ {
+ #if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0) and !$preformatted_format)
+ if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0))
+ {
+ $text_added .= "\n";
+ }
+ }
+ if ($complex_format_map{$content->{'command'}} and
$content->{'content'})
+ {
+ $preformatted_format++;
+ }
+ }
+
+ if (defined($content->{'text'}))
+ {
+ if ($in_para and !$in_exdent)
+ {
+ #print STDERR "IN_PARA text\n";
+ my $new_text = $content->{'text'};
+ # first find if in a context of no puncutation related
+ # modification: code style command or @var, @cite, @math
+ # acceptable for punctuation related modifications:
+ # asis b dfn emph i slanted sansserif r sc strong t w
+ my $current_tested = $content;
+ my $no_punctation_munging_command;
+ while ($current_tested)
+ {
+ if (defined($current_tested->{'command'}) and
(($style_map{$current_tested->{'command'}} and
$style_map{$current_tested->{'command'}}->{'args'} and
$style_map{$current_tested->{'command'}}->{'args'}->[0] and
$style_map{$current_tested->{'command'}}->{'args'}->[0] eq 'code') or
$current_tested->{'command'} eq 'var' or $current_tested->{'command'} eq 'cite'
or $current_tested->{'command'} eq 'math'))
+ {
+ $no_punctation_munging_command = 1;
+ last;
+ }
+ $current_tested = $current_tested->{'parent'};
+ }
+ # a punctuation at the end of line in a command is treated
+ # like a punctuation in plain text, except for @:,
+ # accent commands, @dots, 'simple_style' command, and if in
+ # a command as found out just above.
+
+ if (!$no_punctation_munging_command and
(!defined($content->{'command'}) or ($content->{'command'} ne ':' and
$content->{'command'} ne 'accents_commands' and $content->{'command'} ne
'dots') and !$info_default_leaf_command{$content->{'command'}}) and
get_conf('frenchspacing') ne 'on' and $new_text =~
/([$info_default_end_sentence_character])([$info_default_after_punctuation_characters]*)(\s*)$/)
+ {
+ my $spaces = $3;
+ if (chomp($new_text))
+ {
+ $new_text =~ s/(\s*)$/ /;
+ }
+ else
+ {
+ # these variables hold the place where the end
+ # of line characters are normalized.
+ my ($current_start_from, $index_start_from,
$close_start_from) = ($current, $index, $close);
+ my $only_after_punctuation_characters = 1;
+ my $spaces_to_normalize = 0;
+
+ # first find whether there are only
+ # after_punctuation_characters followed by spaces
+ # and find the place where the
+ # after_punctuation_characters end
+ my ($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current, $index, $close);
+ # go through the text as long as there are
after_punctuation_characters
+ if (!$spaces)
+ {
+ while (1)
+ {
+ # !defined($text_next) catches many special
+ # commands, like anchor, index. Not sure if
+ # it is right or wrong.
+ # Also a style_map command never stops
+ # the search, so that @emph{ or @strong{
+ # begin and end are not taken into account
+ if (!defined($current_next) or
(!defined($text_next)) or (defined($command_next) and $command_next eq '*') or
($text_next !~ /^[$info_default_after_punctuation_characters]*(\s*)$/ and
(!defined($command_next) or !$style_map{$command_next})))
+ {
+ $only_after_punctuation_characters = 0;
+ last;
+ }
+ my $text_next_kept = $text_next;
+ # begin normalizing spaces at the last place
+ # where there are
after_punctuation_characters
+ $current_start_from = $current_next;
+ $index_start_from = $index_next;
+ $index_start_from = $index_next;
+ ($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current_next, $index_next,
$close_next);
+ if ($text_next_kept =~
/^[$info_default_after_punctuation_characters]*\s+$/)
+ {
+ if (chomp($text_next_kept))
+ {
+ $spaces_to_normalize = 1;
+ }
+ last;
+ }
+ }
+ }
+ # check if there are only spaces until end of line
+ if ($only_after_punctuation_characters and
!$spaces_to_normalize)
+ {
+ while (1)
+ {
+ # !defined($text_next) catches many special
+ # commands, like anchor, index. Not sure if
+ # it is right or wrong.
+ last if (!defined($current_next) or
(!defined($text_next)) or (defined($command_next) and $command_next eq '*'));
+ if ($text_next =~ /\S/ and
(!defined($command_next) or !$style_map{$command_next}))
+ {
+ last;
+ }
+ else
+ {
+ if (chomp($text_next))
+ {
+ $spaces_to_normalize = 1;
+ last;
+ }
+ }
+ ($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current_next, $index_next,
$close_next);
+ }
+
+ }
+ if ($spaces_to_normalize)
+ {
+ # now do the spaces normalization
+ info_default_skip_spaces($current_start_from,
$index_start_from, $close_start_from);
+ my $content =
$current_start_from->{'content'}->[$index_start_from];
+ $content->{'text'} =~ s/(\s*)$/ /;
+ }
+ }
+ }
+ elsif (chomp($new_text))
+ {
+ $new_text =~ s/(\s*)$/ /;
+ }
+ $text_added .= $new_text;
+ } # ignore spaces outside of paragraphs and preformatted
+ elsif ($preformatted or
$info_state->{'align_stack'}->[-1]->{'command'} ne 'normal')
+ {
+ #print STDERR "IN_PREFORMATTED or ALIGN text\n";
+ $text_added .= $content->{'text'};
+ }
+ else
+ {
+ my $chomped_text = $content->{'text'};
+ if ($chomped_text !~ /\S/ and chomp($chomped_text) and
!$item_pending)
+ {
+ if ($in_table_item and $info_state->{'only_spaces'})
+ {
+ # in a blank_line
+ #print STDERR "IN_ITEM ignored:
`$content->{'text'}'\n";
+ }
+ elsif (!$info_state->{'blank_line'} or
!$info_state->{'only_spaces'})
+ {
+ #print STDERR "IN_ADDING_BLANK_LINE because no line
before or text before\n";
+ $text_added .= "\n";
+ }
+ else
+ {
+ #print STDERR "IN_NOT_ADDING_BLANK_LINE\n";
+ }
+ }
+ else
+ { # exdent, item not in paragraph nor in preformatted
+ #print STDERR "NOWHERE and not end of line (or
item_pending) `$content->{'text'}'\n";
+ $text_added .= $content->{'text'};
+ }
+ }
+ }
+ else
+ {
+ if (defined($content->{'begin'}))
+ {
+ $text_added .= $content->{'begin'};
+ }
+ # command that won't be closed, so the end has to be added
+ # here. It should mostly happen for empty style @-commands.
+ if (defined($content->{'end'}) and
!defined($content->{'content'}))
+ {
+ $text_added .= $content->{'end'};
+ }
+ }
+ }
+ if (!$preformatted and !$in_exdent and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal' and $in_para)
+ {
+ # the line_passed returned here are not used, since they are computed
+ # below.
+ $indentation_done = 1;
+ my $dummy_line_passed;
+ ($line_char_counter, $pending_spaces_word, $dummy_line_passed,
$text_added) = info_default_process_para_text($text_added, $line_char_counter,
$pending_spaces_word, $indent_length, $max_column, $in_w, $indent_level *
$info_default_indent_length) if ($text_added ne '');
+ }
+ elsif ($info_state->{'align_stack'}->[-1]->{'command'} ne 'center' and
$info_state->{'align_stack'}->[-1]->{'command'} ne 'flushright')
+ {
+ my $dummy_line_passed;
+ ($line_char_counter, $dummy_line_passed, $text_added) =
info_default_process_line_text($text_added, $line_char_counter, $indent_length);
+ #$indentation_done = 1;
+ }
+ else
+ {
+ $line_char_counter += t2h_default_string_width($text_added);
+ }
+ new_text:
+ if ($text_added ne '')
+ {
+ if ($item_pending and !$line_added_before_item)
+ {
+ #info_default_skip_spaces($current, $index, $close);
+ $item_pending = undef;
+ }
+ }
+ if ($text_added =~ /\S/)
+ {
+ $in_table_item = 0 if ($in_table_item);
+ $info_state->{'blank_line'} = 0;
+ }
+ $text_added = "\n" . $text_added if ($prepend_newline);
+ print STDERR "TEXT_ADDED($indent_length) `$text_added'\n" if
($text_added ne '' and get_conf('DEBUG'));
+ #print STDERR "TEXT_ADDED($indent_length) `$text_added'\n";
+ # from here, the next cmmand is available
+ ($current, $index, $close) = info_default_iterator_next($current,
$index, $close);
+
+ my ($line_passed, $end_of_line, $last_line, $text_indented, $blank_line)
= info_default_count_lines($text_added, $indent_length, ($indentation_done
+ or $info_state->{'align_stack'}->[-1]->{'command'} eq 'center'
+ or $info_state->{'align_stack'}->[-1]->{'command'} eq 'flushright'));
+ $info_state->{'blank_line'} = 1 if ($blank_line);
+ print STDERR "ADDING `$text_indented'\n" if ($text_indented ne '' and
get_conf('DEBUG'));
+ # only_space is set in all the conditionals
+ if ($end_of_line)
+ {
+ $line_char_counter = 0;
+ if ($in_exdent)
+ {
+ $in_exdent--;
+ }
+ if ($table_item_line)
+ {
+ $table_item_line--;
+ $in_table_item = 1;
+ }
+ if (!$table_item_line and !$in_exdent and !$item_pending)
+ {
+ $indent_length = $indent_level * $info_default_indent_length;
+ }
+ $info_state->{'blank_line'} = 1 if ($info_state->{'only_spaces'} and
($last_line !~ /\S/));
+ $info_state->{'only_spaces'} = 1;
+ }
+ else
+ {
+ if ($line_passed)
+ {# in that case we added more than one line, the $line_char_counter
+ # is reset to the last line length.
+ $line_char_counter = t2h_default_string_width($last_line);
+ $in_exdent = 0;
+ $indent_length = $indent_level * $info_default_indent_length;
+ if ($last_line !~ /\S/)
+ {
+ $info_state->{'only_spaces'} = 1;
+ }
+ else
+ {
+ $info_state->{'only_spaces'} = 0;
+ }
+ }
+ else
+ {
+ $info_state->{'only_spaces'} = 0 if ($last_line =~ /\S/);
+ }
+ }
+ if ($info_state->{'align_stack'}->[-1]->{'command'} eq 'center'
+ or $info_state->{'align_stack'}->[-1]->{'command'} eq 'flushright')
+ {
+ if (defined($current_line))
+ {
+ $text_added = $current_line . $text_added;
+ }
+ $text_indented = '';
+ $current_line = undef;
+ my $spaces_prepended = undef;
+ foreach my $line (split /^/, $text_added)
+ {
+ my $chomped_line = $line;
+ if (chomp($chomped_line))
+ {
+ $line =~ s/^\s*//;
+ $line =~ s/\s*$//;
+
+ if (t2h_default_string_width($line) eq 0)
+ {
+ $spaces_prepended = 0;
+ $text_indented .= "\n";
+ }
+ else
+ {
+ my $line_width = t2h_default_string_width($line);
+ if ($line_width > $max_column)
+ {
+ $spaces_prepended = 0;
+ }
+ elsif ($info_state->{'align_stack'}->[-1]->{'command'} eq
'center')
+ {
+ $spaces_prepended = (($max_column -1 - $line_width)
/2);
+ }
+ else
+ {
+ $spaces_prepended = ($max_column -1 - $line_width);
+ }
+ $text_indented .= ' ' x$spaces_prepended . $line ."\n";
+ }
+ }
+ else
+ {
+ $current_line = $line;
+ }
+ }
+ if (defined ($spaces_prepended) and
defined($info_state->{'align_stack'}->[-1]->{'anchors'}))
+ {
+ while (@{$info_state->{'align_stack'}->[-1]->{'anchors'}})
+ {
+ my $anchor = shift
@{$info_state->{'align_stack'}->[-1]->{'anchors'}};
+ $anchor->{'info_offset'} += info_default_byte_count(' '
x$spaces_prepended);
+ }
+ }
+ }
+
+ if ($direntry)
+ {
+ $info_default_dir_specification .= $text_indented;
+ }
+ else
+ {
+ $result .= $text_indented;
+ $length += info_default_byte_count($text_indented);
+ $all_line_passed += $line_passed;
+ }
+ }
+ return ($length, $result, $all_line_passed);
+}
+
+sub info_default_open_command($$;$)
+{
+ my $state = shift;
+ my $command = shift;
+ my $additional_entries = shift;
+
+ my $index = 0;
+
+ my $info_state = info_default_get_state($state);
+ # index in the parent content list
+ $index = scalar(@{$info_state->{'current'}->{'content'}})
+ if (defined($info_state->{'current'}->{'content'}));
+ my $new_command = {'command' => $command, 'parent' =>
$info_state->{'current'}, 'index_in_parent' => $index };
+ if (defined($additional_entries))
+ {
+ foreach my $key (keys(%$additional_entries))
+ {
+ $new_command->{$key} = $additional_entries->{$key};
+ }
+ }
+
+ push @{$info_state->{'current'}->{'content'}}, $new_command;
+ $info_state->{'current'} = $new_command;
+ print STDERR "TREE($info_state->{'nr'}): Opened $command\n" if
(get_conf('DEBUG'));
+}
+
+sub info_default_close_command($$;$$$)
+{
+ my $state = shift;
+ my $command = shift;
+ my $begin = shift;
+ my $end = shift;
+ my $command_entries = shift;
+
+ $state = $Texi2HTML::THISDOC{'state'} if (!defined($state));
+ my $info_state = info_default_get_state($state);
+ print STDERR "TREE($info_state->{'nr'}): Closing $command\n" if
(get_conf('DEBUG'));
+ if (!defined($info_state->{'current'}))
+ {
+ print STDERR "info_state->{'current'} not defined (closing $command)\n";
+ }
+ elsif (!defined($info_state->{'current'}->{'command'}))
+ {
+ print STDERR "info_state->{'current'}->{'command'} not defined (closing
$command)\n";
+ }
+ elsif ($command ne $info_state->{'current'}->{'command'})
+ {
+ print STDERR "Was waiting for $info_state->{'current'}->{'command'}
(closing $command)\n";
+ }
+ #return if $no_close;
+ $command_entries->{'begin'} = $begin;
+ $command_entries->{'end'} = $end;
+ $command_entries->{'line_nr'} = $Texi2HTML::THISDOC{'line_nr'};
+ foreach my $key (keys(%$command_entries))
+ {
+ $info_state->{'current'}->{$key} = $command_entries->{$key}
+ if (defined($command_entries->{$key}));
+ }
+
+ $info_state->{'current'} = $info_state->{'current'}->{'parent'};
+
+ return info_default_output($info_state)
+ if (!defined($info_state->{'current'}->{'command'}));
+ return '';
+}
+
+sub info_default_store_text($$;$$)
+{
+ my $state = shift;
+ my $text = shift;
+ my $command = shift;
+ my $text_entries = shift;
+
+ $state = $Texi2HTML::THISDOC{'state'} if (!defined($state));
+ my $info_state = info_default_get_state($state);
+ return '' if ((!defined($text) or $text eq '') and !defined($command));
+
+ ################################## debug
+ my $command_text = '';
+ $command_text = "\[$command\]" if (defined($command));
+ $command_text .= $text if (defined($text));
+ print STDERR "TREE($info_state->{'nr'}) Storing: ${command_text}\n" if
(get_conf('DEBUG'));
+ ################################## end debug
+
+ $text_entries->{'text'} = $text if (defined($text));
+ $text_entries->{'command'} = $command if (defined($command));
+ $text_entries->{'parent'} = $info_state->{'current'};
+ $text_entries->{'line_nr'} = $Texi2HTML::THISDOC{'line_nr'};
+ push @{$info_state->{'current'}->{'content'}}, $text_entries;
+ return info_default_output($info_state)
+ if (!defined($info_state->{'current'}->{'command'}));
+ return '';
+}
+
+sub info_default_increment_paragraph ($$$;$)
+{
+ my $in_format = shift;
+ my $parent_format = shift;
+ my $info_state = shift;
+ my $command = shift;
+
+ if ($in_format)
+ {
+ $parent_format->{'paragraph_in_format_nr'} = 0 if
(!defined($parent_format->{'paragraph_in_format_nr'}));
+ $parent_format->{'paragraph_in_format_nr'}++;
+ }
+ else
+ {
+ $info_state->{'paragraph_in_element_nr'}++;
+ }
+ ####################### debug
+ $command = 'PARA' if (!defined($command));
+ if (0)
+ #if (1)
+ {
+ my $format_info = '';
+ if ($in_format)
+ {
+ $format_info = "format:
[$parent_format->{'command'}],$parent_format->{'paragraph_in_format_nr'}"
+ }
+ print STDERR "INCREMENT_PARA($command)
$info_state->{'paragraph_in_element_nr'} $format_info\n";
+ }
+ ####################### end debug
+}
+
+sub info_default_begin_format_texi($$$)
+{
+ my $command = shift;
+ my $line = shift;
+ my $state = shift;
+
+ my $info_state = info_default_get_state ($state);
+ my ($parent_format, $in_format);
+ ($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'});
+ info_default_increment_paragraph ($in_format, $parent_format, $info_state,
$command);
+ # remove space in front of center, unless it removes the end of line!
+ $line =~ s/^\s*// if ($command eq 'center' and $line =~ /\S/);
+ # don't open a format if it is a @def*x command and we are already in the
+ # corresponding @def* command
+ info_default_open_command($state,$command) unless ($def_map{$command} and
$command =~ /x$/ and defined($info_state->{'current'}->{'command'}) and
"$info_state->{'current'}->{'command'}x" eq $command);
+ return $line;
+}
+
+sub info_default_begin_style_texi($$$$$)
+{
+ my $command = shift;
+ my $state = shift;
+ my $stack = shift;
+ my $real_style_command = shift;
+ my $remove_texi = shift;
+
+ info_default_open_command($state,$command)
+ unless ($info_default_accent_commands{$command} or exists
$things_map{$command}
+ or $command =~ /^special_(\w+)_(\d+)$/);
+# if ($real_style_command);
+}
+
+sub info_default_begin_paragraph_texi($$$)
+{
+ my $command = shift;
+ my $paragraph_macros = shift;
+ my $paragraph_command = shift;
+ #print STDERR "begin_paragraph $command\n";
+ my $state = shift;
+ my $stack = shift;
+ info_default_open_command($state,$command);
+ foreach my $style_command (@$paragraph_macros)
+ {
+ #print STDERR "para stack: $style_command->{'style'}\n";
+ info_default_open_command($state,$style_command->{'style'});
+ }
+}
+
+sub info_default_simple_command($$$$$)
+{
+ my $command = shift;
+ my $in_preformatted = shift;
+ my $in_math = shift;
+ my $line_nr = shift;
+ my $state = shift;
+
+ my $result = $simple_map{$command};
+ $result = $simple_map_math{$command} if ($in_math and
defined($simple_map_math{$command}));
+ # discards '-' '|' '/' and ':'. If ':' is associated with a punctuation
+ # character it is added to the tree in info_default_colon_command
+ return info_default_store_text($state,$result,$command) if ($result ne '');
+ return '';
+}
+
+sub info_default_colon_command($)
+{
+ my $punctuation_character = shift;
+ if (defined($colon_command_punctuation_characters{$punctuation_character})
+ and $punctuation_character =~ /^[$punctuation_characters]$/)
+ {
+ return
info_default_store_text(undef,$colon_command_punctuation_characters{$punctuation_character},
':');
+ }
+ else
+ {
+ return info_default_store_text(undef,$punctuation_character);
+ }
+}
+
+sub info_default_thing_command($$$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $in_preformatted = shift;
+ my $in_math = shift;
+ my $line_nr = shift;
+ my $state = shift;
+
+ my $result = $things_map{$command};
+ #return info_default_close_command($state, $command, $result, $text, '');
+ return info_default_store_text($state, $result, $command);
+# return $result . $text;
+}
+
+
+sub info_default_style($$$$$$$$$$)
+{
+ my $style = shift;
+ my $command = shift;
+ my $text = shift;
+ my $args = shift;
+ my $no_close = shift;
+ my $no_open = shift;
+ my $line_nr = shift;
+ my $state = shift;
+ my $command_stack = shift;
+ my $kept_line_nrs = shift;
+
+ my $begin = '';
+ my $end = '';
+
+ # note that the $text is always discarded for closed commands
+
+ # the formatting is done right here, and the result is entered as text
below.
+ if ($info_default_leaf_command{$command})
+ {
+ my $style_index = 0;
+ my @formatted_args = ();
+ foreach my $arg (@$args)
+ {
+ # we don't use style, since we only set 'orig_args' in style_map
+ # and not in style_map_pre.
+ my $arg_style = $style_map{$command}->{'orig_args'}->[$style_index];
+ my $new_state = main::duplicate_formatting_state($state);
+ if ($arg_style eq 'normal')
+ {
+ push @formatted_args, main::substitute_line($arg,
"address@hidden", $new_state);
+ }
+ elsif ($arg_style eq 'code')
+ {
+ $new_state->{'code_style'} = 1;
+ push @formatted_args, main::substitute_line($arg,
"address@hidden", $new_state);
+ }
+ else
+ {
+ print STDERR "Unknown arg style($style_index) $arg_style for
$command, $state->{'remove_texi'}\n";
+ }
+ $style_index++;
+ }
+ $args = address@hidden;
+ }
+ if (defined($style->{'function'}))
+ { # in case of an accent, some text is returned here if there are still
+ # more accents on the command_stack, otherwise it is put in the tree.
+ # Other commands text results are put in the tree below.
+ $text = &{$style->{'function'}}($command, $args, $command_stack, $state,
$line_nr, $kept_line_nrs);
+ }
+ elsif ($info_default_leaf_command{$command})
+ { # no formatting function but a leaf command, it is just replaced
+ # by the formatted argument, and put in the tree below.
+ $text = $args->[0];
+ }
+ if (defined($style->{'begin'}) and !$no_open)
+ {
+ $begin = $style->{'begin'};
+ }
+ if (defined($style->{'end'}) and !$no_close)
+ {
+ $end = $style->{'end'};
+ }
+ # normal style commands
+ unless($special_style{$command} or $info_default_accent_commands{$command}
or ($command eq 'hyphenation') or $info_default_leaf_command{$command})
+ {
+ return info_default_close_command($state, $command, $begin, $end);
+ }
+ # this is for *ref, images and footnotes text registering and putting
+ # in the tree.
+ # anchor is already in the tree, from anchor_label.
+ if (($special_style{$command} or $info_default_leaf_command{$command}) and
$command ne 'anchor')
+ {
+ return info_default_store_text ($state, $begin.$text.$end, $command);
+ }
+ # for accents, hyphenation and anchor
+ # (though the result for anchor is always an empty string).
+ return $begin.$text.$end;
+}
+
+sub info_default_header ()
+{
+ return $Texi2HTML::THISDOC{'info_header'} if
(defined($Texi2HTML::THISDOC{'info_header'}));
+# $Texi2HTML::THISDOC{'program'}
+ my $input_basename = $Texi2HTML::THISDOC{'input_file_name'};
+ $input_basename =~ s/^.*\///;
+ $input_basename = $STDIN_DOCU_NAME if ($input_basename eq '-');
+ my $output_basename = $Texi2HTML::THISDOC{'filename'}->{'top'};
+ $output_basename =~ s/^.*\///;
+ my $result = "This is $output_basename, produced by makeinfo version 4.13
from $input_basename. ";
+ my $dummy;
+ ($dummy, $dummy, $dummy, $result) =
info_default_process_para_text($result, 0, {'spaces' => ''}, undef,
get_conf('FILLCOLUMN'));
+ $result .= "\n\n";
+ $result .= "$Texi2HTML::THISDOC{'copying_comment'}";
+ if ($info_default_dir_specification)
+ {
+ $result .= "$info_default_dir_specification\n";
+ }
+ $Texi2HTML::THISDOC{'info_header'} = $result;
+ return $result;
+}
+
+sub info_default_print_page_head($)
+{
+ my $fh = shift;
+ my $header = info_default_header();
+ print $fh "".$header;
+
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+ $info_state->{'offset_in_file'} += info_default_byte_count($header);
+ $info_state->{'blank_line'} = 1 if ($Texi2HTML::THISDOC{'copying_comment'}
eq '');
+}
+
+sub info_default_parent_format($)
+{
+ my $parent_format = shift;
+ my $in_format = 0;
+ while (1)
+ {
+ if (defined($parent_format->{'command'}) and
$info_default_format{$parent_format->{'command'}})
+ {
+ $in_format = 1;
+ last;
+ }
+ last if (!defined($parent_format->{'parent'}));
+
+ $parent_format = $parent_format->{'parent'};
+ }
+ return ($parent_format, $in_format);
+}
+
+sub info_default_paragraph($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $align = shift;
+ my $indent = shift;
+ my $paragraph_command = shift;
+ my $paragraph_command_formatted = shift;
+ my $paragraph_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+ my ($parent_format, $in_format);
+ ($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'}->{'parent'});
+ info_default_increment_paragraph ($in_format, $parent_format, $info_state);
+ my $additional_args = {'top_stack' => $top_stack, 'parent_format' =>
$parent_format};
+ $additional_args->{'paragraph_in_element_nr'} =
($info_state->{'paragraph_in_element_nr'} - 1) if (!$in_format);
+
+ return info_default_close_command(undef, 'paragraph', undef, undef,
$additional_args);
+}
+
+# currently not used, but could be used if info_default_preformatted
+# return something that is not 'false', for example spaces, though we
+# want the preformatted to be ignored. Though it is not sure that if there
+# are spaces we want to ignore the preformatted.
+sub info_default_empty_preformatted($)
+{
+ my $text = shift;
+ my $result = info_default_preformatted($text, undef, undef, undef, undef,
+ undef, undef, undef, undef, undef, undef, undef);
+ return 0;
+}
+
+sub info_default_preformatted($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $pre_style = shift;
+ my $class = shift;
+ my $leading_command = shift;
+ my $leading_command_formatted = shift;
+ my $preformatted_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+ return info_default_close_command(undef, 'preformatted');
+}
+
+
+sub info_default_node_line($$)
+{
+ my $element = shift;
+ my $info_state = shift;
+ my $outfile = $Texi2HTML::THISDOC{'filename'}->{'top'};
+ $outfile = $STDOUT_DOCU_NAME if ($outfile eq '-');
+ my $result = "\x{1F}\nFile: $outfile, Node: $element->{'text'}";
+ if (defined($element->{'NodeNext'}))
+ { # This is not translatable
+ $result .= ", Next: $element->{'NodeNext'}->{'text'}";
+ }
+ if (defined($element->{'NodePrev'}))
+ {
+ $result .= ", Prev: $element->{'NodePrev'}->{'text'}";
+ }
+ if (defined($element->{'NodeUp'}))
+ {
+ $result .= ", Up: $element->{'NodeUp'}->{'text'}";
+ }
+ $result .= "\n\n";
+ # the line_count is ahead from the number of lines by one.
+ $info_state->{'line_count'} = 3;
+ $info_state->{'offset_in_file'} += info_default_byte_count($result);
+ $info_state->{'blank_line'} = 1;
+ return $result;
+}
+
+sub info_default_element_heading($$$$$$$$$$$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+ my $one_section = shift;
+ my $element_heading = shift;
+ my $first_in_page = shift;
+ my $is_top = shift;
+ my $previous_is_top = shift;
+ my $command_line = shift;
+ my $element_id = shift;
+ my $new_element = shift;
+
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+
+ # FIXME use $element or $Texi2HTML::THIS_ELEMENT? Main program should
+ # ensure they are the same.
+ if ($new_element and ($element ne $new_element and $element->{'node'}))
+ {
+ die "There is a new element, but element `$element->{'texi'}' is not
the new element\n";
+ }
+ # FIXME
+ # non node element may appear if the element appears before the first
+ # node/section element. For example `element not associated with a node'
+ # won't be associated with a node.
+ # @unnumbered element not associated with a node
+ # @node Top
+ # @top Top element
+ if (!$element->{'node'})
+ {
+ return &$heading($element, $command, $texi_line, $line,
$in_preformatted, $one_section, $element_heading);
+ }
+
+ my $before = '';
+ $element->{'info_offset'} = $info_state->{'offset_in_file'};
+ push @{$info_state->{'pending_tags'}}, $element;
+
+ my $result = info_default_node_line($element, $info_state);
+
+ $info_default_footnote_index = 0;
+ $info_default_current_node = $element;
+
+ return $before.$result;
+}
+
+sub info_default_heading($$$$$;$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+ my $one_section = shift;
+ my $element_heading = shift;
+
+ die "Heading called for a node\n" if ($element->{'node'});
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+ $info_state->{'paragraph_in_element_nr'} = 0;
+ if (!defined($element->{'texi'}))
+ {
+ main::msg_debug("for $element, element->{'texi'} not defined,
texi_line: $texi_line");
+ }
+ elsif (!defined($element->{'text'}))
+ {
+ main::msg_debug("for $element, $element->{'texi'}, element->{'text'}
not defined");
+ }
+ return '' if ($element->{'tag'} eq 'part');
+
+ my $text = "$element->{'text'}";
+ # when @top is empty, use settitle
+ $text = $Texi2HTML::THISDOC{'settitle'} if (!length($text) and
$element->{'tag'} eq 'top' and defined ($Texi2HTML::THISDOC{'settitle'}) and
length($Texi2HTML::THISDOC{'settitle'}));
+ my $result = &$heading_text ("address@hidden", $text, $element->{'level'});
+
+ $result .= "\n";
+
+ return info_default_store_text($state, $result, $command,
{'heading_command' => 1});
+}
+
+sub info_default_normal_text($$$$$$$;$)
+{
+ my @initial_args = @_;
+ my $text = shift;
+ my $in_raw_text = shift; # remove_texi
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ # This is always done here since it is not done in t2h_utf8_normal_text
+ $text = uc($text) if (in_cmd($style_stack, 'var'));
+
+ # ENCODING_NAME should be defined, but maybe
+ # not when parsing commands in first or second pass, and removing texi
+ # like what is done for @setfilename.
+ if (get_conf('ENABLE_ENCODING') and defined(get_conf('ENCODING_NAME')) and
(get_conf('ENCODING_NAME') eq 'utf-8') and get_conf('USE_UNICODE'))
+ {
+ $text = &t2h_utf8_normal_text(@initial_args);
+ }
+ else
+ {
+ #print STDERR "info_default_normal_text $text $in_preformatted $in_code
\n";
+ $text = uc($text) if (in_cmd($style_stack, 'sc'));
+ if (! $in_code and !$in_preformatted)
+ {
+ $text =~ s/---/\x{1F}/g;
+ $text =~ s/--/-/g;
+ $text =~ s/\x{1F}/--/g;
+ $text =~ s/``/"/g;
+ $text =~ s/\'\'/"/g;
+ }
+ }
+ # accented characters are not handled as normal text, but when the last
+ # accent command on the stack is closed.
+ if ($style_stack and @$style_stack and
$info_default_accent_commands{$style_stack->[-1]})
+ {
+ return $text;
+ }
+#print STDERR "NORMAL\n";
+ return info_default_store_text($state,$text);
+}
+
+# this is not called in preformatted
+sub info_default_empty_line($$)
+{
+ my $text = shift;
+ my $state = shift;
+ #ignore the line if it just follows a deff
+ #return '' if ($state->{'deff_line'});
+ return info_default_store_text($state,$text);
+# return '';
+}
+
+# change interface?
+sub info_default_anchor_label($$$$)
+{
+ my $id = shift;
+ my $anchor_text = shift;
+ my $anchor_reference = shift;
+ my $in_special_region = shift;
+ return '' if ($in_special_region);
+ #print STDERR "Storing anchor $anchor_reference->{'text'}\n";
+ main::line_warn(__("anchor outside of any node, it won't be registered"),
$Texi2HTML::THISDOC{'line_nr'}) if (!defined($info_default_current_node));
+ return info_default_store_text(undef,undef,'anchor',{'anchor_reference' =>
$anchor_reference});
+}
+
+sub info_default_acronym_like($$$$$$)
+{
+ my $command = shift;
+ my $acronym_texi = shift;
+ my $acronym_text = shift;
+ my $with_explanation = shift;
+ my $explanation_lines = shift;
+ my $explanation_text = shift;
+ my $explanation_simply_formatted = shift;
+
+ if ($with_explanation)
+ {
+ return "$acronym_text ($explanation_text)";
+ }
+ else
+ {
+ return "$acronym_text";
+ }
+}
+
+
+sub info_default_print_page_foot($)
+{
+ my $fh = shift;
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+ my $indirect = 0;
+ if (!defined ($info_state->{'pending_tags'}))
+ { # i18n
+ main::document_warn ("Document without nodes.");
+ }
+ else
+ {
+ $indirect = 1 if ($info_default_out_file_nr > 1);
+ if ($indirect)
+ {
+ close ($Texi2HTML::THISDOC{'FH'});
+ unless (rename
("$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}",
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}-1"))
+ {
+ main::document_warn ("Rename
$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}
failed: $!");
+ }
+
+ my $INDIRECT =
main::open_out("$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}");
+ print $INDIRECT "".info_default_header();
+ print $INDIRECT "\x{1F}\nIndirect:";
+ foreach my $indirect (@info_default_pending_indirect)
+ {
+ print $INDIRECT "\n$indirect->{'file'}: $indirect->{'offset'}";
+ }
+ $fh = $INDIRECT;
+ }
+ # makeinfo seems to add systematically an additional \n, done just below
+ print $fh "\n\x{1F}\nTag Table:\n";
+
+ if ($indirect)
+ {
+ print $fh "(Indirect)\n";
+ }
+ my $Top_seen;
+ foreach my $element (@{$info_state->{'pending_tags'}})
+ {
+ my $prefix;
+ $prefix = 'Node' if ($element->{'node'});
+ $prefix = 'Ref' if ($element->{'anchor'} or $element->{'float'});
+ print $fh "$prefix:
$element->{'text'}\x{7F}$element->{'info_offset'}\n";
+ $Top_seen = 1 if ($element->{'text'} =~ /^top$/i);
+ }
+ if (!$Top_seen)
+ {# i18n
+ main::document_warn ("Document without Top node.");
+ }
+ print $fh "\x{1F}\nEnd Tag Table\n";
+ }
+
+ # IN_ENCODING is the documentencoding transformed to the encoding names
+ # usually seen in html. This is what the info readers should understand.
+ my $coding = get_conf('IN_ENCODING');
+ $coding = get_conf('documentencoding') if (!defined($coding));
+ if (defined($coding))
+ {
+ print $fh "\n\x{1F}\nLocal Variables:\ncoding: $coding\nEnd:\n";
+ }
+}
+
+sub info_default_print_Top_footer($$$)
+{
+ my $fh = shift;
+ my $end_page = shift;
+ my $element = shift;
+ if ($end_page)
+ {
+ &$print_page_foot($fh);
+ }
+ info_default_end_section($fh, $end_page, $element);
+}
+
+sub info_default_footnote_texi($$$)
+{
+ my $text = shift;
+ my $state = shift;
+ my $style_stack = shift;
+
+ unless ($state->{'outside_document'} or
(defined($state->{'multiple_pass'}) and $state->{'multiple_pass'} > 0))
+ {
+ $info_default_footnote_index++;
+ }
+ my $footnote_number = $info_default_footnote_index;
+ $footnote_number = $NO_NUMBER_FOOTNOTE_SYMBOL if
(!get_conf('NUMBER_FOOTNOTES'));
+ return "($footnote_number) $text";
+ #return undef;
+}
+
+sub info_default_print_section
+{
+ my $fh = shift;
+ my $first_in_page = shift;
+ my $previous_is_top = shift;
+ my $element = shift;
+ my $nw = main::print_lines($fh);
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+ if (!$info_state->{'blank_line'})
+ {
+ my $end = "\n";
+ $info_state->{'offset_in_file'} += info_default_byte_count($end);
+ $info_state->{'line_count'}++;
+ print $fh "$end";
+ }
+ if (@info_default_pending_footnotes)
+ {
+ my $footnote_text;
+ my $footnote_element;
+ if (get_conf('footnotestyle') eq 'separate')
+ {
+ my $node_ref = $info_default_current_node;
+ # thee is a warning when processing the footnote, like
+ # "Footnote defined without parent node"
+ $node_ref = {'text' => 'no node', 'file' => ''} if
(!defined($node_ref));
+ $footnote_element = { 'NodeUp' => $node_ref,
+ 'text' => $node_ref->{'text'} . "-Footnotes",
+ 'file' => $node_ref->{'file'},
+ 'info_offset' => $info_state->{'offset_in_file'},
+ 'node' => 1,
+ };
+ $footnote_element->{'element_ref'} = $footnote_element;
+ push @{$info_state->{'pending_tags'}}, $footnote_element;
+ $footnote_text = info_default_node_line($footnote_element,
$info_state);
+ }
+ else
+ { # FIXME i18n?
+ $footnote_text = " ---------- Footnotes ----------\n\n";
+ $info_state->{'offset_in_file'} +=
info_default_byte_count($footnote_text);
+ $info_state->{'line_count'} += 2;
+ #print STDERR "MMMMMMMMMMMMMMMMMM $info_state->{'line_count'}\n";
+ }
+ while (@info_default_pending_footnotes)
+ {
+ #push @info_default_pending_footnotes, [$lines, $footnote_text,
${info_default_footnote_index}, $node_name, $footnote_info_state];
+ my $footnote = shift @info_default_pending_footnotes;
+ my $foot_nr = $footnote->{'footnote_index'};
+ my $node_name = $footnote->{'node_name'};
+ my $lines = $footnote->{'lines'};
+ push @{$info_state->{'pending_tags'}}, {'anchor' => 1, 'text' =>
"${node_name}-Footnote-${foot_nr}", 'info_offset' =>
$info_state->{'offset_in_file'} };
+ my $footnote_info_state = $footnote->{'footnote_info_state'};
+ my $footnote_result = shift @{$lines};
+ # this is used to keep track of the size when there were
+ # leading spaces that will be removed below. This is only used
+ # to get the difference, the value itself is not of use.
+ my $initial_length = info_default_byte_count($footnote_result);
+
+ $footnote_result =~ s/^\s*//;
+ #$footnote_result = " ($foot_nr) " . $footnote_result;
+ $footnote_result = ' ' x get_conf('paragraphindent') .
$footnote_result;
+ foreach my
$footnote_pending_tags(@{$footnote_info_state->{'pending_tags'}})
+ {
+ $footnote_pending_tags->{'info_offset'} +=
$info_state->{'offset_in_file'} + info_default_byte_count($footnote_result) -
$initial_length;
+ push @{$info_state->{'pending_tags'}}, $footnote_pending_tags;
+ }
+ foreach my
$footnote_pending_index_entry(@{$footnote_info_state->{'pending_index_entries'}})
+ {
+ #print STDERR
"TTTTTTTTTTT($footnote_pending_index_entry->{'index_entry_reference'}->{'entry'})
$footnote_pending_index_entry->{'line_nr'} $info_state->{'line_count'}\n";
+ $footnote_pending_index_entry->{'line_nr'} +=
$info_state->{'line_count'};
+
$footnote_pending_index_entry->{'index_entry_reference'}->{'real_element'} =
$footnote_element if (get_conf('footnotestyle') eq 'separate');
+ }
+ my $line;
+ while (@$lines)
+ {
+ $line = shift @$lines;
+ $footnote_result .= $line;
+ }
+ my ($line_passed, $end_of_line, $last_line, $text_indented,
$blank_line) = info_default_count_lines($footnote_result);
+ if ($line_passed == 0)
+ {# certainly out of paragraph commands
+ $footnote_result =~ s/\s*$//;
+ $footnote_result .= "\n";
+ $line_passed = 1;
+ }
+ unless (($last_line !~ /\S/ and $end_of_line) or ($blank_line))
+ {
+ $footnote_result .= "\n";
+ $line_passed += 1;
+ }
+
+ $info_state->{'offset_in_file'} +=
info_default_byte_count($footnote_result);
+ $info_state->{'line_count'} += $line_passed;
+ $footnote_text .= $footnote_result;
+ }
+ print $fh "$footnote_text";
+ }
+}
+
+sub info_default_end_section($$$)
+{
+ my $fh = shift;
+ my $end_foot_navigation = shift;
+ my $element = shift;
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+
+ if (defined(get_conf('SPLIT_SIZE')) and
+ $info_state->{'offset_in_file'} > ($info_default_out_file_nr) *
get_conf('SPLIT_SIZE'))
+ {
+ if ($info_default_out_file_nr == 1)
+ { # push also the first node, which is always the first pending_tags
+ push @info_default_pending_indirect,
{'file'=>"$Texi2HTML::THISDOC{'filename'}->{'top'}-$info_default_out_file_nr",
'offset' => $info_state->{'pending_tags'}->[0]->{'info_offset'} };
+ }
+ $info_default_out_file_nr++;
+ # these file descriptors leak, but this allows the user to write a
+ # foot navigation himself, otherwise he would write on a closed file
+ # descriptor
+ #close($Texi2HTML::THISDOC{'FH'});
+ if (!$end_foot_navigation)
+ {
+
main::open_out_file("$Texi2HTML::THISDOC{'filename'}->{'top'}-$info_default_out_file_nr");
+ #print STDERR "X-$info_default_out_file_nr:
$info_state->{'offset_in_file'}\n";
+ &$print_page_head($Texi2HTML::THISDOC{'FH'});
+ push @info_default_pending_indirect,
{'file'=>"$Texi2HTML::THISDOC{'filename'}->{'top'}-$info_default_out_file_nr",
'offset' => $info_state->{'offset_in_file'}};
+ }
+ }
+}
+
+sub info_default_one_section($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ &$print_section($fh, 1, 0, $element);
+ &$print_page_foot($fh);
+}
+
+sub info_default_begin_special_region($$$)
+{
+ my $region = shift;
+ my $state = shift;
+ my $lines = shift;
+ my $info_state = info_default_get_state ($state);
+ # reset paragraph_in_element_nr if out ofdocument formatting
+ if ($state->{'outside_document'})
+ {
+ $info_state->{'paragraph_in_element_nr'} = 0;
+ }
+}
+
+sub info_default_end_special_region($$$)
+{
+ my $region = shift;
+ my $state = shift;
+ my $text = shift;
+ my $info_state = info_default_get_state ($state);
+ my $end = '';
+ if (!$info_state->{'blank_line'})
+ {
+ $end = "\n";
+ $info_state->{'offset_in_file'} += info_default_byte_count($end);
+ }
+ return $text.$end;
+}
+
+sub info_default_menu_link($$$$$$$$)
+{
+ my $entry = shift;
+ my $state = shift;
+ my $href = shift;
+ my $node = shift;
+ my $title = shift;
+ my $ending = shift;
+ my $has_title = shift;
+ my $command_stack = shift;
+ my $preformatted = shift;
+
+ $title = '' unless ($has_title);
+ $title .= ':' if ($title ne '');
+ my $result = "$MENU_SYMBOL$title$node$ending";
+ return info_default_store_text($state,$result,'menu_entry');
+}
+
+# not used, menu is a normal preformatted command
+#sub info_default_menu_command($$$)
+#{
+# my $format = shift;
+# my $text = shift;
+# my $in_preformatted = shift;
+# return info_default_close_command(undef, $format, "* Menu:\n", undef,
"\n");
+#}
+
+sub info_default_complex_format($$)
+{
+ my $name = shift;
+ my $text = shift;
+ my ($begin, $end);
+ if ($name eq 'menu')
+ {
+ main::line_warn(__("address@hidden before first node"),
$Texi2HTML::THISDOC{'line_nr'}) if (!defined($info_default_current_node));
+ $begin = "* Menu:\n\n";
+ }
+ elsif ($name eq 'direntry')
+ {
+ main::line_warn(__("address@hidden after first node"),
$Texi2HTML::THISDOC{'line_nr'}) if (defined($info_default_current_node));
+ $begin = "START-INFO-DIR-ENTRY\n";
+ $end = "END-INFO-DIR-ENTRY\n";
+ }
+ return info_default_close_command(undef, $name, $begin, $end);
+}
+
+sub info_default_quotation($$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $argument_text = shift;
+ my $argument_text_texi = shift;
+ my $authors = shift;
+
+ my $attribution;
+ if ($authors)
+ {
+ $attribution = '';
+ foreach my $author (@$authors)
+ {
+ my $author_texi = $author->{'author_texi'};
+ chomp($author_texi);
+ $attribution .= gdt("address@hidden --- address@hidden", {'author'
=> $author_texi}, {'duplicate' => 1, 'allow_paragraph' => 1});
+ }
+ }
+
+ return info_default_close_command(undef, $command, undef, $attribution);
+}
+
+sub info_default_misc_commands($$$$$)
+{
+ my $command = shift;
+ my $line = shift;
+ my $args = shift;
+ my $stack = shift;
+ my $state = shift;
+
+ info_default_store_text($state,undef,$command) if ($command eq 'exdent' or
$command eq 'noindent' or $command eq 'indent');
+ return ($command, $line, undef);
+}
+
+sub info_default_external_ref($$$$$$$$$)
+{
+ my $type = shift;
+ my $section = shift;
+ my $book = shift;
+ my $file = shift;
+ my $href = shift;
+ my $cross_ref = shift;
+ my $args_texi = shift;
+ my $formatted_args = shift;
+ my $node = shift;
+
+ return info_default_inforef($formatted_args) if ($type eq 'inforef');
+ return info_default_normal_reference($type, $formatted_args);
+}
+
+sub info_default_internal_ref($$$$$$$$)
+{
+ my $type = shift;
+ my $href = shift;
+ my $short_name = shift;
+ my $name = shift;
+ my $is_section = shift;
+ my $args_texi = shift;
+ my $formatted_args = shift;
+ my $element = shift;
+
+ $formatted_args->[1] = $name if ($element->{'float'} and
(!defined($formatted_args->[1]) or $formatted_args->[1] eq ''));
+ return info_default_inforef($formatted_args) if ($type eq 'inforef');
+ return info_default_normal_reference($type, $formatted_args);
+}
+
+sub info_default_normal_reference($$)
+{
+ my $command = shift;
+ my $formatted_args = shift;
+ for (my $i = 0; $i < scalar(@$formatted_args); $i++)
+ {
+ $formatted_args->[$i] = undef if (defined($formatted_args->[$i]) and
+ $formatted_args->[$i] =~ /^\s*$/);
+ }
+ my $node = $formatted_args->[0];
+ # an error, should trigger the message: Undefined node `' in @ref.
+ # avoid undef value and use an empty string instead.
+ $node = '' if (!defined($node));
+ my $name = $formatted_args->[1];
+ $name = $formatted_args->[2] if (!defined($name));
+ my $file = $formatted_args->[3];
+ $file = '' if (!defined($file) and defined($formatted_args->[4]));
+ $name = $node if (!defined($name) and defined($file));
+ my $result = '*note ';
+ $result = '*Note ' if ($command eq 'xref');
+ if (defined($name))
+ {
+ $result .= "${name}: ";
+ $result .= "($file)" if (defined($file));
+ $result .= "$node";
+ $result .= '.' if ($command eq 'pxref');
+ }
+ else
+ {
+ $result .= "${node}::";
+ }
+ return $result;
+}
+
+sub info_default_inforef($)
+{
+ my $formatted_args = shift;
+ return info_default_normal_reference('ref', [$formatted_args->[0],
$formatted_args->[1], undef, $formatted_args->[2], 'dumb manual name']);
+}
+
+sub info_default_image_files($$$$)
+{
+ my $base = shift;
+ my $extension = shift;
+ my $texi_base = shift;
+ my $texi_extension = shift;
+ my @files = ();
+ return @files if (!defined($base) or ($base eq ''));
+
+ if (defined($extension) and ($extension ne ''))
+ {
+ push @files, ["${base}$extension", "${texi_base}$extension"];
+ push @files, ["$base.$extension", "$texi_base.$extension"];
+ }
+ foreach my $ext (@IMAGE_EXTENSIONS)
+ {
+ push @files, ["$base.$ext", "$texi_base.$ext"];
+ }
+ return @files;
+}
+
+sub info_default_image($$$$$$$$$$$$$$$$$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ my $file_name = shift;
+ my $alt = shift;
+ my $width = shift;
+ my $height = shift;
+ my $raw_alt = shift;
+ my $extension = shift;
+ my $working_dir = shift;
+ my $file_path = shift;
+ my $in_paragraph = shift;
+ my $file_locations = shift;
+ my $base_simple_format = shift;
+ my $extension_simple_format = shift;
+ my $file_name_simple_format = shift;
+ my $line_nr = shift;
+
+ my $txt_path;
+ my $found_file;
+
+ my @extensions = @IMAGE_EXTENSIONS;
+ if (defined($extension) and ($extension ne ''))
+ {
+ unshift @extensions, ".$extension";
+ unshift @extensions, "$extension";
+ }
+ else
+ {
+ $extension = undef;
+ }
+ my $file_found_index = undef;
+ my $file_index = 0;
+ foreach my $file_location (@$file_locations)
+ {
+ my ($file_located, $path, $file_simple_format) = @$file_location;
+ my $extension = shift @extensions;
+ if (defined($path))
+ {
+ if ($extension eq 'txt' and !defined($txt_path))
+ {
+ $txt_path = $path;
+ }
+ elsif (!defined($found_file))
+ {
+ $found_file = [$file_located, $extension, $file_simple_format];
+ $file_found_index = $file_index;
+ }
+ }
+ $file_index++;
+ }
+
+ my $text;
+ if (defined($txt_path))
+ {
+ if (open(TXT, "<$txt_path"))
+ {
+ my $in_encoding = get_conf('IN_ENCODING');
+ if (defined($in_encoding) and get_conf('USE_UNICODE'))
+ {
+ binmode(TXT, ":encoding($in_encoding)");
+ }
+ $text='[' if ($in_paragraph or $preformatted);
+ while (my $img_txt = <TXT>)
+ {
+ $text .= $img_txt;
+ }
+ # remove last end of line
+ chomp ($text);
+ $text .= ']' if ($in_paragraph or $preformatted);
+ close(TXT);
+ }
+ else
+ {
+ main::line_warn (sprintf(__("address@hidden file `%s' unreadable:
%s"), $txt_path, $!), $line_nr);
+ }
+ }
+ elsif (!defined($found_file))
+ {
+ main::line_warn (sprintf(__("Cannot find address@hidden file
`%s.txt'"), $base), $line_nr);
+ }
+ if (defined($found_file) and (!defined($extension) or $file_found_index <=
1))
+ {
+ my $filename = $found_file->[2];
+ $filename =~ s/\\/\\\\/g;
+ $filename =~ s/\"/\\\"/g;
+ my $result = "\x{00}\x{08}[image src=\"$filename\"";
+ if (defined($alt))
+ {
+ $alt =~ s/\\/\\\\/g;
+ $alt =~ s/\"/\\\"/g;
+ $result .= " alt=\"$alt\"";
+ }
+ if (defined($text))
+ {
+ $text =~ s/\\/\\\\/g;
+ $text =~ s/\"/\\\"/g;
+ $result .= " text=\"$text\"";
+ }
+ $result .= "\x{00}\x{08}]";
+ return $result;
+ }
+ return $text if (defined($text));
+ return '';
+}
+
+sub info_default_printindex($$)
+{
+ my $index_name = shift;
+ my $printindex = shift;
+ %info_default_index_entries_counts = ();
+ return
info_default_store_text(undef,t2h_GPL_default_printindex($index_name,$printindex),'printindex');
+}
+
+sub info_default_print_index($$)
+{
+ my $text = shift;
+ my $name = shift;
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+ my $before = '';
+ if (!$info_state->{'blank_line'})
+ {
+ $before = "\n";
+ }
+ return $before if (!defined($text));
+ my $result = "\x{00}\x{08}[index\x{00}\x{08}]\n* Menu:\n\n" .$text."\n";
+ return $before.$result;
+}
+
+sub info_default_index_letter($$$)
+{
+ my $letter = shift;
+ my $id = shift;
+ my $text = shift;
+ return $text;
+}
+
+sub info_default_index_entry_label($$$$$$$$$)
+{
+ my $identifier = shift;
+ my $preformatted = shift;
+ my $entry = shift;
+ my $index_name = shift;
+ my $index_command = shift;
+ my $texi_entry = shift;
+ my $formatted_entry = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ #return '' if ($index_entry_ref->{'hidden'});
+ #return '' if (!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
+ return '' if ($in_region_not_in_output or
!defined($index_entry_ref->{'index_name'}));
+ main::line_warn(sprintf(__("Entry for index `%s' outside of any node"),
$index_entry_ref->{'index_name'}), $Texi2HTML::THISDOC{'line_nr'}) if
(!defined($info_default_current_node) and
!$Texi2HTML::THISDOC{'state'}->{'outside_document'});
+ my $index_entry_stored = {'index_entry_reference' => $index_entry_ref,
'index_command' => $index_command, 'texi_entry' => $texi_entry};
+ return info_default_store_text(undef, undef, 'index_label',
$index_entry_stored);
+}
+
+sub info_default_index_entry($$$$$$$$$$)
+{
+ my $text_href = shift;
+ my $entry = shift;
+ my $element_href = shift;
+ my $element_text = shift;
+ my $entry_file = shift;
+ my $current_element_file = shift;
+ my $entry_target = shift;
+ my $entry_element_target = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+ #return '' if ($index_entry_ref->{'hidden'});
+ #return '' if (!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
+ return '' if ($in_region_not_in_output);
+ my $state = {};
+ $state = { 'code_style' => 1 } if ($index_entry_ref->{'in_code'});
+ $entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in
address@hidden", $state);
+ return '' if ($entry =~ /^\s*$/);
+
+ my $entry_nr = '';
+ if (!defined($info_default_index_entries_counts{$entry}))
+ {
+ $info_default_index_entries_counts{$entry} = 0;
+ }
+ else
+ {
+ $info_default_index_entries_counts{$entry} ++;
+ $entry_nr = ' <'.$info_default_index_entries_counts{$entry}.'>';
+ }
+
+ my $result = "* $entry${entry_nr}: ";
+ if (t2h_default_string_width($result) < $info_default_index_length_to_node)
+ {
+ $result .= ' ' x($info_default_index_length_to_node -
t2h_default_string_width($result));
+ }
+
+ #print STDERR "DDDDDDDDDDD $index_entry_ref
`$index_entry_ref->{'texi'}'\n";
+ my $info_index_entry_ref = $info_default_index_entries{$index_entry_ref};
+ my $line_nr = $info_index_entry_ref->{'line_nr'};
+
+ my $real_element_text;
+ my $element = $index_entry_ref->{'real_element'};
+ # in case $element->{'text'} is not defined, it certainly means that we
+ # are n a special elemet, most likely the virtual element appearing
+ # before anything else
+ if (!defined($element->{'text'}))
+ {
+ $real_element_text = gdt('(outside of any node)');
+ $line_nr = 0;
+ }
+ else
+ {
+ $element = $element->{'element_ref'} if ($element->{'element_ref'});
+ $real_element_text = $element->{'text'};
+ # this happens for index entries appearing after @printindex. In that
case
+ # it is considered that they are at the beginning of the node.
+ $line_nr = 3 if (defined($line_nr) and $line_nr < 3);
+ $line_nr = 4 if (!defined($line_nr));
+ }
+ $result .= $real_element_text . '.';
+ my $max_len =
$info_default_index_line_string_length{$index_entry_ref->{'index_name'}};
+ $max_len = t2h_default_string_width($line_nr) if (!defined($max_len));
+ my $line_nr_spaces = sprintf("%${max_len}d", $line_nr);
+ my $line_part = "(line ${line_nr_spaces})";
+ #print STDERR "GGGGGGGGGG name: $index_entry_ref->{'index_name'} max:
${max_len} line_nr: `$line_nr' line_nr_spaces `$line_nr_spaces' $line_part \n";
+ if (t2h_default_string_width($result)+t2h_default_string_width($line_part)
+1 > get_conf('FILLCOLUMN'))
+ {
+ $result .= "\n" . ' ' x (get_conf('FILLCOLUMN') -
t2h_default_string_width($line_part)) ;
+ }
+ else
+ {
+ $result .= ' ' x (get_conf('FILLCOLUMN') -
t2h_default_string_width($line_part) - t2h_default_string_width($result));
+ }
+ $result .= "$line_part\n";
+
+ return $result;
+}
+
+sub info_default_index_summary($$)
+{
+ my $alpha = shift;
+ my $nonalpha = shift;
+
+ return '';
+}
+
+sub info_default_summary_letter
+{
+ return '';
+}
+
+sub info_default_foot_line_and_ref($$$$$$$$)
+{
+ my $foot_num = shift;
+ my $relative_num = shift;
+ my $footid = shift;
+ my $docid = shift;
+ my $from_file = shift;
+ my $footnote_file = shift;
+ my $lines = shift;
+ my $state = shift;
+
+ my $footnote_state = $Texi2HTML::THISDOC{'state'};
+ my $footnote_info_state = info_default_get_state ($footnote_state);
+
+ my $footnote_text = "($info_default_footnote_index)";
+ $footnote_text = "($NO_NUMBER_FOOTNOTE_SYMBOL)" if
(!get_conf('NUMBER_FOOTNOTES'));
+ my $node_name;
+ $node_name = '';
+ if (defined($info_default_current_node))
+ {
+ $node_name = $info_default_current_node->{'text'};
+ }
+ else
+ { # i18n
+ # no warning when outside of document, for footnotes in
+ # titlepage and copying
+ main::line_error(__("Footnote defined without parent node"),
$Texi2HTML::THISDOC{'line_nr'}) unless ($footnote_state->{'outside_document'});
+ #print STDERR "".main::context_string()."\n";
+ }
+ if (get_conf('footnotestyle') eq 'separate')
+ {
+ $footnote_text .= ' (' . info_default_normal_reference('pxref',
["${node_name}-Footnote-${info_default_footnote_index}"]) . ')';
+ }
+ push @info_default_pending_footnotes, {'lines' => $lines,
+ 'footnote_text' => $footnote_text,
+ 'footnote_index' => ${info_default_footnote_index},
+ 'node_name' => $node_name,
+ 'footnote_info_state' => $footnote_info_state}
+ unless ($state->{'outside_document'} or
(defined($state->{'multiple_pass'}) and $state->{'multiple_pass'} > 0));
+ return ([], $footnote_text);
+}
+
+sub info_default_foot_lines($)
+{
+ my $lines = shift;
+ #my $state = $Texi2HTML::THISDOC{'state'};
+ #my $info_state = info_default_get_state ($state);
+ @$lines = ();
+}
+
+# remark: table_item is the html one, but it gets added to the table text
+# on the stack, and is ignored there (in info_default_format).
+sub info_default_format_list_item_texi($$$$)
+{
+ my $format = shift;
+ my $line = shift;
+ my $prepended = shift;
+ my $command = shift;
+ my $number = shift;
+
+ my $open_command = 0;
+ my $result_line;
+ $command = 'bullet' if ((!defined($command) or $command eq '') and
(!defined($prepended) or $prepended eq '') and $format eq 'itemize');
+ $prepended = "address@hidden" if (defined($command) and $command ne '');
+ $prepended = "$number." if (defined($number) and $number ne '');
+
+ $line =~ s/^\s*//;
+
+ if (defined($command) and $command ne '' and $format ne 'itemize')
+ {
+ address@hidden
+ $line =~ s/\s*$//;
+ if (exists ($style_map{$command}))
+ {
+ $result_line = "address@hidden";
+ }
+ elsif (exists ($things_map{$command}))
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ else
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ }
+# elsif (defined($prepended) and $prepended ne '')
+# { # @enumerate and @itemize
+# $prepended =~ s/^\s*//;
+# $prepended =~ s/\s*$//;
+# $result_line = $prepended . ' ' . $line;
+# }
+
+ return ($result_line, $open_command);
+}
+
+sub info_default_list_item($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $format = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+ my $item_command = shift;
+
+# my $prepend = '';
+# if (defined($formatted_command) and $formatted_command ne '')
+# {
+# $prepend = $formatted_command;
+# }
+# return $prepend . $text;
+# $command = 'bullet' if ((!defined($command) or $command eq '') and
(!defined($prepended) or $prepended eq '') and $format eq 'itemize');
+ $formatted_command = $things_map{'bullet'} if ((!defined($command) or
$command eq '') and (!defined($prepended) or $prepended eq '') and $format eq
'itemize');
+
+ if ($format !~ /table$/)
+ {
+ my $result = '';
+ if ($format eq 'enumerate')
+ {
+ $result = $number.'.';
+ }
+ elsif ($format eq 'itemize')
+ {
+ if (defined($formatted_command) and $formatted_command ne '')
+ {
+ $result = $formatted_command;
+ }
+ elsif (defined ($prepended_formatted) and $prepended_formatted ne '')
+ {
+ $prepended_formatted =~ s/^\s*//;
+ $prepended_formatted =~ s/\s*$//;
+ $result = $prepended_formatted;
+ }
+ }
+ else
+ {
+ $result = '';
+ }
+ $result .= ' ' if ($result ne '');
+ return info_default_close_command (undef, $item_command, $result);
+ }
+ return $text;
+}
+
+sub info_default_format($$$)
+{
+ my $tag = shift;
+ my $element = shift;
+ my $text = shift;
+
+ # currently no command has something else than '' as $element.
+ # notice that any text is discarded
+ $element = undef if ($element eq '');
+ my $element_end = $element;
+ if (defined($element) and $element =~ /^(\w+)(\s+)(.+)/)
+ {
+ $element = $1;
+ $element_end = $2;
+ }
+ return info_default_close_command(undef, $tag, $element, $element_end);
+}
+
+sub info_default_tab_item_texi($$$$$$)
+{
+ my $command = shift;
+ my $commands_stack = shift;
+ my $stack = shift;
+ my $state = shift;
+ my $line = shift;
+ my $line_nr = shift;
+
+ $line =~ s/^\s*//;
+ my $format;
+ my $info_state = info_default_get_state ($state);
+ #$format = $commands_stack->[-1] if (defined($commands_stack) and
@$commands_stack and $commands_stack->[-1]);
+ my ($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'});
+ print STDERR "Not in_format in info_default_tab_item_texi\n" if
(!$in_format);
+ $format = $parent_format->{'command'};
+ # in case of an @item or @tab outside of any format $format will be
+ # undefined, or not multitable for a @tab.
+ # however the main program still do as if something was opened, plus
+ # it is checked there that the nesting is correct
+ #return $line if (!defined($format) or $command eq 'tab' and $format ne
'multitable');
+ #print STDERR "tab_item_texi $format $command $commands_stack, $stack,
$state, $line, ".main::format_line_number($line_nr)."\n";
+ if ($format eq 'multitable')
+ { # even if it is a tab, if it is not already in a multitable_row, one
+ # should be started
+ if ($command ne 'tab' or $info_state->{'current'}->{'command'} ne
'multitable_row')
+ {
+ info_default_open_command($state, 'multitable_row');
+ }
+ info_default_open_command($state, 'multitable_cell');
+ }
+ elsif ($format =~ /table$/)
+ {
+ info_default_store_text ($state, undef, $command, {'format_name' =>
$format});
+ }
+ else
+ {
+ info_default_open_command ($state, $command, {'format_name' =>
$format});
+ }
+ # this allows removing blank space in front of the item or tab argument
+ return $line;
+}
+
+sub info_default_sp($$)
+{
+ my $number = shift;
+ my $preformatted = shift;
+ my $result = "\n" x $number;
+ return info_default_store_text(undef,$result,'sp');
+}
+
+sub info_default_paragraph_style_command($$)
+{
+ my $format = shift;
+ my $text = shift;
+ return info_default_close_command(undef, $format);
+}
+
+sub info_default_row($$$$$$$$)
+{
+ my $text = shift;
+ my $macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+ #print STDERR "info_default_row: $text\n";
+
+ return info_default_close_command(undef, 'multitable_row', undef, undef,
{'item_command' => $macro});
+}
+
+sub info_default_cell($$$$$$$$)
+{
+ my $text = shift;
+ my $row_macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ # in general, when before_items, there will be no call to the function
+ # since there should never be a text sent back, so that this
+ # function will not be called for the first row (the multitable title).
+ # However, if there is a @tab before the first @item, the main program
+ # is less careful and closes the cell in any case, so before_items
+ # has to be checked for that case.
+ return info_default_close_command(undef, 'multitable_cell') unless
($before_items);
+}
+
+sub info_default_table_list($$$$$$$$$)
+{
+ my $format_command = shift;
+ my $text = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+# enumerate
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+# itemize
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+# multitable
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+
+ die "BUG: $format_command item_nr undef\n" if (!defined($item_nr));
+
+ return info_default_close_command(undef, $format_command, undef, undef,
{'total_item_nr' => $item_nr}) if ($format_command ne 'multitable');
+
+ my $columnsize = [];
+ if (defined($prototype_lengths) and @$prototype_lengths)
+ {
+ $columnsize = [ @$prototype_lengths ];
+ }
+ elsif (defined($columnfractions) and @$columnfractions)
+ {
+ foreach my $fraction (@$columnfractions)
+ {
+ push @$columnsize, int($fraction * get_conf('FILLCOLUMN') +0.5);
+ }
+ }
+ else
+ { # empty multitable
+ #print STDERR "Empty multitable?\n";
+ }
+
+ return info_default_close_command(undef, $format_command, undef, undef,
{'columns_size' => $columnsize, 'total_item_nr' => $item_nr});
+}
+
+sub info_default_def_item($$$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $command = shift;
+
+ my $format = 'deff_item';
+ $format = 'deff_itemx' if ($command =~ /x$/);
+ return info_default_close_command(undef, $format);
+}
+
+sub info_default_def_line($$$$$$$$$$$$$$$$)
+{
+ my $category_prepared = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ my $index_label = shift;
+ my $arguments_array = shift;
+ my $arguments_type_array = shift;
+ my $unformatted_arguments_array = shift;
+ my $command = shift;
+ my $class_name = shift;
+ my $category = shift;
+ my $class = shift;
+ my $style = shift;
+ my $original_command = shift;
+
+ $name = '' if (!defined($name) or ($name =~ /^\s*$/));
+ $type = '' if (!defined($type) or $type =~ /^\s*$/);
+ $arguments = '' if (!defined($arguments) or $arguments =~ /^\s*$/);
+
+ my $type_name = '';
+ $type_name .= "$type " if ($type ne '');
+ $type_name .= $name if ($name ne '');
+
+ my $result = " -- $category_prepared: ${type_name}$arguments";
+ $result =~ s/\s*$//;
+ $result .= "\n";
+ my $state = $Texi2HTML::THISDOC{'state'};
+ info_default_store_text(undef,$result,"${command}_line",{'definition_line'
=> 1});
+ my $format = 'deff_item';
+ $format = 'deff_itemx' if ($original_command =~ /x$/);
+ return info_default_open_command($state, $format);
+}
+
+sub info_default_def($$)
+{
+ my $text = shift;
+ my $command = shift;
+ return info_default_close_command(undef, $command);
+}
+
+sub info_default_float($$$$$)
+{
+ my $text = shift;
+ my $float = shift;
+ my $caption = shift;
+ my $shortcaption = shift;
+
+ my $additional_arguments;
+ if (exists($float->{'id'}))
+ {
+ $additional_arguments->{'anchor_reference'} = $float;
+ main::line_warn(__("float reference outside of any node, it won't be
registered"), $Texi2HTML::THISDOC{'line_nr'}) if
(!defined($info_default_current_node) and
!$Texi2HTML::THISDOC{'state'}->{'outside_document'});
+ }
+ my $caption_text = '';
+
+ if (defined($float->{'caption_texi'}))
+ {
+ $caption_text = $caption;
+ }
+ elsif (defined($float->{'shortcaption_texi'}))
+ {
+ $caption_text = $shortcaption;
+ }
+ elsif (defined($caption))
+ {
+ $caption_text = $caption;
+ }
+
+ #return $caption_text;
+ return info_default_close_command(undef, 'float', undef, $caption_text,
$additional_arguments);
+}
+
+sub info_default_listoffloats_entry($$$$)
+{
+ my $style_texi = shift;
+ my $float = shift;
+ my $float_style = shift;
+ my $caption = shift;
+ my $href = shift;
+
+ my @lines = split /^/, $caption;
+ $caption = $lines[0];
+ $caption = '' if (!defined($caption));
+ chomp ($caption);
+
+ my $result = '';
+ #$caption .= ':' if ($caption ne '');
+ my $caption_entry = "* $float_style: $float->{'text'}.";
+ if (t2h_default_string_width($caption_entry) >
$info_default_listoffloat_caption_entry_length)
+ {
+ $caption_entry .= "\n" . ' ' x
$info_default_listoffloat_caption_entry_length;
+ }
+ else
+ {
+ $caption_entry .= ' ' x
($info_default_listoffloat_caption_entry_length - length($caption_entry));
+ }
+ my $width = $info_default_listoffloat_caption_entry_length;
+ while ($caption =~ s/^(\S+\s*)//)
+ {
+ my $new_word = $1;
+ if ((t2h_default_string_width($new_word) + $width) >
get_conf('FILLCOLUMN') - 3)
+ {
+ $caption_entry .= $info_default_listoffloat_append;
+ last;
+ }
+ else
+ {
+ $caption_entry .= $new_word;
+ $width += t2h_default_string_width($new_word);
+ }
+ }
+ return $caption_entry. "\n";
+}
+
+sub info_default_listoffloats($$$)
+{
+ my $style_texi = shift;
+ my $style = shift;
+ my $float_entries = shift;
+
+ my $state = $Texi2HTML::THISDOC{'state'};
+ my $info_state = info_default_get_state ($state);
+ my $result = "* Menu:\n\n";
+ foreach my $float_entry (@$float_entries)
+ {
+ $result .= $float_entry;
+ }
+ my ($parent_format, $in_format);
+ ($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'});
+ #print STDERR "address@hidden not at top level\n" if ($in_format);
+ info_default_increment_paragraph ($in_format, $parent_format, $info_state,
'listoffloats');
+ return info_default_store_text($state,$result,'listoffloats');
+}
+
+sub info_default_raw($$)
+{
+ my $style = shift;
+ my $text = shift;
+ my $expanded = 1 if (grep {$style eq $_} @EXPAND);
+ # no warning for unknown raw formats
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude' or $expanded)
+ {
+ return info_default_store_text(undef, $text, $style, {'raw_command' =>
1});
+ }
+ return '';
+}
+
+sub info_default_line_command($$$$)
+{
+ my $command = shift;
+ my $arg_text = shift;
+ my $arg_texi = shift;
+ my $state = shift;
+
+ main::line_warn(__("address@hidden after first node"),
$Texi2HTML::THISDOC{'line_nr'}) if (defined($info_default_current_node));
+ return '' if ($arg_text eq '');
+ $info_default_dir_specification .= "INFO-DIR-SECTION $arg_text\n";
+ return '';
+}
+
+sub info_default_unknown_style($$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $state = shift;
+ my $no_close = shift;
+ my $no_open = shift;
+
+ my ($result, $result_text, $message);
+ $result_text = info_default_close_command(undef, $command, undef, undef,
undef);
+ $message = "Unknown command with braces address@hidden'" if (!$no_open);
+ return (1, $result_text, $message);
+}
+
+1;
Index: texi2html/formats/plaintext.pm
===================================================================
RCS file: texi2html/formats/plaintext.pm
diff -N texi2html/formats/plaintext.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/formats/plaintext.pm 9 Apr 2011 00:10:45 -0000 1.1
@@ -0,0 +1,168 @@
+#+##############################################################################
+#
+# plaintext.pm: convert to plaintext
+#
+# Copyright (C) 2009 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+use strict;
+
+sub plaintext_default_load(;$)
+{
+my $from_command_line = shift;
+info_default_load();
+
+set_default('SHOW_MENU', 0);
+set_default('OUTFILE', '-');
+# unless(defined($OUT) and $OUT !~ m:/$:);
+set_default('HEADERS', 0);
address@hidden = ('plaintext');
+
+$print_page_head = \&plaintext_default_print_page_head;
+$print_page_foot = \&plaintest_default_print_page_foot;
+$element_heading = \&plaintext_default_element_heading;
+$image = \&plaintext_default_image;
+$print_index = \&plaintext_default_print_index;
+
+}
+
+sub plaintext_default_print_page_head($)
+{
+ my $fh = shift;
+}
+
+sub plaintest_default_print_page_foot($)
+{
+ my $fh = shift;
+}
+
+sub plaintext_default_element_heading($$$$$$$$$$$$)
+{
+ my $info_result = &Texi2HTML::Config::info_default_element_heading(@_);
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+ my $one_section = shift;
+ my $element_heading = shift;
+ my $first_in_page = shift;
+ my $is_top = shift;
+ my $previous_is_top = shift;
+ my $command_line = shift;
+ my $element_id = shift;
+ my $new_element = shift;
+
+ return $info_result if (!$element->{'node'});
+ return '';
+}
+
+sub plaintext_default_image($$$$$$$$$$$$$$$$$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ my $file_name = shift;
+ my $alt = shift;
+ my $width = shift;
+ my $height = shift;
+ my $raw_alt = shift;
+ my $extension = shift;
+ my $working_dir = shift;
+ my $file_path = shift;
+ my $in_paragraph = shift;
+ my $file_locations = shift;
+ my $base_simple_format = shift;
+ my $extension_simple_format = shift;
+ my $file_name_simple_format = shift;
+ my $line_nr = shift;
+
+ my $txt_path;
+ my $found_file;
+
+ my @extensions = @IMAGE_EXTENSIONS;
+ if (defined($extension) and ($extension ne ''))
+ {
+ unshift @extensions, ".$extension";
+ unshift @extensions, "$extension";
+ }
+ else
+ {
+ $extension = undef;
+ }
+ my $file_found_index = undef;
+ my $file_index = 0;
+
+ foreach my $file_location (@$file_locations)
+ {
+ my ($file_located, $path, $file_simple_format) = @$file_location;
+ my $extension = shift @extensions;
+ if (defined($path))
+ {
+ if ($extension eq 'txt' and !defined($txt_path))
+ {
+ $txt_path = $path;
+ }
+ elsif (!defined($found_file))
+ {
+ $found_file = [$file_located, $extension, $file_simple_format];
+ $file_found_index = $file_index;
+ }
+ }
+ $file_index++;
+ }
+
+ my $text = '';
+ if (defined($txt_path))
+ {
+ if (open(TXT, "<$txt_path"))
+ {
+ my $in_encoding = get_conf('IN_ENCODING');
+ if (defined($in_encoding) and get_conf('USE_UNICODE'))
+ {
+ binmode(TXT, ":encoding($in_encoding)");
+ }
+ $text='[' if ($in_paragraph or $preformatted);
+ while (my $img_txt = <TXT>)
+ {
+ $text .= $img_txt;
+ }
+ $text .= ']' if ($in_paragraph or $preformatted);
+ close(TXT);
+ }
+ else
+ {
+ main::line_warn (sprintf(__("address@hidden file `%s' unreadable:
%s"), $txt_path, $!), $line_nr);
+ }
+ }
+ elsif (!defined($found_file))
+ {
+ main::line_warn (sprintf(__("Cannot find address@hidden file
`%s.txt'"), $base), $line_nr);
+ }
+ return $text;
+}
+
+sub plaintext_default_print_index($$)
+{
+ my $text = shift;
+ my $name = shift;
+ return '';
+}
+
+1;
Index: texi2html/formats/xml.pm
===================================================================
RCS file: texi2html/formats/xml.pm
diff -N texi2html/formats/xml.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/formats/xml.pm 9 Apr 2011 00:10:45 -0000 1.1
@@ -0,0 +1,1276 @@
+# vim: set filetype=perl:
+#
+# Convert to texinfo xml.
+#
+# This file is in the public domain. Thus it may easily be used as an
+# example for further customizations.
+#
+# Originally written by Patrice Dumas in 2009.
+
+use strict;
+
+my @xml_multitable_stack = ();
+my @xml_table_stack = ();
+
+my @xml_ignored_misc_commands;
+my %xml_misc_command_output;
+my %xml_misc_elements_with_arg_map;
+my @xml_misc_elements_with_arg;
+my %def_format_xml;
+my $xml_current_section;
+
+sub xml_default_load(;$)
+{
+my $from_command_line = shift;
+
+t2h_default_set_variables_xml();
+set_default('DOCTYPE', '<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML
V4.12//EN" "http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>');
+set_default('SIMPLE_MENU', 0);
+set_default('SEPARATE_DESCRIPTION', 1);
address@hidden = ('xml', 'direntry');
+set_default('HEADERS', 0);
+set_default('INLINE_INSERTCOPYING', 0);
+set_default('SHOW_MENU', 1);
+set_default('SHOW_TITLE', 0);
+set_default('NUMBER_SECTIONS', 0);
+set_default('USE_NODES', 1);
+set_default('USE_SECTIONS', 1);
+set_default('SPLIT', '');
+
+t2h_default_push_handler(\&xml_init_variables, address@hidden);
+
+$colon_command_punctuation_characters{'.'} = '.';
+$colon_command_punctuation_characters{':'} = ':';
+$colon_command_punctuation_characters{'?'} = '?';
+$colon_command_punctuation_characters{'!'} = '!';
+
+$simple_map{'*'} = '&linebreak;';
+$simple_map{' '} = '&space;';
+$simple_map{"\t"} = '&space;';
+$simple_map{"\n"} = '&space;';
+$simple_map{'.'} = '&eosperiod;';
+$simple_map{'!'} = '&eosexcl;';
+$simple_map{'?'} = '&eosquest;';
+
+%simple_map_pre = %simple_map;
+
+# FIXME right?
+$things_map{'l'} = '/l';
+$things_map{'L'} = '/L';
+$things_map{'enddots'} = '&enddots;';
+$things_map{'dots'} = '&dots;';
+# FIXME equiv, point, expansion could be ameliorated
+$things_map{'equiv'} = '==';
+$things_map{'point'} = '-!-';
+$things_map{'expansion'} = '==>'; # →?
+
+$things_map{'minus'} = '−';
+$things_map{'result'} = '⇒';
+$things_map{'bullet'} = '•';
+$things_map{'copyright'} = '©right;';
+$things_map{'registeredsymbol'} = '®istered;';
+$things_map{'arrow'} = '→';
+$things_map{'TeX'} = '&tex;';
+$things_map{'LaTeX'} = '&latex;';
+
+%pre_map = %things_map;
+
+$stop_paragraph_command{'caption'} = 1;
+$stop_paragraph_command{'shortcaption'} = 1;
+
+%line_command_map = ();
+foreach my $command ('contents', 'shortcontents', 'summarycontents')
+{
+ $line_command_map{$command} = $command;
+}
+
+%format_map = ();
+
+$format_map{'copying'} = '';
+$format_map{'titlepage'} = 'titlepage';
+$format_map{'documentdescription'} = 'documentdescription';
+$format_map{'group'} = 'group';
+$format_map{'raggedright'} = 'raggedright';
+
+foreach my $region ('titlepage', 'documentdescription', 'copying')
+{
+ $region_formats_kept{$region} = 1;
+}
+
+%style_map = ();
+t2h_default_copy_style_map (\%default_style_map, \%style_map);
+
+foreach my $style (keys(%style_map))
+{
+ next if grep {$style eq $_} ('asis', 'ctrl', 'w');
+ if (grep {$style eq $_} ('tieaccent', 'dotless', keys(%unicode_accents)))
+ {
+ $style_map{$style} = { 'function' => \&xml_default_accent };
+ }
+ elsif (!exists($style_map{$style}->{'args'}) or
(scalar(@{$style_map{$style}->{'args'}}) eq 1 and
($style_map{$style}->{'args'}->[0] eq 'code' or
$style_map{$style}->{'args'}->[0] eq 'normal')))
+ {
+ $style_map{$style}->{'inline_attribute'} = $style;
+ delete ($style_map{$style}->{'quote'});
+ delete ($style_map{$style}->{'begin'});
+ delete ($style_map{$style}->{'end'});
+ delete ($style_map{$style}->{'function'});
+ }
+}
+
+foreach my $complex_format (keys(%complex_format_map))
+{
+ my $style = $complex_format_map{$complex_format}->{'style'};
+ delete $complex_format_map{$complex_format};
+ $complex_format_map{$complex_format}->{'begin'} = "<$complex_format
xml:space=\"preserve\">";
+ $complex_format_map{$complex_format}->{'end'} = "</$complex_format>";
+ $complex_format_map{$complex_format}->{'style'} = $style if
(defined($style));
+}
+foreach my $menu_command('menu', 'detailmenu', 'direntry', 'menu_comment')
+{
+ $complex_format_map{$menu_command} = undef;
+ delete $complex_format_map{$menu_command};
+}
+
+# this is not needed because normal_text isn't the same than in html
+#t2h_remove_text_substitutions("'", 1, 0, 0, 1);
+#t2h_remove_text_substitutions('`', 1, 0, 0, 1);
+
+$style_map{'w'}->{'end'} = '<!-- /@w -->';
+$style_map{'='}->{'function'} = \&xml_macron;
+$style_map{'email'}->{'function'} = \&xml_email;
+$style_map{'titlefont'}->{'function'} = \&xml_titlefont;
+$style_map{'math'}->{'function'} = \&xml_math;
+$style_map{'uref'}->{'function'} = \&xml_uref;
+$style_map{'url'}->{'function'} = \&xml_uref;
+$style_map{'t'}->{'inline_attribute'} = 'tt';
+# FIXME
+delete $special_accents{'ringaccent'};
+$special_accents{'ogonek'} = 'aeiuAEIU';
+
+%style_map_pre = %style_map;
+
+$no_paragraph_commands{'cindex'} = 0;
+
+#my @xml_ignored_misc_commands = ('bye', 'sp', 'verbatiminclude');
+
address@hidden = ('bye', 'sp', 'verbatiminclude', 'clickstyle',
+ 'defcodeindex',
+ 'syncodeindex', 'paragraphindent', 'shorttitlepage', 'refill', 'noindent');
+
+# we want to proceed all the misc commands
+# makeinfo ignores clickstyle, changes setfilename. Not sure it is right.
+foreach my $misc_command (keys(%misc_command))
+{
+ next if (grep {$misc_command eq $_} @xml_ignored_misc_commands);
+ $xml_misc_command_output{$misc_command} = 1;
+}
+
+$format_map{'menu'} = 'menu';
+# checked on bug-texinfo, only node is in code_style, as with makeinfo --xml
+#$format_code_style{'menu'} = 1;
+#$format_code_style{'menu_name'} = 1;
+#$format_code_style{'menu_description'} = 1;
+$format_map{'detailmenu'} = 'detailmenu';
+$format_map{'direntry'} = 'direntry';
+$format_map{'menu_comment'} = '';
+
+$menu_description = \&xml_menu_description;
+$menu_link = \&xml_menu_link;
+$element_heading = \&xml_heading;
+$heading = \&xml_heading;
+$paragraph = \&xml_paragraph;
+$preformatted = \&xml_preformatted;
+$misc_element_label = \&xml_noop;
+$element_label = \&xml_noop;
+$anchor_label = \&xml_anchor_label;
+$index_entry_label = \&xml_index_entry_label;
+$index_entry_command = \&xml_index_entry_command;
+$listoffloats = \&xml_listoffloats;
+$acronym_like = \&xml_acronym_like;
+$foot_line_and_ref = \&xml_foot_line_and_ref;
+$image = \&xml_image;
+$sp = \&xml_sp;
+$quotation = \&xml_quotation;
+$table_list = \&xml_table_list;
+$row = \&xml_row;
+$cell = \&xml_cell;
+$list_item = \&xml_list_item;
+$format_list_item_texi = \&xml_format_list_item_texi;
+$misc_command_line = \&xml_misc_commands;
+$begin_format_texi = \&xml_begin_format_texi;
+$def_line = \&xml_def_line;
+$def = \&xml_def;
+$def_item = \&xml_def_item;
+$printindex = \&xml_printindex;
+$index_summary = \&xml_index_summary;
+$external_ref = \&xml_external_ref;
+$internal_ref = \&xml_internal_ref;
+$table_item = \&xml_table_item;
+$table_line = \&xml_table_line;
+$float = \&xml_float;
+$caption_shortcaption = \&xml_caption_shortcaption;
+$caption_shortcaption_command = \&xml_caption_shortcaption_command;
+$normal_text = \&xml_normal_text;
+$protect_text = \&xml_default_protect_text;
+$paragraph_style_command = \&xml_paragraph_style_command;
+$raw = \&xml_raw;
+$cartouche = \&xml_cartouche;
+
+$print_Top = \&xml_print_Top;
+$print_Top_footer = \&xml_print_Top_footer;
+$print_page_head = \&xml_print_page_head;
+$print_foot_navigation = \&xml_noop;
+$toc_body = \&xml_noop;
+$about_body = \&xml_noop;
+$print_page_foot = \&xml_print_page_foot;
+$end_section = \&xml_end_section;
+$one_section = \&xml_one_section;
+
+%xml_misc_elements_with_arg_map = (
+ 'title' => 'booktitle',
+ 'subtitle' => 'booksubtitle'
+);
+
address@hidden = ('author',
+ 'dircategory', 'settitle');
+#my @xml_misc_elements_with_arg = ('author', 'shorttitlepage',
+# 'vskip', 'dircategory', 'settitle');
+
+%def_format_xml = (
+ 'deffn' => [ ['category', 'category'], ['function', 'name'] ],
+ 'defvr' => [ ['category', 'category'], ['variable', 'name'] ],
+ 'deftypefn' => [ ['category', 'category'], ['type', 'type'], ['function',
'name'] ],
+ 'deftypeop' => [ ['category', 'category'], ['type', 'type'], ['operation',
'name'] ],
+ 'deftypevr' => [ ['category', 'category'], ['type', 'type'], ['variable',
'name'] ],
+ 'defcv' => [ ['category' , 'category'], ['class', 'class'], ['classvar',
'name'] ],
+ 'deftypecv' => [ ['category', 'category'], ['type', 'type'], ['classvar',
'name'] ],
+ 'defop' => [ ['category', 'category'], ['class', 'class'], ['operation',
'name'] ],
+ 'deftp' => [ ['category', 'category'], ['datatype', 'name'] ]
+);
+
+
+}
+
+sub xml_macron($$)
+{
+ my $accent = shift;
+ my $args = shift;
+ return $args->[0] . "¯";
+}
+
+sub xml_email($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $mail = shift @$args;
+ my $text = shift @$args;
+ $mail = main::normalise_space($mail);
+ my $result = "<email><emailaddress>$mail</emailaddress>";
+ if (defined($text) and $text =~ /\S/)
+ {
+ $result .= "<emailname>".main::normalise_space($text)."</emailname>";
+ }
+ return $result . '</email>';
+}
+
+sub xml_uref($$)
+{
+ shift;
+ my $args = shift;
+ my $url = shift @$args;
+ my $text = shift @$args;
+ my $replacement = shift @$args;
+ $url = main::normalise_space($url);
+ $replacement = '' if (!defined($replacement));
+ $replacement = main::normalise_space($replacement);
+ $text = '' if (!defined($text));
+ $text = main::normalise_space($text);
+ my $result = "<uref><urefurl>$url</urefurl>";
+ $result .= "<urefdesc>$text</urefdesc>" if ($text ne '');
+ $result .= "<urefreplacement>$replacement</urefreplacement>" if
($replacement ne '');
+ return $result.'</uref>';
+}
+
+
+sub xml_titlefont($$)
+{
+ shift;
+ my $args = shift;
+ return "<titlefont>$args->[0]</titlefont>";
+}
+
+sub xml_math($$)
+{
+ shift;
+ my $args = shift;
+ my $text = shift @$args;
+ return "<math>$text</math>";
+}
+
+
+sub xml_menu_description($$$)
+{
+ my $text = shift;
+ my $state = shift;
+ my $element_text = shift;
+ return "<menucomment>$text</menucomment>\n</menuentry>";
+}
+
+sub xml_menu_link($$$$$$$$$$)
+{
+ my $entry = shift;
+ my $state = shift;
+ my $href = shift;
+ my $menunode = shift;
+ my $menutitle = shift;
+ my $ending = shift;
+ my $has_title = shift;
+ my $command_stack = shift;
+ my $in_preformatted = shift;
+ my $menunode_normalized = shift;
+
+ return
"<menuentry>\n<menunode>$menunode_normalized</menunode>\n<menutitle>$menutitle</menutitle>\n";
+}
+
+sub xml_print_page_head($)
+{
+ my $fh = shift;
+ my $setfilename = '';
+ $setfilename =
"<setfilename>$Texi2HTML::THISDOC{'file_base_name'}.".get_conf('EXTENSION')."</setfilename>"
+ unless (defined(get_conf('setfilename')) and get_conf('setfilename')
ne '');
+ my $language = get_conf('documentlanguage');
+ my $doctype = get_conf('DOCTYPE');
+ print $fh <<EOT;
+<?xml version="1.0"?>
+$doctype
+<texinfo xml:lang="$language">
+$setfilename
+EOT
+}
+
+sub xml_print_page_foot($)
+{
+ my $fh = shift;
+ print $fh "". xml_close_section();
+ print $fh <<EOT;
+</texinfo>
+EOT
+}
+
+sub xml_one_section($$)
+{
+ my $fh = shift;
+ my $element = shift;
+ main::print_lines($fh);
+ #print $fh "". xml_footing($element);
+ &$print_foot_navigation($fh);
+ &$print_page_foot($fh);
+}
+
+sub xml_heading($$$$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+
+#print STDERR "'$command' $line";
+ if (defined($command) and $command =~ /heading/)
+ {
+ my $text = '';
+ if (defined($line))
+ {
+ $text = $line;
+ # this isn't done in main program in that case...
+ chomp ($text);
+ $text =~ s/^\s*//;
+ }
+ return "<${command}>$text</${command}>\n";
+ }
+ elsif (defined($command) and $command eq 'node')
+ {
+#print STDERR "node $command $node_element->{'texi'}\n";
+ my $result = '';
+ $result .= xml_close_section();
+ $result .= "<node>\n";
+ $result .= "<nodename>$element->{'text'}</nodename>\n";
+ foreach my $direction('nodenext', 'nodeprev', 'nodeup')
+ {
+ if ($element->{$direction})
+ {
+ $result .=
"<${direction}>$element->{$direction}->{'text'}</${direction}>\n";
+ }
+ }
+ $result .= "</node>\n";
+ return $result;
+
+ }
+ else
+ {
+ my $result = '';
+ $result .= xml_close_section();
+ $result .=
"<".xml_element_tag($element).">\n<title>$element->{'text'}</title>\n";
+ $xml_current_section = $element;
+ return $result;
+ }
+}
+
+sub xml_element_tag($)
+{
+ my $element = shift;
+ my $class = $element->{'tag_level'};
+ return $class;
+}
+
+sub xml_close_section()
+{
+ my $element = $xml_current_section;
+
+ if (!defined($element))
+ {
+ return '';
+ }
+ my $result = '';
+
+ $xml_current_section = undef;
+
+ # there is a special case for a @chapter that is a child of @top
+ # but should not be considered as is, since it is also toplevel.
+ # @part, however may have other toplevel elements as children.
+ return '' if ($element->{'child'} and (!$element->{'child'}->{'toplevel'}
or $element->{'tag'} ne 'top'));
+ $result .= '</'.xml_element_tag($element).">\n";
+
+ my $current = $element;
+ # the second condition is such that top is closed only if it has
+ # sub-elements below chapter.
+ # the third condition is such that elements with a next element are
+ # only closed for the last element, except when the next element is
+ # toplevel and below top, such that @top is closed before the first
+ # @chapter if there are @section or the like below @top
+ while ($current->{'sectionup'} and !($current->{'sectionup'}->{'tag'} eq
'top' and $current->{'toplevel'}) and (!$current->{'childnext'} or
($current->{'childnext'}->{'toplevel'} and $current->{'sectionup'}->{'tag'} eq
'top')))
+ {
+ $current = $current->{'sectionup'};
+ $result .= '</'.xml_element_tag($current).">\n";
+ }
+ return $result;
+
+ ## there is a special case for a @chapter that is a child of @top
+ ## but should not be considered as is, since it is also toplevel.
+ #return '' if ($element->{'child'} and !$element->{'child'}->{'toplevel'});
+ #$result .= '</'.xml_element_tag($element).">\n";
+
+ #return $result if ($element->{'sectionnext'} or $element->{'level'} <= 1);
+ #my $current = $element;
+ #while ($current->{'level'} != 1 and $current->{'sectionup'} and
!$current->{'sectionnext'})
+ #{
+ # $current = $current->{'sectionup'};
+ # $result .= '</'.xml_element_tag($current).">\n";
+ #}
+ #return $result;
+}
+
+sub xml_end_section($$$)
+{
+ my $fh = shift;
+ my $end_foot_navigation = shift;
+ my $element = shift;
+}
+
+sub xml_print_Top($$$)
+{
+ my $fh = shift;
+ my $has_top_heading = shift;
+ my $element = shift;
+ main::print_lines($fh, $Texi2HTML::THIS_SECTION);
+}
+
+sub xml_print_Top_footer($$)
+{
+ my $fh = shift;
+ my $end_page = shift;
+ my $element = shift;
+}
+
+# FIXME warning:
+#
+# @samp{first para
+#
+# second para}.
+#
+# maybe should lead to:
+# <para><samp>first para second para</samp>.</para>
+#
+# But it leads to
+# <para><samp>first para
+# </samp></para>
+# <para><samp>second para</samp>.
+# </para>
+sub xml_paragraph($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $align = shift;
+ my $indent = shift;
+ my $paragraph_command = shift;
+ my $paragraph_command_formatted = shift;
+ my $paragraph_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+ # no para in multitables, caption and shortcaptions.
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+ return $text if ($top_stack eq 'multitable' or $top_stack eq
'shortcaption' or $top_stack eq 'caption' or $top_stack eq
'documentdescription');
+
+ if ($text =~ /\S/)
+ {
+ return "<para>$text</para>";
+ }
+ return $text;
+}
+
+sub xml_preformatted($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $pre_style = shift;
+ my $class = shift;
+ my $leading_command = shift;
+ my $leading_command_formatted = shift;
+ my $preformatted_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+ return $text;
+}
+
+sub xml_misc_commands($$$$$)
+{
+ my $macro = shift;
+ my $line = shift;
+ my $args = shift;
+ my $stack = shift;
+ my $state = shift;
+
+#print STDERR "$macro $line";
+#print STDERR "ARGS @$args\n" if defined ($args);
+ return ($macro, $line, undef) unless($xml_misc_command_output{$macro});
+
+ my $value_name = '';
+ my $value = '';
+ if ($macro eq 'set' or $macro eq 'clear')
+ {
+ my $value_line = $line;
+ if ($value_line =~ s/^\s+([\w\-]+)//)
+ {
+ $value_name = $1;
+ if ($macro eq 'set')
+ {
+ $value = $value_line;
+ chomp ($value);
+ $value =~ s/^\s*//;
+ }
+ }
+ }
+ my $result_text = "<${macro}></${macro}>";
+ if ($macro eq 'set' or $macro eq 'clear')
+ {
+ $result_text = "<${macro}value
name=\"$value_name\">$value</${macro}value>\n";
+ }
+ if ($macro eq 'c' or $macro eq 'comment' and scalar(@$args))
+ {
+ my $comment_line = $args->[0];
+ chomp ($comment_line);
+ # makeinfo remove all the leading spaces
+ $comment_line =~ s/^\s//;
+ $result_text = &$comment ($comment_line);
+ }
+ if ($macro eq 'frenchspacing')
+ {
+ my $value = $args->[0];
+ $value =~ s/\s*//g;
+ $result_text = "<${macro} var=\"$value\"></${macro}>";
+ }
+ if (grep {$macro eq $_} @xml_misc_elements_with_arg)
+ {
+ my $arg = $args->[0];
+ $arg =~ s/^\s*//;
+ chomp($arg);
+ $result_text = "<${macro}>".main::substitute_line($arg,
"address@hidden")."</${macro}>\n";
+ }
+ if (exists($xml_misc_elements_with_arg_map{$macro}))
+ {
+ my $arg = $args->[0];
+ $arg =~ s/^\s*//;
+ chomp($arg);
+ $result_text =
"<$xml_misc_elements_with_arg_map{$macro}>".main::substitute_line($arg,
"address@hidden")."</$xml_misc_elements_with_arg_map{$macro}>\n";
+ }
+ if ($macro eq 'setfilename')
+ {
+ my $arg = $args->[0];
+ #$arg =~ s/^\s*//;
+ #$arg =~ s/\s*$//;
+ #$arg = main::substitute_line($arg, "address@hidden");
+ if ($arg =~ /\S/)
+ {
+ $arg = get_conf('setfilename');
+ $arg =~ s/\.[^\.]*$//;
+ $result_text = "<${macro}>${arg}.xml</${macro}>\n";
+ }
+ }
+ return ($macro, $line, $result_text);
+}
+
+
+sub xml_anchor_label($$)
+{
+ my $id = shift;
+ my $anchor_text = shift;
+ return '<anchor name="'. &$protect_text($anchor_text) . '"></anchor>';
+}
+
+sub xml_index_entry_command($$$$$)
+{
+ my $command = shift;
+ my $index_name = shift;
+ my $label = shift;
+ my $entry_texi = shift;
+ my $entry_formatted = shift;
+
+ return $label if (defined($label) and $label ne '');
+ return
xml_index_entry_label('','','',$main::index_prefix_to_name{$index_name}, '',
'', $entry_formatted, {});
+}
+
+sub xml_index_entry_label($$$$$$$$$)
+{
+ my $identifier = shift;
+ my $preformatted = shift;
+ my $formatted_entry = shift;
+ my $index_name = shift;
+ my $index_command = shift;
+ my $texi_entry = shift;
+ my $formatted_entry_reference = shift;
+ my $in_region_not_in_output = shift;
+ my $index_entry_ref = shift;
+
+
+ return "<indexterm
index=\"${index_name}\">${formatted_entry_reference}</indexterm>";
+}
+
+sub xml_listoffloats($$$)
+{
+ my $style_texi = shift;
+ my $style = shift;
+ my $float_entries = shift;
+ # FIXME style, style_texi? Protected?
+ return "<listoffloats type=\"$style\"></listoffloats>";
+}
+
+sub xml_acronym_like($$$$$$)
+{
+ my $command = shift;
+ my $acronym_texi = shift;
+ my $acronym_text = shift;
+ my $with_explanation = shift;
+ my $explanation_lines = shift;
+ my $explanation_text = shift;
+ my $explanation_simply_formatted = shift;
+
+ $command = 'abbrev' if ($command eq 'abbr');
+ my $opening = "<${command}><${command}word>$acronym_text</${command}word>";
+ if ($with_explanation)
+ {
+ $opening .= "<${command}desc>$explanation_text</${command}desc>";
+ }
+ return $opening . "</${command}>";
+}
+
+sub xml_foot_line_and_ref($$$$$$$)
+{
+ my $number_in_doc = shift;
+ my $number_in_page = shift;
+ my $footnote_id = shift;
+ my $place_id = shift;
+ my $document_file = shift;
+ my $footnote_file = shift;
+ my $lines = shift;
+ my $state = shift;
+
+ my $result = '<footnote>';
+ foreach my $line (@$lines)
+ {
+ $result .= $line;
+ }
+ return ([], $result . '</footnote>');
+}
+
+sub xml_image($$$$$$$$$$$$$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ my $file_name = shift;
+ my $alt = shift;
+ my $width = shift;
+ my $height = shift;
+ my $raw_alt = shift;
+ my $extension = shift;
+ my $working_dir = shift;
+ my $file_path = shift;
+ my $in_paragraph = shift;
+ my $file_locations = shift;
+
+ $alt = '' if (!defined($alt));
+ # dirty hack to avoid " that can be here because of a @verb
+ $alt =~ s/"/"/g;
+
+ $width = '' if (!defined($width));
+ $height = '' if (!defined($height));
+
+ my $tag = 'inlineimage';
+ $tag = 'image' if ($preformatted or !$in_paragraph);
+
+ return "<$tag width=\"$width\" height=\"$height\" name=\"".
&$protect_text($base)."\"
extension=\"$extension\"><alttext>$alt</alttext></$tag>";
+}
+
+sub xml_sp($$)
+{
+ my $number = shift;
+ my $preformatted = shift;
+ return "<sp lines=\"$number\"></sp>\n";
+}
+
+sub xml_quotation($$$$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $argument_text = shift;
+ my $argument_text_texi = shift;
+ my $authors = shift;
+ return "<$command>\n" . $text . "</$command>\n";
+}
+
+sub xml_format_list_item_texi($$$$)
+{
+ my $format = shift;
+ my $line = shift;
+ my $prepended = shift;
+ my $command = shift;
+
+ my $result_line = undef;
+
+ if (defined($command) and $command ne '' and !exists
$special_list_commands{$format}->{$command} and $format ne 'itemize')
+ {
+ address@hidden
+ $line =~ s/^\s*//;
+ $line =~ s/\s*$//;
+ if (exists ($style_map{$command}))
+ {
+ $result_line = "address@hidden";
+ }
+ elsif (exists ($things_map{$command}))
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ else
+ {
+ $result_line = "address@hidden $line\n";
+ }
+ }
+
+ return ($result_line, 0);
+}
+
+sub xml_list_item($$$$$$$$$)
+{
+ my $text = shift;
+ my $format = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+
+ return '<item>' . $text . "</item>\n";
+}
+
+sub xml_init_variables()
+{
+ @xml_multitable_stack = ();
+ @xml_table_stack = ();
+ $xml_current_section = undef;
+}
+
+# row in multitable
+sub xml_row($$;$$)
+{
+ my $text = shift;
+ my $macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+
+ my $result = '';
+ if ($macro eq 'headitem')
+ {
+ if ($xml_multitable_stack[-1] != 0)
+ {
+ $result .= "<thead>";
+ $result = "</tbody>" . $result if ($xml_multitable_stack[-1] ==
1);
+ $xml_multitable_stack[-1] = 0;
+ }
+ }
+ elsif ($xml_multitable_stack[-1] != 1)
+ {
+ $result .= "<tbody>";
+ $result = "</thead>" . $result if ($xml_multitable_stack[-1] == 0);
+ $xml_multitable_stack[-1] = 1;
+ }
+ $result .= "<row>$text</row>";
+
+ return $result;
+}
+
+# cell in multitable
+sub xml_cell($$;$$)
+{
+ my $text = shift;
+ my $row_macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+
+ return "<entry>" . $text . '</entry>';
+}
+
+sub xml_table_list($$$$$$$$$)
+{
+ my $format_command = shift;
+ my $text = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+# enumerate
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+# itemize
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+# multitable
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $number = shift;
+
+ my $result = "<$format_command>";
+ if ($format_command eq 'itemize')
+ {
+ my $itemfunction;
+ $prepended_formatted =~ s/^\s*// if (defined($prepended_formatted));
+ if (defined($formatted_command) and $formatted_command ne '')
+ {
+ $itemfunction = $formatted_command;
+ $itemfunction .= " $prepended_formatted" if
(defined($prepended_formatted) and $prepended_formatted ne '');
+ }
+ elsif (defined($prepended_formatted))
+ {
+ $itemfunction = $prepended_formatted;
+ }
+ $itemfunction = "•" if (!defined($itemfunction) or
+ $itemfunction eq '');
+ $result .= "<itemfunction>$itemfunction</itemfunction>";
+ }
+ elsif ($format_command eq 'enumerate')
+ {
+ $result = "<$format_command first=\"$enumerate_style\">";
+ }
+ elsif ($format_command eq 'multitable')
+ {
+ my $fractions;
+ my $multiply = 1;
+ if (defined($columnfractions) and (ref($columnfractions) eq 'ARRAY')
+ and scalar(@$columnfractions))
+ {
+ $fractions = [ @$columnfractions ];
+ $multiply = 100;
+ }
+ elsif (defined($prototype_lengths) and (ref($prototype_lengths) eq
'ARRAY')
+ and scalar(@$prototype_lengths))
+ {
+ $fractions = [ @$prototype_lengths ];
+ }
+
+ if (defined ($fractions))
+ {
+ foreach my $fraction (@$fractions)
+ {
+ $result .=
"<columnfraction>".($fraction*$multiply)."</columnfraction>\n";
+ }
+ }
+ $text .= "</tbody>" if ($xml_multitable_stack[-1] == 1);
+ $text .= "</thead>" if ($xml_multitable_stack[-1] == 0);
+ pop @xml_multitable_stack;
+ }
+ elsif ($format_command =~ /^(v|f)?table$/)
+ {
+ $result = '<table>';
+ $text .= '</tableitem>' if ($xml_table_stack[-1] == 1);
+ pop @xml_table_stack;
+ return $result . "$text</table>\n";
+ }
+ return $result . "$text</$format_command>\n";
+}
+
+sub xml_begin_format_texi($$$)
+{
+ my $command = shift;
+ my $line = shift;
+ my $state = shift;
+
+ push (@xml_multitable_stack, -1) if ($command eq 'multitable');
+ push (@xml_table_stack, 0) if ($command =~ /^(v|f)?table/);
+ return $line;
+}
+
+sub xml_def_line($$$$$$$$$$$$$$$)
+{
+ my $category_prepared = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ my $index_label = shift;
+ my $arguments_array = shift;
+ my $arguments_type_array = shift;
+ my $unformatted_arguments_array = shift;
+ my $command = shift;
+ my $class_name = shift;
+ my $category = shift;
+ my $class = shift;
+ my $style = shift;
+ my $original_command = shift;
+
+ my $result = "<definitionterm><indexterm index=\""
+ .$main::index_prefix_to_name{$style}."\">$class_name</indexterm>";
+
+ my %arguments = ( 'prepared_category' => $category_prepared,
+ 'category' => $category,
+ 'name' => $name,
+ 'type' => $type,
+ 'class' => $class
+ );
+ foreach my $type (keys(%arguments))
+ {
+ $arguments{$type} = '' if (!defined($arguments{$type}));
+ }
+
+ foreach my $mandatory_arg (@{$def_format_xml{$command}})
+ {
+ my $elem = $mandatory_arg->[0];
+ $result .= "<def$elem>$arguments{$mandatory_arg->[1]}</def$elem>";
+ }
+
+ my $params = '';
+ my @types = @$arguments_type_array;
+ foreach my $arg (@$arguments_array)
+ {
+ my $type = shift @types;
+ if (grep {$_ eq $type} ('param', 'paramtype', 'delimiter'))
+ {
+ $result .= "<def$type>$arg</def$type>";
+ }
+ }
+
+ $result .= "</definitionterm>\n";
+ return $result;
+}
+
+# FIXME
+# @deffn
+# @c comment
+# @end deffn
+# leads to the creation of a <definitionitem> with a comment within,
+# while there should be no definitionitem
+sub xml_def_item($$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+
+ if ($text =~ /\S/)
+ {
+ return '<definitionitem>' . $text . '</definitionitem>' unless
$only_inter_item_commands;
+ return $text;
+ }
+ return '';
+}
+
+sub xml_def($)
+{
+ my $text = shift;
+ return '<definition>'.$text.'</definition>';
+}
+
+sub xml_index_summary($$)
+{
+ my $alpha = shift;
+ my $nonalpha = shift;
+ return '';
+}
+
+sub xml_printindex($$)
+{
+ my $name = shift;
+ my $printindex = shift;
+ return "<printindex>$name</printindex>\n";
+}
+
+sub xml_any_ref($$)
+{
+ my $type = shift;
+ my $args = shift;
+ my $result = '';
+ if ($type eq 'pxref')
+ {
+ $result = gdt('see ',{'duplicate'=>1});
+ }
+ elsif ($type eq 'xref' or $type eq 'inforef')
+ {
+ $result = gdt('See ',{'duplicate'=>1});
+ }
+ if ($type eq 'inforef')
+ {
+ $result .= "<inforef><inforefnodename>$args->[0]</inforefnodename>";
+ $result .= "<inforefrefname>$args->[1]</inforefrefname>" if
($args->[1] ne '');
+ $result .= "<inforefinfoname>$args->[2]</inforefinfoname></inforef>"
+ }
+ else
+ {
+ $result .= "<xref><xrefnodename>$args->[0]</xrefnodename>";
+ $result .= "<xrefinfoname>$args->[1]</xrefinfoname>" if ($args->[1] ne
'');
+ $result .= "<xrefprinteddesc>$args->[2]</xrefprinteddesc>" if
($args->[2] ne '');
+ $result .= "<xrefinfofile>$args->[3]</xrefinfofile>" if ($args->[3] ne
'');
+ $result .= "<xrefprintedname>$args->[4]</xrefprintedname>" if
($args->[4] ne '');
+ $result .= '</xref>';
+ }
+ return $result;
+}
+
+sub xml_external_ref($$$$$$$$$)
+{
+ my $type = shift;
+ my $section = shift;
+ my $book = shift;
+ my $file = shift;
+ my $href = shift;
+ my $cross_ref = shift;
+ my $args_texi = shift;
+ my $formatted_args = shift;
+ my $node = shift;
+
+ return xml_any_ref ($type, $formatted_args);
+}
+
+sub xml_internal_ref($$$$$)
+{
+ my $type = shift;
+ my $href = shift;
+ my $short_name = shift;
+ my $name = shift;
+ my $is_section = shift;
+ my $args_texi = shift;
+ my $formatted_args = shift;
+
+ return xml_any_ref ($type, $formatted_args);
+}
+
+sub xml_table_item($$$$$$$)
+{
+ my $text = shift;
+ my $index_label = shift;
+ my $format = shift;
+ my $command = shift;
+# my $formatted_command = shift;
+ my $style_stack = shift;
+# my $text_formatted = shift;
+# my $text_formatted_leading_spaces = shift;
+# my $text_formatted_trailing_spaces = shift;
+ my $item_cmd = shift;
+ my $formatted_index_entry = shift;
+
+
+# $formatted_command = '' if (!defined($formatted_command));
+#
+# if (defined($text_formatted))
+# {
+# $text_item = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
+# }
+# else
+# {
+# $text_item = $text;
+# }
+
+ my $result = '';
+ if ($item_cmd eq 'item')
+ {
+ $result .= '</tableitem>' if ($xml_table_stack[-1] == 1);
+ $xml_table_stack[-1] = 1;
+ $result .= '<tableitem>';
+ }
+ $result .= '<tableterm>';
+ #print STDERR "$text | $format | $command | $formatted_command |
$text_formatted | $item_cmd \n";
+ my $indexterm = '';
+#print STDERR "FFFFFFFFFFFFFFFFf `$index_label' `$text'\n";
+ if ($format =~ /^(v|f)/)
+ {
+# my $index_prefix = $1;
+# $indexterm = $text;
+# $indexterm =~ s/^\s*//;
+# $result .= "<indexterm
index=\"$main::index_prefix_to_name{$index_prefix}\">$formatted_index_entry</indexterm>";
+ $result .= "$index_label";
+ }
+ $result .= $text ."</tableterm>\n";
+ return $result;
+}
+
+sub xml_table_line($)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ if ($text =~ /\S/)
+ {
+ return "<item>$text</item>" unless $only_inter_item_commands;
+ return $text;
+ }
+ else
+ {
+ return '';
+ }
+}
+
+sub xml_caption_shortcaption($)
+{
+ my $float = shift;
+ my $caption_lines;
+ my $shortcaption_lines;
+ if (defined($float->{'caption_texi'}))
+ {
+ @$caption_lines = @{$float->{'caption_texi'}};
+ }
+ if (defined($float->{'shortcaption_texi'}))
+ {
+ @$shortcaption_lines = @{$float->{'shortcaption_texi'}};
+ }
+ return ($caption_lines, $shortcaption_lines);
+}
+
+sub xml_caption_shortcaption_command($$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $texi_lines = shift;
+ my $float_element = shift;
+
+ if ($text =~ /\S/)
+ {
+ return "<$command>$text</$command>";
+ }
+ return '';
+}
+
+sub xml_float($$$$$)
+{
+ my $text = shift;
+ my $float = shift;
+ my $caption = shift;
+ my $shortcaption = shift;
+
+ # FIXME don't use the texi, but a normalized node name
+ my $label_texi = $float->{'texi'};
+ $label_texi = '' if (!defined($label_texi));
+ my $result = "<float name=\"$label_texi\">\n";
+ my $style = $float->{'style'};
+ $style = '' if (!defined($style));
+ $result .= "<floattype>$style</floattype>\n";
+ $result .= "<floatpos></floatpos>\n";
+ $result .= $text;
+ return $result."</float>\n";
+}
+
+sub xml_normal_text($$$$$$$;$)
+{
+ my $text = shift;
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+#print STDERR "Bug: in_raw_text in_simple $text\n" if ($in_raw_text and
$in_simple);
+ my $style_stack = shift;
+ my $state = shift;
+
+ $text = &$protect_text($text) unless($in_raw_text);
+
+ if (! $in_code and !$in_preformatted and !$in_raw_text)
+ {
+ $text =~ s/---/\&mdash\;/g;
+ $text =~ s/--/\&ndash\;/g;
+ $text =~ s/``/\&ldquo\;/g;
+ $text =~ s/''/\&rdquo\;/g;
+ }
+ return $text;
+}
+
+sub xml_paragraph_style_command($$)
+{
+ my $format = shift;
+ my $text = shift;
+ return "<$format>$text</$format>" if ($format eq 'center');
+ return $text;
+}
+
+sub xml_raw($$)
+{
+ my $style = shift;
+ my $text = shift;
+
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude')
+ {
+ return '<verbatim xml:space="preserve">' . &$protect_text($text) .
'</verbatim>';
+ }
+ return '' unless (grep {$style eq $_} @EXPAND);
+ if ($style eq 'xml')
+ {
+ chomp ($text);
+ return $text;
+ }
+ else
+ {
+ main::msg_warn ("Raw style $style not handled",
$Texi2HTML::THISDOC{'line_nr'});
+ return &$protect_text($text);
+ }
+}
+
+sub xml_cartouche($$)
+{
+ my $text = shift;
+
+ return "<cartouche>$text</cartouche>";
+}
+
+sub xml_noop
+{
+ return '';
+}
+
+1;
Index: texi2html/maintained_extra/book.pm
===================================================================
RCS file: texi2html/maintained_extra/book.pm
diff -N texi2html/maintained_extra/book.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/maintained_extra/book.pm 9 Apr 2011 00:10:45 -0000 1.1
@@ -0,0 +1,208 @@
+# A style that tries to be analogous with a book, in HTML.
+#
+# This file is in the public domain. Thus it may easily be used as an
+# example for further customizations.
+#
+# Originally written by Patrice Dumas in 2004.
+# Modified in 2007, 2008.
+#
+# This style is based on the scriptbasic style.
+
+#html_default_load();
+t2h_default_load_format('html');
+
+set_default('contents', 1);
+
+set_default('INLINE_CONTENTS', 1);
+set_default('USE_TITLEPAGE_FOR_TITLE', 1);
+
address@hidden =
+ (
+ 'Back', 'Forward', ' ', 'Contents', 'Index', 'About'
+ );
+
address@hidden = @SECTION_BUTTONS;
address@hidden = @SECTION_BUTTONS;
+
address@hidden = ('Contents', 'Index', 'About');
address@hidden = @SECTION_FOOTER_BUTTONS;
+
address@hidden = ('Back', 'Forward');
+
+set_default('WORDS_IN_PAGE', undef);
+set_default('SHOW_MENU', 0);
+
+$BIG_RULE = '<hr>';
+
+#FIXME lift that constraint once it is better supported
+set_default('USE_SECTIONS', 1);
+set_default('USE_NODES', undef);
+
+push @command_handler_init, \&book_initialize_variables;
+
+sub book_print_sub_toc($$);
+
+sub book_print_sub_toc($$)
+{
+ my $parent_element = shift;
+ my $element = shift;
+ my $result = "<li> ".&$anchor('', main::href($element,
$parent_element->{'file'}), $element->{'text'}) . " </li>\n";
+#print STDERR "SUB_TOC $element->{'text'}\n"; #sleep 1;
+ if (exists($element->{'child'}))
+ {
+#print STDERR "SUB_TOC child $element->{'child'}->{'text'}\n";
+ $result .=
'<li>'.html_default_attribute_class('ul',$NO_BULLET_LIST_CLASS).">\n".
book_print_sub_toc($parent_element, $element->{'child'}) ."</ul></li>\n";
+ }
+ if (exists($element->{'sectionnext'}))
+ {
+#print STDERR "SUB_TOC next($element->{'text'})
$element->{'next'}->{'text'}\n";
+ $result .= book_print_sub_toc($parent_element,
$element->{'sectionnext'});
+ }
+ return $result;
+}
+
+sub book_print_up_toc($)
+{
+ my $element = shift;
+
+ my $result = '';
+ my $current_element = $element;
+ my @elements;
+ while (defined($current_element->{'sectionup'}) and
($current_element->{'sectionup'} ne $current_element))
+ {
+ unshift (@elements, $current_element->{'sectionup'});
+ $current_element = $current_element->{'sectionup'};
+ }
+ # this happens for example for top element
+ return '' if !(@elements);
+ #print $fh "<ul>" . &$anchor('', $Texi2HTML::HREF{Contents}, '[' .
$Texi2HTML::NAME{Contents} . ']') . " <br>\n";
+ my $elem = shift @elements;
+ $result .= html_default_attribute_class('ul',
$NO_BULLET_LIST_CLASS)."><li>" . &$anchor('', main::href($elem,
$element->{'file'}), $elem->{'text'}) . " </li>\n";
+ foreach my $elem (@elements)
+ {
+ $result .= '<li>'.html_default_attribute_class('ul',
$NO_BULLET_LIST_CLASS)."><li>" . &$anchor('', main::href($elem,
$element->{'file'}), $elem->{'text'}) . " </li>\n";
+ }
+ foreach my $elem (@elements)
+ {
+ $result .= "</ul></li>\n";
+ }
+ $result .= "</ul>\n";
+}
+
+$print_head_navigation = \&book_print_head_navigation;
+
+sub book_print_head_navigation($$)
+{
+ my $fh = shift;
+ my $buttons = shift;
+ my $first_in_page = shift;
+ my $previous_is_top = shift;
+ my $element = shift;
+
+ if (defined($element) and $first_in_page)
+ {
+ return book_print_up_toc($Texi2HTML::THIS_ELEMENT) .
+ HTML_DEFAULT_print_head_navigation($fh, $buttons, $first_in_page,
$previous_is_top, $element);
+ }
+ return HTML_DEFAULT_print_head_navigation($fh, $buttons, $first_in_page,
$previous_is_top, $element);
+}
+
+my $unumbered_nr;
+my $previous_nr;
+my $previous_file_name;
+
+sub book_initialize_variables()
+{
+ $unumbered_nr = -1;
+ $previous_nr = undef;
+ $previous_file_name = undef;
+}
+
+$element_file_name = \&book_element_file_name;
+
+sub book_element_file_name($$$)
+{
+ my $element = shift;
+ my $type = shift;
+ my $prefix = shift;
+
+ return undef if (get_conf('NODE_FILENAMES') or !get_conf('SPLIT'));
+ return undef if (!defined($element));
+
+ if (defined($previous_nr) and ($element->{'doc_nr'} == $previous_nr))
+ {
+ return $previous_file_name;
+ }
+ if ($type eq 'top')
+ {
+ $previous_file_name = "${prefix}_top.html";
+ }
+ elsif (defined($element->{'plain_number'}) and ($element->{'plain_number'}
ne ''))
+ {
+ my $number = $element->{'plain_number'};
+ $number .= '.' unless ($number =~ /\.$/);
+ $previous_file_name = "${prefix}_$number" . 'html';
+ }
+ else
+ {
+ $unumbered_nr++;
+ $previous_file_name = "${prefix}_U." . $unumbered_nr . '.html';
+ }
+ $previous_nr = $element->{'doc_nr'};
+ return $previous_file_name;
+}
+
+$heading = \&book_heading;
+
+sub book_heading($$$$$$;$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+ my $one_section = shift;
+ my $element_heading = shift;
+
+ my $level = 3;
+
+ if (!$element->{'node'})
+ {
+ $level = $element->{'level'};
+ }
+ else
+ {
+ return '' unless ($element->{'this'} and !$element->{'with_section'});
+ }
+ my $text = $element->{'text'};
+ my $class = $element->{'tag_level'};
+ $class = 'node' if ($element->{'node'});
+ my $result = '';
+
+ if (get_conf('TOC_LINKS') and $command !~ /heading/ and
defined($element->{'tocid'}))
+ {
+ $text = &$anchor ('',
"$Texi2HTML::THISDOC{'toc_file'}#$element->{'tocid'}", $text);
+ }
+ if (!$in_preformatted)
+ {
+ $result = &$heading_text("address@hidden", $text, $level);
+ }
+ else
+ {
+ $result = &$heading_text_preformatted("address@hidden", $text, $level);
+ }
+ # @top should already have a table of contents, either because there
+ # is a @contents, or setcontentsaftertitlepage is set.
+ # In any case it would just be a duplication
+ # of the table of contents, better let the user decide where it should be.
+ if (exists($element->{'child'})
+ and ($element->{'tag_level'} !~ /heading/) and $element->{'tag'} ne
'top')
+ {
+ $result .=
html_default_attribute_class('ul',$NO_BULLET_LIST_CLASS).">\n";
+ $result .= "" . book_print_sub_toc($element, $element->{'child'});
+ $result .= "</ul>\n";
+ }
+ return $result;
+}
+
+1;
Index: texi2html/maintained_extra/chm.pm
===================================================================
RCS file: texi2html/maintained_extra/chm.pm
diff -N texi2html/maintained_extra/chm.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/maintained_extra/chm.pm 9 Apr 2011 00:10:45 -0000 1.1
@@ -0,0 +1,444 @@
+# -*-perl-*-
+
+#+##############################################################################
+#
+# chm.pm: convert to chm intermediate formats hhp, hhc, hhk and html files
+#
+# Copyright (C) 2004, 2006, 2009 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+use strict;
+
+#html_default_load();
+t2h_default_load_format('html');
+
+set_default('TOP_NODE_FILE', undef);
+set_default('TOP_FILE', undef);
+
+#$SECTION_NAVIGATION = 0; # to avoid headers in normal elements
+set_default('SHOW_MENU', 0);
+set_default('SPLIT', 'node');
+set_default('contents', 1);
+set_default('SPLIT_INDEX', undef);
+set_default('IDX_SUMMARY', 1);
+
+$SMALL_RULE = '';
+$DEFAULT_RULE = '';
+$MIDDLE_RULE = '';
+$BIG_RULE = '';
+
+# FIXME why was documentdescription set?
+#set_from_init_file('documentdescription', '');
+set_default('footnotestyle', 'end');
+
+#FIXME remove that later
+set_default('USE_SECTIONS', 1);
+
+push @command_handler_process, \&chm_initialize_variables;
+
+$index_summary_file_entry = \&chm_index_summary_file_entry;
+$index_summary_file_begin = \&chm_index_summary_file_begin;
+$index_summary_file_end = \&chm_index_summary_file_end;
+
+$print_page_foot = \&chm_print_page_foot;
+# no-ops to avoid headers and footers
+$print_head_navigation = \&chm_noop;
+#$print_Top_footer = \&chm_noop;
+$print_foot_navigation = \&chm_noop;
+
+my $default_toc_body = $toc_body;
+$toc_body = \&chm_toc_body;
+
+$finish_out = \&chm_finish_out;
+my $default_init_out = $init_out;
+
+$init_out = \&chm_init_out;
+
+my %chm_languages = (
+ 'en' => '0x409 English (United States)',
+ 'sq' => '0x041c Albanian',
+# 'ar' => '0x1401 Arabic (ALGERIA)',
+# 'es' => '0x2c0a Spanish (ARGENTINA)',
+# 'en' => '0x0c09 English (AUSTRALIA)',
+# 'de' => '0x0c07 German (AUSTRIA)',
+# 'ar' => '0x3c01 Arabic (BAHRAIN)',
+ 'be' => '0x0423 Byelorussian',
+# 'fr' => '0x080c French (BELGIUM)',
+# 'en' => '0x2809 English (BELIZE)',
+# 'es' => '0x400a Spanish (BOLIVIA)',
+# 'pt' => '0x0416 Portuguese (BRAZIL)',
+# 'ms' => '0x083e Malay (BRUNEI DARUSSALAM)',
+ 'bg' => '0x0402 Bulgarian',
+# 'fr' => '0x0c0c French (CANADA)',
+# 'es' => '0x340a Spanish (CHILE)',
+ 'zh' => '0x0804 Chinese (CHINA)',
+# 'es' => '0x240a Spanish (COLOMBIA)',
+# 'es' => '0x140a Spanish (COSTA RICA)',
+ 'hr' => '0x041a Croatian',
+ 'cs' => '0x0405 Czech',
+ 'da' => '0x0406 Danish',
+# 'es' => '0x1c0a Spanish (DOMINICAN REPUBLIC)',
+# 'es' => '0x300a Spanish (ECUADOR)',
+# 'ar' => '0x0c01 Arabic (EGYPT)',
+# 'es' => '0x440a Spanish (EL SALVADOR)',
+ 'et' => '0x0425 Estonian',
+ 'fo' => '0x0438 Faeroese',
+ 'fi' => '0x040b Finnish',
+ 'fr' => '0x040c French (FRANCE)',
+ 'de' => '0x0407 German (GERMANY)',
+ 'el' => '0x0408 Greek',
+# 'es' => '0x100a Spanish (GUATEMALA)',
+# 'es' => '0x480a Spanish (HONDURAS)',
+# 'zh' => '0x0c04 Chinese (HONG KONG)',
+ 'hu' => '0x040e Hungarian',
+ 'is' => '0x040f Icelandic',
+ 'hi' => '0x0439 Hindi',
+ 'in' => '0x04',
+ 'fa' => '0x0429 Farsi',
+# 'ar' => '0x0801 Arabic (IRAQ)',
+# 'en' => '0x1809 English (IRELAND)',
+ 'iw' => '0x04',
+ 'it' => '0x0410 Italian',
+# 'en' => '0x2009 English (JAMAICA)',
+ 'ja' => '0x0411 Japanese',
+# 'ar' => '0x2c01 Arabic (JORDAN)',
+ 'sw' => '0x0441 Swahili',
+ 'ko' => '0x0412 Korean',
+# 'ar' => '0x3401 Arabic (KUWAIT)',
+ 'al' => '0x0426 Latvian (Lettish)',
+# 'ar' => '0x3001 Arabic (LEBANON)',
+# 'ar' => '0x1001 Arabic (LIBYAN ARAB JAMAHIRIYA)',
+# 'de' => '0x1407 German (LIECHTENSTEIN)',
+ 'lt' => '0x0427 Lithuanian',
+# 'de' => '0x1007 German (LUXEMBOURG)',
+# 'zh' => '0x1404 Chinese (MACAU)',
+ 'mk' => '0x042f Macedonian',
+# 'ms' => '0x043e Malay (MALAYSIA)',
+# 'es' => '0x080a Spanish (MEXICO)',
+# 'fr' => '0x180c French (MONACO)',
+# 'ar' => '0x1801 Arabic (MOROCCO)',
+ 'nl' => '0x0413 Dutch',
+# 'en' => '0x1409 English (NEW ZEALAND)',
+# 'es' => '0x4c0a Spanish (NICARAGUA)',
+ 'no' => '0x0414 Norwegian',
+# 'ar' => '0x2001 Arabic (OMAN)',
+ 'ur' => '0x0420 Urdu',
+# 'es' => '0x180a Spanish (PANAMA)',
+# 'es' => '0x3c0a Spanish (PARAGUAY)',
+# 'es' => '0x280a Spanish (PERU)',
+# 'en' => '0x3409 English (PHILIPPINES)',
+ 'pl' => '0x0415 Polish',
+ 'pt' => '0x0816 Portuguese (PORTUGAL)',
+# 'es' => '0x500a Spanish (PUERTO RICO)',
+# 'ar' => '0x4001 Arabic (QATAR)',
+ 'ro' => '0x0418 Romanian',
+ 'ru' => '0x0419 Russian',
+ 'ar' => '0x0401 Arabic (SAUDI ARABIA)',
+# 'zh' => '0x1004 Chinese (SINGAPORE)',
+ 'sk' => '0x041b Slovak',
+ 'sl' => '0x0424 Slovenian',
+ 'af' => '0x0436 Afrikaans',
+ 'ca' => '0x0403 Catalan',
+ 'sv' => '0x041d Swedish',
+# 'de' => '0x0807 German (SWITZERLAND)',
+# 'ar' => '0x2801 Arabic (SYRIAN ARAB REPUBLIC)',
+# 'zh' => '0x0404 Chinese (TAIWAN, PROVINCE OF CHINA)',
+ 'th' => '0x041e Thai',
+# 'en' => '0x2c09 English (TRINIDAD AND TOBAGO)',
+# 'ar' => '0x1c01 Arabic (TUNISIA)',
+ 'tr' => '0x041f Turkish',
+ 'uk' => '0x0422 Ukrainian',
+# 'ar' => '0x3801 Arabic (UNITED ARAB EMIRATES)',
+# 'en' => '0x0809 English (UNITED KINGDOM)',
+# 'en' => '0x0409 English (UNITED STATES)',
+# 'es' => '0x380a Spanish (URUGUAY)',
+# 'es' => '0x200a Spanish (VENEZUELA)',
+ 'vi' => '0x242a Vietnamese',
+# 'ar' => '0x2401 Arabic (YEMEN)',
+# 'en' => '0x3009 English (ZIMBABWE)',
+ #'' => '',
+);
+
+my %hhk_global_property = (
+ 'ImageType' => 'Folder',
+);
+
+my %hhc_global_property = (
+ 'ImageType' => 'Folder',
+);
+
+
+######################################### not used
+#
+# if needed texi to unicode, maybe this could be in utf8.pm, but currently
+# no unicode
+my %chm_texi_map = %texi_map;
+my %chm_simple_map_texi = %simple_map_texi;
+my %chm_style_map_texi = ();
+
+foreach my $command (keys(%style_map_texi))
+{
+ $chm_style_map_texi{$command} = {};
+ foreach my $key (keys (%{$style_map_texi{$command}}))
+ {
+#print STDERR "$command, $key, $style_map_texi{$command}->{$key}\n";
+ $chm_style_map_texi{$command}->{$key} =
+ $style_map_texi{$command}->{$key};
+ }
+}
+
+foreach my $key (keys(%unicode_accents))
+{
+# $chm_style_map{$key}->{'function'} = \&t2h_utf8_accent;
+ $chm_style_map_texi{$key}->{'function'} = \&t2h_utf8_accent;
+}
+
+foreach my $key (%things_map)
+{
+ if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
+ {
+# $chm_things_map{$key} = chr(hex($unicode_map{$key}));
+ $chm_texi_map{$key} = chr(hex($unicode_map{$key}));
+ }
+}
+
+$chm_simple_map_texi{"\n"} = ' ';
+######################################### end not used
+
+# at least kchmviewer has trouble with the corresponding textual entities
+foreach my $thing ('OE', 'oe', 'euro')
+{
+ $things_map{$thing} = $numeric_entity_map{$thing};
+ $pre_map{$thing} = $numeric_entity_map{$thing};
+ $simple_format_texi_map{$thing} = $numeric_entity_map{$thing};
+}
+
+my $hhp_lines;
+# this cannot be in chm_init_out, because it should be before toc_body
+# call.
+sub chm_initialize_variables()
+{
+ $hhp_lines = '';
+}
+
+sub chm_init_out()
+{
+ &$default_init_out();
+ return if ($null_device_file{$Texi2HTML::THISDOC{'filename'}->{'top'}});
+ my $hhk_file =
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}"
. ".hhk";
+ open (IDXFILE, ">$hhk_file") or
+ die "Can't open $hhk_file for writing: $!\n";
+ if (get_conf('USE_UNICODE') and get_conf('OUT_ENCODING'))
+ {
+ binmode(IDXFILE, ":encoding(".get_conf('OUT_ENCODING').")");
+ }
+
+ print "# writing HTML Help index in $hhk_file...\n" if
(get_conf('VERBOSE'));
+ print IDXFILE "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n<HTML>\n";
+ print IDXFILE "<HEAD>\n<meta name=\"GENERATOR\"
content=\"$Texi2HTML::THISDOC{'program'}\">\n";
+ print IDXFILE "<!-- Sitemap 1.0 -->\n</HEAD>\n<BODY>\n";
+ print IDXFILE "<OBJECT type=\"text/site properties\">\n";
+ foreach my $property (sort(keys(%hhk_global_property)))
+ {
+ print IDXFILE "<param name=\"$property\"
value=\"$hhk_global_property{$property}\">\n";
+
+ }
+ print IDXFILE "</OBJECT>\n";
+
+ my $hhp_file =
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}.hhp";
+ print "# writing HTML Help project in $hhp_file...\n" if
(get_conf('VERBOSE'));
+ open (HHPFILE, ">$hhp_file") or
+ die "Can't open $hhp_file for writing: $!\n";
+ if (get_conf('USE_UNICODE') and get_conf('OUT_ENCODING'))
+ {
+ binmode(HHPFILE, ":encoding(".get_conf('OUT_ENCODING').")");
+ }
+ my $language = $chm_languages{'en'};
+ my $documentlanguage = get_conf('documentlanguage');
+ $documentlanguage =~ s/_.*//;
+ if (exists ($chm_languages{$documentlanguage}))
+ {
+ $language = $chm_languages{$documentlanguage};
+ }
+ my $title = main::remove_texi($Texi2HTML::THISDOC{'title_texi'});
+ my $top_file = $Texi2HTML::THISDOC{'filename'}->{'top'};
+ print HHPFILE <<EOT;
+[OPTIONS]
+Compatibility=1.1 or later
+Compiled file=$Texi2HTML::THISDOC{'file_base_name'}.chm
+Contents file=$Texi2HTML::THISDOC{'file_base_name'}.hhc
+Default Window=Default
+Default topic=$top_file
+Display compile progress=No
+Full-text search=Yes
+Index file=$Texi2HTML::THISDOC{'file_base_name'}.hhk
+Language=$language
+Title=$title
+
+[WINDOWS]
+Default=,"$Texi2HTML::THISDOC{'file_base_name'}.hhc","$Texi2HTML::THISDOC{'file_base_name'}.hhk","$top_file","$top_file",,,,,0x22520,,0x384e,,,,,,,,0
+
+[FILES]
+EOT
+}
+
+sub chm_print_page_foot($)
+{
+ my $fh = shift;
+ print $fh <<EOT;
+<p>
+$PRE_BODY_CLOSE
+</p>
+</body>
+</html>
+EOT
+}
+
+sub chm_noop($$)
+{
+ return '';
+}
+
+# Convert texi to string
+sub chm_text($)
+{
+ my $text = shift;
+ my $result = main::simple_format(undef,undef,'chm_text',$text);
+ return $result;
+}
+
+my @hhc_elements;
+
+# For hhc, collect elements here, do the formatting later
+sub chm_toc_body($)
+{
+ my $elements_ref = shift;
+ &$default_toc_body($elements_ref);
+ my %chm_files;
+ @hhc_elements = @$elements_ref;
+
+ foreach my $element (@$elements_ref)
+ {
+ if (!$chm_files{$element->{'file'}})
+ {
+ $hhp_lines .= "$element->{'file'}\n";
+ $chm_files{$element->{'file'}} = 1;
+ }
+ }
+}
+
+# key:
+# origin_href:
+# entry:
+# texi entry:
+# element_href:
+# element_text:
+sub chm_index_summary_file_entry ($$$$$$$$)
+{
+ my $name = shift;
+ my $key = shift;
+ my $origin_href = shift;
+ my $entry = shift;
+ my $text = '';
+ #$entry = &$protect_text($key);
+ my $texi_entry = shift;
+ my $element_href = shift;
+ my $element_text = shift;
+ my $is_printed = shift;
+ $entry = chm_text($texi_entry);
+ print IDXFILE "<LI> <OBJECT type=\"text/sitemap\">\n<param name=\"Name\"
value=\"$entry\">\n<param name=\"Local\" value=\"$origin_href\">\n</OBJECT>
</LI>\n" if ($key =~ /\S/);
+}
+
+sub chm_index_summary_file_begin($$)
+{
+ my $name = shift;
+ my $is_printed = shift;
+ # avoid entities in hh* files.
+ # set this unconditionally, as if it was set from the command-line.
+ t2h_default_set_iso_symbols(0,0,1);
+}
+
+# file is not closed here but in finish_out.
+sub chm_index_summary_file_end($$)
+{
+ my $name = shift;
+ my $is_printed = shift;
+}
+
+sub chm_finish_out()
+{
+ return if ($null_device_file{$Texi2HTML::THISDOC{'filename'}->{'top'}});
+ print IDXFILE "</BODY>\n</HTML>\n";
+ close (IDXFILE);
+ my $hhc_file =
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}.hhc";
+ open (HHCFILE, ">$hhc_file") or
+ die "Can't open $hhc_file for writing: $!\n";
+ if (get_conf('USE_UNICODE') and get_conf('OUT_ENCODING'))
+ {
+ binmode(HHCFILE, ":encoding(".get_conf('OUT_ENCODING').")");
+ }
+
+ print HHCFILE "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n<HTML>\n";
+ print HHCFILE "<HEAD>\n<meta name=\"GENERATOR\"
content=\"$Texi2HTML::THISDOC{'program'}\">\n";
+ print HHCFILE "<!-- Sitemap 1.0 -->\n</HEAD>\n<BODY>\n";
+ print HHCFILE "<OBJECT type=\"text/site properties\">\n";
+ foreach my $property (sort(keys(%hhc_global_property)))
+ {
+ print HHCFILE "<param name=\"$property\"
value=\"$hhc_global_property{$property}\">\n";
+
+ }
+ print HHCFILE "</OBJECT>\n";
+ my @hhc_lines = ();
+ my $level = 0;
+ foreach my $element (@hhc_elements)
+ {
+ while ($level != $element->{'toc_level'})
+ {
+ if ($level < $element->{'toc_level'})
+ {
+ push (@hhc_lines, "<UL>\n");
+ $level++;
+ }
+ elsif ($level > $element->{'toc_level'})
+ {
+ push (@hhc_lines, "</UL>\n");
+ $level--;
+ }
+ }
+ my $text = '';
+ if (get_conf('NUMBER_SECTIONS') and defined($element->{'number'}) and
$element->{'number'} ne '')
+ {
+ $text .= $element->{'number'} . " ";
+
+ }
+ $text .= chm_text($element->{'texi'});
+ push (@hhc_lines, "<LI> <OBJECT type=\"text/sitemap\">\n<param
name=\"Name\" value=\"$text\">\n<param name=\"Local\"
value=\"$element->{'file'}#$element->{'target'}\">\n</OBJECT> </LI>\n");
+ }
+ while ($level > 0)
+ {
+ push (@hhc_lines, "</UL>\n");
+ $level--;
+ }
+ main::print_lines(\*HHCFILE, address@hidden);
+ print HHCFILE "</HTML>\n</BODY>\n";
+ print HHPFILE $hhp_lines;
+ close (HHPFILE);
+}
+
+1;
Index: texi2html/maintained_extra/html32.pm
===================================================================
RCS file: texi2html/maintained_extra/html32.pm
diff -N texi2html/maintained_extra/html32.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/maintained_extra/html32.pm 9 Apr 2011 00:10:45 -0000
1.1
@@ -0,0 +1,203 @@
+# -*-perl-*-
+#+##############################################################################
+#
+# html32.pm: output HTML 3.2
+#
+# Copyright (C) 2003, 2004, 2007, 2009 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+
+use strict;
+
+set_default('COMPLEX_FORMAT_IN_TABLE', 1);
+
+#html_default_load();
+t2h_default_load_format('html');
+
+set_default('DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"
"http://www.w3.org/TR/html32/loose.dtd";>');
+
+set_default('FRAMESET_DOCTYPE', get_conf('DOCTYPE'));
+
+set_from_init_file('BODYTEXT', 'bgcolor="#FFFFFF" text="#000000"
link="#0000FF" vlink="#800080" alink="#FF0000"');
+# this controls the pre style for menus
+$MENU_PRE_STYLE = '';
+
+$NO_BULLET_LIST_STYLE ='';
+
+$MENU_SYMBOL = '*';
+
+# This lines are inserted before and after the shortcontents
+$BEFORE_OVERVIEW = "";
+$AFTER_OVERVIEW = '';
+
+# This lines are inserted before and after the contents
+$BEFORE_TOC_LINES = "";
+$AFTER_TOC_LINES = '';
+
+# html version for latex2html
+set_default('L2H_HTML_VERSION', '3.2');
+
+# no css. NO_CSS also triggers no class if html_default_attribute_class
+# is used, which is the case for all the dynamically output elements.
+set_default('NO_CSS', 1);
+
+# no accesskey in html 3.2
+set_default('USE_ACCESSKEY', 0);
+
+# Similar with what t2h_default_set_iso_symbols(0) does but without changing
+# all the things command, only a selected list.
+# USE_ISO is not needed since normal_text is redefined.
+set_default('OPEN_QUOTE_SYMBOL', '`');
+set_default('CLOSE_QUOTE_SYMBOL', "'");
+t2h_remove_text_substitutions("'", 1, 0, 0, 1);
+t2h_remove_text_substitutions('`', 1, 0, 0, 1);
+
+foreach my $command ('euro', 'geq', 'leq',
+ 'bullet', 'equiv', 'expansion', 'point', 'result', 'arrow',
+ 'quotedblleft', 'quotedblright',
+ 'quoteleft', 'quoteright',
+ 'quotedblbase', 'quotesinglbase', 'guillemetleft', 'guillemetright',
+ 'guillemotleft', 'guillemotright', 'guilsinglleft', 'guilsinglright')
+{
+ $things_map{$command} = &$protect_text($default_things_map{$command});
+ $pre_map{$command} = $things_map{$command};
+}
+
+$things_map{'oe'} = 'œ';
+$things_map{'OE'} = 'Œ';
+$things_map{'dots'} = '<small>...</small>';
+$things_map{'enddots'} = '<small>...</small>';
+
+$pre_map{'dots'} = '...';
+$pre_map{'oe'} = $things_map{'oe'};
+$pre_map{'OE'} = $things_map{'OE'};
+
+
+$style_map{'sansserif'} = {};
+$style_map{'r'} = {};
+$style_map_pre{'r'} = {};
+$style_map_pre{'sansserif'} = {};
+
+$format_map{'multitable'} = 'table';
+
+# formatting functions
+
+$protect_text = \&t2h_html32_protect_text;
+$normal_text = \&t2h_html32_normal_text;
+#$acronym_like = \&t2h_html32_acronym_like;
+$acronym_like = \&t2h_default_acronym_like;
+$row = \&t2h_html32_row;
+$cell = \&t2h_html32_cell;
+
+
+# " is not in html 3.2
+sub t2h_html32_protect_text($)
+{
+ my $text = shift;
+ $text =~ s/&/&/g;
+ $text =~ s/</</g;
+ $text =~ s/>/>/g;
+ $text =~ s/\"/"/g;
+ return $text;
+}
+
+sub t2h_html32_normal_text($$$$$$$;$)
+{
+ my $text = shift;
+ my $in_raw_text = shift;
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ $text = uc($text) if (in_cmd($style_stack, 'sc'));
+ $text = &$protect_text($text) unless($in_raw_text);
+ if (! $in_code and !$in_preformatted)
+ {
+ if ($in_raw_text) #FIXME really do that ? It is done by makeinfo
+ {
+ $text =~ s/``/"/g;
+ $text =~ s/''/"/g;
+ }
+ else
+ {
+ $text =~ s/``/"/g;
+ $text =~ s/''/"/g;
+ }
+ # FIXME really do that in raw text?
+ $text =~ s/---/\x{1F}/g;
+ $text =~ s/--/-/g;
+ $text =~ s/\x{1F}/--/g;
+ }
+ return $text;
+}
+
+# no acronym, and no abbr in html 3.2
+sub t2h_html32_acronym_like($$$$$$)
+{
+ my $command = shift;
+ my $acronym_texi = shift;
+ my $acronym_text = shift;
+ my $with_explanation = shift;
+ my $explanation_lines = shift;
+ my $explanation_text = shift;
+ my $explanation_simply_formatted = shift;
+
+ if ($with_explanation)
+ {
+ return gdt('{acronym_like} ({explanation})', {'acronym_like' =>
$acronym_text, 'explanation' => $explanation_text},{'duplicate'=>1})
+ }
+ else
+ {
+ return $acronym_text;
+ }
+}
+
+# row in multitable. no thead in html 3.2
+sub t2h_html32_row($$)
+{
+ my $text = shift;
+ my $macro = shift;
+
+ if ($text =~ /\S/)
+ {
+ return '<tr>' . $text . '</tr>' . "\n";
+ }
+ return '';
+}
+
+# cell in multitable. in html 3.2 width is in pixel and not in percent in
+# th or td.
+sub t2h_html32_cell($$)
+{
+ my $text = shift;
+ my $row_macro = shift;
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+
+ $text =~ s/^\s*//;
+ $text =~ s/\s*$//;
+
+ if ($row_macro eq 'headitem')
+ {
+ return "<th>" . $text . '</th>';
+ }
+ return "<td>" . $text . '</td>';
+}
Index: texi2html/maintained_extra/mediawiki.pm
===================================================================
RCS file: texi2html/maintained_extra/mediawiki.pm
diff -N texi2html/maintained_extra/mediawiki.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/maintained_extra/mediawiki.pm 9 Apr 2011 00:10:45 -0000
1.1
@@ -0,0 +1,1187 @@
+# -*-perl-*-
+######################################################################
+# File: mediawiki.pm
+#
+# Override values for various customizable procedures are set in this file
+# in such a way as to create text suitable for pasting into a MediaWiki.
+#
+# Load the file with command-line option: --init-file mediawiki.pm
+#
+# This file is in the public domain. Thus it may easily be used as an
+# example for further customizations.
+#
+# Originally written by Derek Price in 2005.
+# Modified in 2008 and 2009.
+#
+# $Id: mediawiki.pm,v 1.1 2011/04/09 00:10:45 pertusus Exp $
+
+use strict;
+
+#html_default_load();
+t2h_default_load_format('html');
+
+# remark: in my tests, there was no support for mathtt in texvc
+# https://bugzilla.wikimedia.org/show_bug.cgi?id=21475
+default_load_tex_math();
+
+# inline css style
+set_default('INLINE_CSS_STYLE', 1);
+
+set_default('USE_SECTIONS', 1);
+set_default('USE_NODES', undef);
+
+# numbers are added automatically based on mediawiki markup
+set_default('NUMBER_SECTIONS', 0);
+
+# if this is set footnotes are on a separated page. Otherwise they are at
+# the end of each file (if the document is split).
+# At the end is better for the mediawiki output which is more per page
+# oriented.
+set_default('footnotestyle', 'end');
+
+# extension
+set_default('EXTENSION', undef);
+
+# extension for nodes files when NODE_FILES is true
+set_default('NODE_FILE_EXTENSION', '');
+
+# no title page at the beginning
+set_default('USE_TITLEPAGE_FOR_TITLE', 0);
+
+# if set and SPLIT is set, then split index pages at the next letter
+# after they have more than that many entries
+set_default('SPLIT_INDEX', undef);
+
+# Use preformatted menus.
+set_default('SIMPLE_MENU', 1);
+
+# no NODE_FILES. In fact the whole ref to external manual is broken.
+# This may be revisited later.
+set_default('NODE_FILES', 0);
+
+$DEFAULT_RULE = "\n----\n";
+
+my %mediawiki_table_commands;
+
+# FIXME b, i could be ''' ''
+# FIXME ''' and '' are stopped by end of lines!
+my %style_map_mediawiki = (
+ 'emph', {'inline_begin' => "''"},
+ 'email', {'function' => \&mediawiki_default_email},
+ 'math', {'function' => \&mediawiki_default_math},
+ 'url', {'function' => \&mediawiki_default_uref},
+ 'uref', {'function' => \&mediawiki_default_uref},
+ 'strong', {'inline_begin' => "'''"}
+);
+
+foreach my $style_command (keys(%style_map_mediawiki))
+{
+ if ($style_map_mediawiki{$style_command}->{'inline_begin'})
+ {
+ foreach my $key ('inline_attribute', 'attribute')
+ {
+ delete $style_map_pre{$style_command}->{$key};
+ delete $style_map{$style_command}->{$key};
+ }
+ $style_map_pre{$style_command}->{'inline_end'} =
$style_map_mediawiki{$style_command}->{'inline_begin'};
+ $style_map{$style_command}->{'inline_end'} =
$style_map_mediawiki{$style_command}->{'inline_begin'};
+ }
+ foreach my $key (keys(%{$style_map_mediawiki{$style_command}}))
+ {
+ $style_map_pre{$style_command}->{$key} =
$style_map_mediawiki{$style_command}->{$key};
+ $style_map{$style_command}->{$key} =
$style_map_mediawiki{$style_command}->{$key};
+ }
+}
+
+# no samp/kbd in allowed html elements in the default case.
+foreach my $style_command (keys(%style_map))
+{
+ if ($style_map{$style_command}->{'inline_attribute'})
+ {
+ $style_map{$style_command}->{'inline_attribute'} =~
s/^(samp|kbd)/code/;
+ }
+}
+
+foreach my $style_command (keys(%style_map_pre))
+{
+ if ($style_map_pre{$style_command}->{'inline_attribute'})
+ {
+ $style_map_pre{$style_command}->{'inline_attribute'} =~
s/^(samp|kbd)/code/;
+ }
+}
+
+$style_map{'indicateurl'} = {'begin' => '<<code><nowiki>', 'end' =>
'</nowiki></code>>'};
+$style_map_pre{'indicateurl'} = {'begin' => '<<code><nowiki>', 'end' =>
'</nowiki></code>>'};
+
+
+
+sub mediawiki_default_email($$)
+{
+ my $command = shift;
+ my $args = shift;
+ my $mail = shift @$args;
+ my $text = shift @$args;
+ $text = '' if (!defined($text));
+ $mail = main::normalise_space($mail);
+ $text = main::normalise_space($text);
+ return $text if ($mail eq '');
+ $text = ' ' . $text if ($text ne '');
+ return "[mailto:$mail$text]";;
+}
+
+sub mediawiki_default_uref($$)
+{
+ shift;
+ my $args = shift;
+ my $url = shift @$args;
+ my $text = shift @$args;
+ my $replacement = shift @$args;
+ $url = main::normalise_space($url);
+ $replacement = '' if (!defined($replacement));
+ $replacement = main::normalise_space($replacement);
+ $text = '' if (!defined($text));
+ $text = main::normalise_space($text);
+ $text = $replacement if ($replacement ne '');
+ return $text if ($url eq '');
+ return &$anchor('', $url, $text);
+}
+
+sub mediawiki_default_math($$)
+{
+ shift;
+ my $args = shift;
+ my $text = shift @$args;
+ return "<math>$text</math>";
+}
+
+foreach my $format ('enumerate', 'table', 'vtable', 'ftable')
+{
+ $format_map{$format} = '';
+}
+
+my %processed_formats = ();
+# there are no pre used in mediawiki, to have links working in
+# complex formats, therefore the styles are copied in div that
+# are used instead. This doesn't really improve the situation,
+# though, since the div outside of a <pre> is not taken into account.
+foreach my $complex_format (keys(%complex_format_map))
+{
+ my $class = $complex_format_map{$complex_format}->{'class'};
+ $class = $complex_format if (!defined($class));
+
+ # Avoid doing things twice if the class is associated with more than one
+ # complex format
+ next if($processed_formats{$class});
+
+ if (defined($css_map{"pre.$class"}))
+ {
+ if (defined($css_map{"div.$class"}))
+ {
+ $css_map{"div.$class"} .= "; ";
+ }
+ else
+ {
+ $css_map{"div.$class"} = '';
+ }
+ $css_map{"div.$class"} .= $css_map{"pre.$class"};
+ }
+ $processed_formats{$class} = 1;
+}
+
+foreach my $format ('example', 'display', 'lisp', 'format')
+{
+ $complex_format_map{$format}->{'begin'} =
html_default_attribute_class('div', $format).">\n";
+ $complex_format_map{"small$format"}->{'begin'} =
html_default_attribute_class('div', "small$format").">\n";
+ $complex_format_map{$format}->{'end'} = '</div>'."\n";
+ $complex_format_map{"small$format"}->{'end'} = '</div>'."\n";
+}
+foreach my $format ('menu', 'detailmenu', 'menu_comment')
+{
+ my $class = $complex_format_map{$format}->{'class'};
+ $class = $format if (!defined($class));
+ $complex_format_map{$format}->{'begin'} =
html_default_attribute_class('div', $class).">\n";
+ $complex_format_map{$format}->{'end'} = '</div>'."\n";
+}
+
+$texi_formats_map{'direntry'} = 0;
+
+# no acronym nor abbr allowed in wikitext.
+$acronym_like = \&t2h_default_acronym_like;
+
+push @command_handler_setup, \&mediawiki_default_initialize_variables;
+
+my %mediawiki_doc_nr_to_file; # File name cache based on file index.
+my %mediawiki_target_to_name;
+my %mediawiki_special_file_name;
+sub mediawiki_default_initialize_variables()
+{
+ %mediawiki_doc_nr_to_file = (); # File name cache based on file index.
+ %mediawiki_target_to_name = ();
+ %mediawiki_special_file_name = ();
+}
+
+my @html_files_from_tex;
+my $mediawiki_out_dir;
+my $tex_extension;
+
+push @command_handler_init, \&mediawiki_default_init_html_to_wiki;
+
+sub mediawiki_default_init_html_to_wiki
+{
+ # This must be done here, because the latex2html handler is added
+ # after command line scanning, so after the mediawiki.pm parsing
+ push @command_handler_process, \&mediawiki_default_html_to_wiki;
+
+ $command_handler{'math'}->{'init'} = undef;
+ $command_handler{'math'}->{'expand'} = undef;
+ $command_handler{'math'} = undef;
+ $mediawiki_out_dir = "$Texi2HTML::THISDOC{'destination_directory'}";
+ $mediawiki_out_dir = './' if (!defined($mediawiki_out_dir) or
$mediawiki_out_dir =~ /^\s*$/);
+ @html_files_from_tex = ();
+ $tex_extension = undef;
+ if ($Texi2HTML::THISDOC{'extensions'}->{'tex4ht'})
+ {
+ push @html_files_from_tex,
"$Texi2HTML::THISDOC{'file_base_name'}_tex4ht_tex.html";
+ $tex_extension = 'tex4ht';
+ }
+ elsif (get_conf('L2H'))
+ {
+ push @html_files_from_tex,
"$Texi2HTML::THISDOC{'file_base_name'}_l2h.html";
+ $tex_extension = 'l2h';
+ # avoid use of the cache
+ set_default('L2H_SKIP', 0);
+ }
+}
+
+# could be in texi2html.pm...
+sub mediawiki_default_readd_end_of_lines($$$$;$)
+{
+ my $from_file = shift;
+ my $to_file = shift;
+ my $tex_extension = shift;
+ my $basename = shift;
+ my $before_wiki = shift;
+ # html2wiki removes end of lines, they are readded here
+ unless (open (ORIG, $from_file))
+ {
+ print STDERR "open $from_file error: $!\n";
+ return 0;
+ }
+ unless (open (FINAL, ">$to_file"))
+ {
+ print STDERR "open $to_file error: $!\n";
+ return 0;
+ }
+ my $line;
+ while ($line = <ORIG>)
+ {
+ if ($before_wiki)
+ {
+ $line =~ s/(<!-- ${tex_extension}_end $basename ((\w+ |)(\d+)) -->)
*$/$1\n\n<p>intersticiae<\/p>\n/;
+ $line = Texi2HTML::LaTeX2HTML::change_image_file_names($line) if
($tex_extension eq 'l2h');
+ }
+ else
+ {
+ $line =~ s/^(<!-- ${tex_extension}_begin $basename ((\w+ |)(\d+))
-->)(.+)/$1\n$5/;
+ $line =~ s/(.+)(<!-- ${tex_extension}_end $basename ((\w+ |)(\d+))
-->) *$/$1\n$2/;
+ }
+ print FINAL "$line";
+ }
+ close ORIG;
+ close FINAL;
+ return 1;
+}
+
+sub mediawiki_default_html_to_wiki
+{
+ foreach my $file (@html_files_from_tex)
+ {
+ if (-f $mediawiki_out_dir.$file)
+ {
+ my $html_file = $mediawiki_out_dir.$file;
+ my $tmp_file = $mediawiki_out_dir.$file.".tmp";
+ my $tmp_file2 = $mediawiki_out_dir.$file.".tmp2";
+ my $tmp_file3 = $mediawiki_out_dir.$file.".tmp3";
+ my $basename = $file;
+ $basename =~ s/\.html$//;
+ if (!rename ($html_file, $tmp_file))
+ {
+ print STDERR "rename $html_file $tmp_file error: $!\n";
+ return;
+ }
+ #system ("cp $tmp_file $tmp_file.save");
+ # Add a paragraph between the end and begin comments to force
+ # html2wiki to leave them appart.
+ return unless (mediawiki_default_readd_end_of_lines($tmp_file,
$tmp_file3, $tex_extension, $basename, 1));
+ if (!rename ($tmp_file3, $tmp_file))
+ {
+ print STDERR "rename $tmp_file3 $tmp_file error: $!\n";
+ return;
+ }
+ #system ("cp $tmp_file $tmp_file3.save");
+ my $cmd = "html2wiki --dialect MediaWiki --strip-tags '' $tmp_file >
$tmp_file2";
+ print STDERR "Launching(". Cwd::cwd() ."): $cmd\n" if
(get_conf('VERBOSE'));
+ if (system ($cmd))
+ {
+ main::document_warn ("mediawiki_tex command failed: $cmd");
+ return;
+ }
+ # this ensures that there is one end of line before the
+ # html comment, and after, even though html2wiki removed them
+ return unless (mediawiki_default_readd_end_of_lines($tmp_file2,
$html_file, $tex_extension, $basename));
+ #system ("cp $html_file $html_file.save");
+ }
+ else
+ { # FIXME error message?
+ }
+ }
+}
+
+$heading_text = \&mediawiki_heading_text;
+
+sub mediawiki_heading_text($$$)
+{
+ my $command = shift;
+ my $text = shift;
+ my $level = shift;
+
+ return '' if ($text !~ /\S/);
+ $level = 1 if ($level == 0);
+ return (("=" x $level) . "= $text =" . ("=" x $level) . "\n");
+}
+
+###################################################################
+# Layout of standard header and footer
+#
+
+$print_page_head = \&mediawiki_default_print_page_head;
+$print_page_foot = \&mediawiki_default_print_page_foot;
+
+sub mediawiki_default_print_page_head($)
+{
+ my $fh = shift;
+ print $fh "$AFTER_BODY_OPEN\n" if $AFTER_BODY_OPEN;
+}
+
+sub mediawiki_default_print_page_foot($)
+{
+ my $fh = shift;
+ my $program_string = &$program_string();
+ print $fh $program_string, "\n";
+ print $fh $PRE_BODY_CLOSE, "\n" if $PRE_BODY_CLOSE;
+}
+
+# This function produces an anchor
+#
+# arguments:
+# $name : anchor name
+# $href : anchor href
+# $text : text displayed
+# extra_attribs : added to anchor attributes list
+
+$anchor = \&mediawiki_anchor;
+
+sub mediawiki_anchor($;$$$)
+{
+ my $name = shift;
+ my $href = shift;
+ my $text = shift;
+ my $attributes = shift; # ignored
+ $href = '' if !defined $href or $href !~ /\S/;
+ $text = '' if !defined $text or $text !~ /\S/;
+ return $text if $name eq '' and $href eq '';
+ $name = "<div id=\"$name\"></div>" if $name ne '';
+ if (defined($href) and $href ne '')
+ {
+ my $wiki_href;
+ my ($file, $target);
+
+ if ($href =~ /^([^#]*)\#(.+)$/)
+ {
+ $file = $1;
+ $target = $2;
+
+ if (defined($mediawiki_target_to_name{$target}))
+ {
+ if ($file eq '')
+ {
+ $target =
$mediawiki_target_to_name{$target}->[0]->[1]->{'simple_format'}
+ if
($mediawiki_target_to_name{$target}->[0]->[1]->{'simple_format'} ne '');
+ $wiki_href = '#' . $target;
+ }
+ else
+ {
+ foreach my $element (@{$mediawiki_target_to_name{$target}})
+ {
+ if ($file eq $element->[0])
+ {
+ $target = $element->[1]->{'simple_format'} if
($element->[1]->{'simple_format'} ne '');
+ $wiki_href = $file . '#' . $target;
+ }
+ }
+ }
+ }
+
+ # Element pages, or misc relative links.
+ # mediawiki 1.15.1 doesn't like anchor only urls, they work as
wiki_ref.
+ if (!defined($wiki_href) and ($mediawiki_special_file_name{$file}
or $file eq ''))
+ {
+ $wiki_href = $href;
+ }
+ }
+ # Element page, no target
+ elsif ($mediawiki_special_file_name{$href})
+ {
+ $file = $href;
+ $wiki_href = $href;
+ }
+ if (defined($wiki_href))
+ {
+ $text = "|$text" if $text;
+ # FIXME trouble with
http://meta.wikimedia.org/wiki/Help:Namespace#Generic_namespace_names
+ # and with
http://en.wikipedia.org/wiki/Wikipedia:Naming_conventions_(technical_restrictions)#Forbidden_characters
+
+ $href = "[[$wiki_href$text]]";
+ }
+ else
+ {
+ $text = " $text" if $text;
+ $href = "[$href$text]";
+ }
+ }
+ else
+ {
+ $href = $text;
+ }
+#print STDERR "!!!$name!$href!$text!$attributes!\n";
+ return "$name$href";
+}
+
+# it is not possible (at least not easy) to protect only 2 consecutive
+# {, although it would be better.
+foreach my $brace ('{', '}')
+{
+ $simple_map{$brace} = "<nowiki>$simple_map{$brace}</nowiki>";
+ $simple_map_pre{$brace} = "<nowiki>$simple_map_pre{$brace}</nowiki>";
+}
+
+# remark: this nullifies the change of default_load_tex_math for normal_text.
+# We assume that in @math the TeX characters have already been
+# rightly protected and so don't protect once more. This is important
+# for <, not to lead to <.
+# remark: texvc doesn't accept " \&
+$normal_text = \&mediawiki_default_normal_text;
+sub mediawiki_default_normal_text($$$$$$$;$)
+{
+ my @initial_args = @_;
+ my $text = shift;
+ my $in_raw_text = shift; # remove_texi
+ my $in_preformatted = shift;
+ my $in_code = shift;
+ my $in_math = shift;
+ my $in_simple = shift;
+ my $style_stack = shift;
+ my $state = shift;
+
+ if ($in_math)
+ {
+ $text = uc($text) if (in_cmd($style_stack, 'sc'));
+ return $text;
+ }
+ $text = &html_default_normal_text (@initial_args);
+ my $colon = '';
+ foreach my $command (@$style_stack)
+ {
+ if ($mediawiki_table_commands{$command} or $def_map{$command})
+ {
+ $colon = '|( :)' ;
+ last;
+ }
+ #print STDERR "$command\n";
+ }
+ # '' is changed to &ldsquo; so it doesn't needs to be protected in
+ # normal text...
+ if (!$in_raw_text and !$in_simple)
+ {
+ $text =~
s/(([\[\]]|[']{2,}|(\{\{)|(\}\})$colon)+)/<nowiki>$1<\/nowiki>/g;
+ }
+ return $text;
+}
+
+#$heading = \&mediawiki_default_heading;
+sub mediawiki_default_heading($$$$$;$$)
+{
+ my $element = shift;
+ my $command = shift;
+ my $texi_line = shift;
+ my $line = shift;
+ my $in_preformatted = shift;
+ my $one_section = shift;
+ my $element_heading = shift;
+
+ my $result = t2h_default_heading($element, $command, $texi_line, $line,
+ $in_preformatted, $one_section, $element_heading);
+ if ($result ne '')
+ {
+ if ($element->{'no_texi'} =~ /[\#<>\[\]|{}]/)
+ {
+ main::msg_warn("# < > [ ] | { } not allowed in title
`$element->{'texi'}'",$element->{'line_nr'});
+ }
+ }
+ return $result;
+}
+# This function formats a footnote reference and the footnote text associated
+# with a given footnote.
+# The footnote reference is the text appearing in the main document pointing
+# to the footnote text.
+#
+# arguments:
+# absolute number of the footnote (in the document)
+# relative number of the footnote (in the page)
+# identifier for the footnote
+# identifier for the footnote reference in the main document
+# main document file
+# footnote text file
+# array with the footnote text lines
+# the state. See menu entry.
+#
+# returns:
+# reference on an array containing the footnote text lines which should
+# have been updated
+# the text for the reference pointing on the footnote text
+
+# FIXME the <ref>... stuff is only available with the Cite extension.
+
+$foot_line_and_ref = \&mediawiki_default_foot_line_and_ref;
+$foot_section = \&mediawiki_default_foot_section;
+
+sub mediawiki_default_foot_line_and_ref($$$$$$$)
+{
+ my $number_in_doc = shift;
+ my $number_in_page = shift;
+ my $footnote_id = shift;
+ my $place_id = shift;
+ my $document_file = shift;
+ my $footnote_file = shift;
+ my $lines = shift;
+ my $state = shift;
+
+ my $result = '<ref>';
+ foreach my $line (@$lines)
+ {
+ $result .= $line;
+ }
+ # The result shouldn't be empty, such that the call to print_Footnotes
+ # and foot_section are not skipped
+ return ([' '], $result . '</ref>');
+}
+
+# formats a group of footnotes.
+#
+# argument:
+# array reference on the footnotes texts lines
+#
+# returns an array reference on the group of footnotes lines
+# FIXME maybe do a header?
+sub mediawiki_default_foot_section($)
+{
+ my $lines = shift;
+ #unshift @$lines, "$DEFAULT_RULE\n" if $DEFAULT_RULE;
+ #unshift @$lines, "==== " . gdt('Footnotes') . " ====\n";
+ @$lines = ("<references/>\n\n");
+ return $lines;
+}
+
+# FIXME maybe also a header here?
+$print_Footnotes = \&mediawiki_default_print_Footnotes;
+sub mediawiki_default_print_Footnotes
+{
+ my $fh = shift;
+ my $new_file = shift;
+ my $misc_page = shift;
+ my $buttons = address@hidden;
+
+ &$print_misc_header($fh, $buttons, $new_file, $misc_page) if ($new_file);
+ print $fh "<references/>\n\n";
+ &$print_misc_footer($fh, $buttons, $new_file) if ($new_file);
+}
+
+$button_formatting = \&mediawiki_button_formatting;
+
+sub mediawiki_button_formatting
+{
+ my $button = shift;
+ my $vertical = shift;
+ my ($active, $passive) = HTML_DEFAULT_button_formatting($button, $vertical);
+ if (defined($active) and !ref($button))
+ {
+ $active =~ s/^\[/\|/;
+ $active =~ s/\]$/\|/;
+ }
+ return ($active, $passive);
+}
+
+$element_file_name = \&mediawiki_element_file_name;
+
+sub mediawiki_element_file_name
+{
+ my $element = shift;
+ my $type = shift;
+ my $docu_name = shift;
+ my $file;
+#print STDERR "!$element!$type!$docu_name!\n";
+
+ if (!$element)
+ {
+ if ($type =~ /^toc$/)
+ {
+ $file = $docu_name . ": Table of Contents";
+ }
+ elsif ($type =~ /^stoc$/)
+ {
+ $file = $docu_name . ": Short Table of Contents";
+ }
+ elsif ($type =~ /^foot$/)
+ {
+ $file = $docu_name . ": Footnotes";
+ }
+ elsif ($type =~ /^about$/)
+ {
+ $file = $docu_name . ": About this Manual";
+ }
+ elsif ($type =~ /^doc$/)
+ {
+ $file = $docu_name;
+ }
+ }
+ else
+ {
+ my $name = main::substitute_line($element->{'texi'}, 'file name',
{'remove_texi' => 1}, $element->{'line_nr'});
+ if (exists $mediawiki_doc_nr_to_file{$element->{'doc_nr'}})
+ {
+ $file = $mediawiki_doc_nr_to_file{$element->{'doc_nr'}};
+ $mediawiki_doc_nr_to_file{$element->{'doc_nr'}} = $file;
+ }
+ else
+ {
+ $name =~ s,/,%47,g;
+ $name =~ s,\\,%92,g;
+ $file = "$docu_name" . (($type eq 'top') ? "" : ": " . $name);
+ $mediawiki_doc_nr_to_file{$element->{'doc_nr'}} = $file;
+ }
+ push @{$mediawiki_target_to_name{$element->{'target'}}}, [ $file,
$element ];
+ if ($name =~ /[\#<>\[\]|{}]/)
+ {
+ main::msg_warn("# < > [ ] | { } not allowed in title
`$element->{'texi'}'",$element->{'line_nr'});
+ }
+ }
+ $mediawiki_special_file_name{$file} = 1;
+ return $file;
+}
+
+$node_file_name = \&mediawiki_default_node_file_name;
+sub mediawiki_default_node_file_name($$)
+{
+ my $node = shift;
+ my $type = shift;
+ my $filename = T2H_DEFAULT_node_file_name($node, $type);
+ my $command = 'node';
+ $command = $node->{'tag'};
+ my $name = main::substitute_line($node->{'texi'}, 'node name',
{'remove_texi' => 1}, $node->{'line_nr'});
+ if ($name =~ /[\#<>\[\]|{}]/)
+ {
+ main::msg_warn("# < > [ ] | { } not allowed in references, in
address@hidden `$node->{'texi'}'",$node->{'line_nr'});
+ }
+
+ return $filename;
+}
+
+# a preformatted region
+# arguments:
+# $text of the preformatted region
+# $pre_style css style
+# $class identifier for the preformatted region (example, menu-comment)
+# The following is usefull if the preformatted is in an itemize.
+# $leading_command is the leading formatting command (like @minus)
+# $leading_command_formatted is the leading formatting command formatted
+# $preformatted_number is a reference on the number of preformatteds appearing
+# in the format. The value should be increased if a preformatted is done
+$preformatted = \&mediawiki_default_preformatted;
+sub mediawiki_default_preformatted($$$$$$$$$$)
+{
+ my $text = shift;
+ my $pre_style = shift;
+ my $class = shift;
+ my $leading_command = shift;
+ my $leading_command_formatted = shift;
+ my $preformatted_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+
+ return '' if ($text eq '');
+ $leading_command_formatted = '' if (!defined($leading_command_formatted)
or
+ exists($special_list_commands{$format}->{$leading_command}));
+ if (defined($preformatted_number) and defined($$preformatted_number))
+ {
+ $$preformatted_number++;
+ }
+
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+ if ($top_stack eq 'multitable')
+ {
+ $text =~ s/^\s*//;
+ $text =~ s/\s*$//;
+ }
+
+ $text =~ s/^/ /mg;
+ # return html_default_attribute_class('div', $class).">\n$text</div>\n";
+ return "$text";
+ #return "<pre class=\"$class\"><nowiki>$text</nowiki></pre>";
+}
+
+sub mediawiki_default_remove_eol($)
+{
+ my $text = shift;
+ chomp($text);
+ my $res = '';
+ foreach my $line (split /\n/, $text)
+ {
+ $res .= $line . " ";
+ }
+ $res =~ s/ $//;
+ $res .= "\n";
+ return $res;
+}
+
+my %mediawiki_default_indent_symbol = (
+ 'itemize' => '*',
+ 'enumerate' => '#'
+);
+foreach my $table ('table', 'ftable', 'vtable')
+{
+ $mediawiki_default_indent_symbol{$table} = ':';
+ $mediawiki_table_commands{$table} = 1;
+}
+foreach my $definition_command (keys(%def_map))
+{
+ $mediawiki_default_indent_symbol{$definition_command} = ':';
+}
+
+sub mediawiki_default_indent_string($;$)
+{
+ my $commands = shift;
+ my $remove_last = shift;
+
+ $commands = $Texi2HTML::THISDOC{'command_stack'} if (!defined($commands));
+ my $indent_string = '';
+ foreach my $format (@$commands)
+ {
+ $indent_string .= $mediawiki_default_indent_symbol{$format}
+ if defined($mediawiki_default_indent_symbol{$format});
+ }
+ $indent_string =~ s/.$// if ($remove_last);
+ return $indent_string;
+}
+
+$paragraph = \&mediawiki_default_paragraph;
+sub mediawiki_default_paragraph($$$$$$$$$$$$)
+{
+ my $text = shift;
+ my $align = shift;
+ my $indent = shift;
+ my $paragraph_command = shift;
+ my $paragraph_command_formatted = shift;
+ my $paragraph_number = shift;
+ my $format = shift;
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+ my $number = shift;
+ my $command_stack_at_end = shift;
+ my $command_stack_at_begin = shift;
+#print STDERR "format: $format\n" if (defined($format));
+#print STDERR "paragraph @$command_stack_at_end; @$command_stack_at_begin\n";
+# $paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
+# exists($special_list_commands{$format}->{$paragraph_command}));
+ return '' if ($text =~ /^\s*$/);
+
+ if (defined($paragraph_number) and defined($$paragraph_number))
+ {
+ $$paragraph_number++;
+ }
+
+ # remove leading spaces, they trigger a preformatted environment in
wikitext
+ $text =~ s/^\s*//mg;
+ my $top_stack = '';
+ $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
+ if ($top_stack eq 'multitable')
+ {
+ $html_default_multitable_stack[-1]->[1]++;
+ return mediawiki_default_remove_eol($text);
+ }
+
+ if ($align)
+ {
+ $text = "<p align=\"$paragraph_style{$align}\">".$text.'</p>';
+ }
+
+ my $indent_string =
mediawiki_default_indent_string($command_stack_at_begin);
+ if ($indent_string)
+ {
+ $text = $indent_string . ' ' .mediawiki_default_remove_eol($text);
+ }
+
+ return $text;
+}
+
+$list_item = \&mediawiki_default_list_item;
+sub mediawiki_default_list_item
+{
+ my $text = shift;
+ return $text;
+}
+
+$def_item = \&mediawiki_default_def_item;
+sub mediawiki_default_def_item($$$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $command = shift;
+ if ($text =~ /\S/)
+ {
+ if (! get_conf('DEF_TABLE'))
+ {
+ return $text;# unless $only_inter_item_commands;
+ #return $text; # invalid without dd in ul
+ }
+ else
+ {
+ return '<tr><td colspan="2">' . $text . '</td></tr>';
+ }
+ }
+ return '';
+}
+
+$table_item = \&mediawiki_default_table_item;
+sub mediawiki_default_table_item($$$$$$$)
+{
+ my $text = shift;
+ my $index_label = shift;
+ my $format = shift;
+ my $command = shift;
+# my $formatted_command = shift;
+ my $style_stack = shift;
+# my $text_formatted = shift;
+# my $text_formatted_leading_spaces = shift;
+# my $text_formatted_trailing_spaces = shift;
+ my $item_cmd = shift;
+ my $formatted_index_entry = shift;
+
+# if (defined($text_formatted) and !exists
$special_list_commands{$format}->{$command})
+# {
+# $text = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
+# }
+# $formatted_command = '' if (!defined($formatted_command) or
+# exists($special_list_commands{$format}->{$command}));
+ if (html_teletyped_in_stack($style_stack))
+ {
+# $text .= '</tt>';
+# $formatted_command = '<tt>' . $formatted_command;
+ $text = '<tt>' . $text . '</tt>';
+ }
+ $text .= "\n" . $index_label if (defined($index_label));
+# return '<dt>' . $formatted_command . $text . '</dt>' . "\n";
+ return mediawiki_default_indent_string(undef,1) .";$text\n";
+}
+
+$table_line = \&mediawiki_default_table_line;
+sub mediawiki_default_table_line($$$)
+{
+ my $text = shift;
+ my $only_inter_item_commands = shift;
+ my $before_items = shift;
+
+ $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
+
+ if ($text =~ /\S/)
+ {
+ #return ";$text\n";# unless ($only_inter_item_commands);
+ return $text;
+ #return $text; # invalid without dd in ul
+ }
+ return '';
+}
+
+
+$def_line = \&mediawiki_default_def_line;
+sub mediawiki_default_def_line($$$$$$$$$$$$$$$$)
+{
+ my $category_prepared = shift;
+ my $name = shift;
+ my $type = shift;
+ my $arguments = shift;
+ my $index_label = shift;
+ my $arguments_array = shift;
+ my $arguments_type_array = shift;
+ my $unformatted_arguments_array = shift;
+ my $command = shift;
+ my $class_name = shift;
+ my $category = shift;
+ my $class = shift;
+ my $style = shift;
+ my $original_command = shift;
+
+ $index_label = '' if (!defined($index_label));
+ chomp($index_label);
+ $category_prepared = '' if (!defined($category_prepared) or
($category_prepared =~ /^\s*$/));
+ $name = '' if (!defined($name) or ($name =~ /^\s*$/));
+ $type = '' if (!defined($type) or $type =~ /^\s*$/);
+ if (!defined($arguments) or $arguments =~ /^\s*$/)
+ {
+ $arguments = '';
+ }
+ else
+ {
+ chomp ($arguments);
+ $arguments = '<em>' . $arguments . '</em>';
+ }
+ my $type_name = '';
+ $type_name = " <em>$type</em>" if ($type ne '');
+ $type_name .= ' <strong>' . $name . '</strong>' if ($name ne '');
+ $type_name .= $arguments;
+ if (! get_conf('DEF_TABLE'))
+ {
+ return mediawiki_default_indent_string(undef,1) .';'. $index_label.
$category_prepared . '<nowiki>:</nowiki>' . $type_name . "\n";
+ }
+ else
+ {
+ return "<tr><td align=\"left\">" . $type_name .
+ "</td><td align=\"right\">" . $category_prepared . $index_label .
"</td></tr>\n";
+ }
+}
+
+
+$def = \&mediawiki_default_def;
+sub mediawiki_default_def($$)
+{
+ my $text = shift;
+ my $command = shift;
+ if ($text =~ /\S/)
+ {
+ if (! get_conf('DEF_TABLE'))
+ {
+ return $text;
+ }
+ else
+ {
+ return "<table width=\"100%\">\n" . $text . "</table>\n";
+ }
+ }
+ return '';
+
+}
+
+
+
+$table_list = \&mediawiki_default_table_list;
+
+sub mediawiki_default_table_list($$$$$$$$$)
+{
+ my $format_command = shift;
+ my $text = shift;
+ my $command = shift;
+ my $formatted_command = shift;
+# enumerate
+ my $item_nr = shift;
+ my $enumerate_style = shift;
+# itemize
+ my $prepended = shift;
+ my $prepended_formatted = shift;
+# multitable
+ my $columnfractions = shift;
+ my $prototype_row = shift;
+ my $prototype_lengths = shift;
+ my $column_number = shift;
+
+ if ($format_command eq 'multitable')
+ {
+ pop @html_default_multitable_stack;
+ return &$format('multitable', 'table', $text);
+ }
+ return $text;
+}
+
+# format an index summary. This is a list of letters linking to the letter
+# entries.
+#
+# arguments:
+# array reference containing the formatted alphabetical letters
+# array reference containing the formatted non lphabetical letters
+$index_summary = \&mediawiki_index_summary;
+sub mediawiki_index_summary($$)
+{
+ my $alpha = shift;
+ my $nonalpha = shift;
+ my $join = '';
+ my $nonalpha_text = '';
+ my $alpha_text = '';
+ return "" if address@hidden and address@hidden;
+ $nonalpha_text = join ("", map {"<td>$_</td>"} @$nonalpha) . "\n"
+ if @$nonalpha;
+ $alpha_text = join ("", @$alpha) . "\n \n"
+ if @$alpha;
+ return '<table cellpadding="1" cellspacing="1" border="0">'
+ . "<tr><th valign=\"top\">" . gdt('Jump to') .":</th>\n"
+ . join ("", map {"<td>$_</td>\n"} @$nonalpha, @$alpha)
+ . "</tr></table>\n";
+}
+
+$line_command = \&mediawiki_line_command;
+
+sub mediawiki_line_command($$$$)
+{
+ my $command = shift;
+ my $arg_text = shift;
+ my $arg_texi = shift;
+ my $state = shift;
+
+ return '' if ($arg_text eq '' or ($command eq 'author' and
(!$state->{'region'} or $state->{'region'} ne 'titlepage')));
+ if ($command eq 'title')
+ {
+ $arg_text = '== ' .$arg_text. " ==\n";
+ }
+ elsif ($command eq 'subtitle')
+ {
+ $arg_text = '=== ' .$arg_text. " ===\n";
+ }
+ elsif ($command eq 'author')
+ {
+ $arg_text = '<strong> ' .$arg_text. " </strong><br>\n";
+ }
+ return $arg_text;
+}
+
+$image = \&mediawiki_default_image;
+
+sub mediawiki_default_image($$$$$$$$$$$$$$$$$)
+{
+ my $file = shift;
+ my $base = shift;
+ my $preformatted = shift;
+ my $file_name = shift;
+ my $alt = shift;
+ my $width = shift;
+ my $height = shift;
+ my $raw_alt = shift;
+ my $extension = shift;
+ my $working_dir = shift;
+ my $file_path = shift;
+ my $in_paragraph = shift;
+ my $file_locations = shift;
+ my $base_simple_format = shift;
+ my $extension_simple_format = shift;
+ my $file_name_simple_format = shift;
+ my $line_nr = shift;
+
+ if (!defined($file_path) or $file_path eq '')
+ {
+ if (defined($extension) and $extension ne '')
+ {
+ $file = "$base.$extension";
+ }
+ else
+ {
+ $file = "$base.jpg";
+ }
+ main::line_warn (sprintf(__("address@hidden file `%s' not found, using
`%s'"), $base, $file), $line_nr);
+ }
+ elsif (! get_conf('COMPLETE_IMAGE_PATHS'))
+ {
+ $file = $file_name;
+ }
+ my $alt_text = '';
+ $alt_text = "|alt=$alt" if (defined($alt) and $alt ne '');
+ # it is possible that $file_name is more correct as it allows the user
+ # to chose the relative path.
+ $file = &$protect_text($file);
+ return "[[Image:$file$alt_text]]";
+}
+
+# FIXME <math> in mediawiki is only valid for one formula, not for
+# random TeX.
+# One possibility could be to use TeX -> html -> html2wiki
+#$raw = \&mediawiki_default_raw;
+sub mediawiki_default_raw($$;$)
+{
+ my $style = shift;
+ my $text = shift;
+ my $line_nr = shift;
+ my $expanded = 1 if (grep {$style eq $_} @EXPAND);
+ if ($style eq 'verbatim' or $style eq 'verbatiminclude')
+ {
+ $style = 'verbatim' if ($style eq 'verbatiminclude');
+ return html_default_attribute_class('pre', $style).">" .
&$protect_text($text) . '</pre>';
+ }
+ elsif ($style eq 'html' and $expanded)
+ {
+ chomp ($text);
+ return $text;
+ }
+ elsif ($style eq 'tex' and $expanded)
+ {
+ chomp ($text);
+ return "<math>$text</math>\n";
+ }
+ elsif ($expanded)
+ {
+ main::line_warn (sprintf(__("Raw format %s is not converted"),
$style), $line_nr);
+ return &$protect_text($text);
+ }
+ else
+ {
+ return '';
+ }
+}
+
+
+## a simple menu entry ref in case we aren't in a standard menu context
+#$simple_menu_link = \&mediawiki_simple_menu_link;
+
+# a menu link. We are always in preformatted because of SIMPLE_MENU.
+# currently not used.
+#$menu_link = \&mediawiki_simple_menu_link;
+
+sub mediawiki_simple_menu_link($$$$$$$)
+{
+ my $entry = shift;
+# my $preformatted = shift; # We assume this is true.
+ my $state = shift;
+ my $href = shift;
+ my $node = shift;
+ my $title = shift;
+ my $ending = shift;
+ my $has_title = shift;
+ my $command_stack = shift;
+ my $preformatted = shift;
+
+ $title = '' unless ($has_title);
+ $ending = '' unless defined $ending;
+ $entry = "</nowiki>";
+ $entry .= "$MENU_SYMBOL";
+ if ($href)
+ {
+ $entry .= &$anchor ('', $href, $node);
+ }
+ else
+ {
+ $title .= ":" if ($title ne '');
+ $entry .= "$title$node";
+ }
+ $entry .= $ending;
+ $entry .= "<nowiki>";
+ return $entry;
+}
Index: texi2html/maintained_extra/tex4ht.pm
===================================================================
RCS file: texi2html/maintained_extra/tex4ht.pm
diff -N texi2html/maintained_extra/tex4ht.pm
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ texi2html/maintained_extra/tex4ht.pm 9 Apr 2011 00:10:45 -0000
1.1
@@ -0,0 +1,389 @@
+# -*-perl-*-
+
+#+##############################################################################
+#
+# tex4ht.pm: use tex4ht to convert tex to html
+#
+# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License,
+# or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# Originally written by Patrice Dumas.
+#
+#-##############################################################################
+# To customize the command and the options, you could set
+# $Texi2HTML::TeX4HT::STYLE_MATH to latex/tex
+# $Texi2HTML::TeX4HT::STYLE_TEX to latex/texi
+# and/or change
+# $Texi2HTML::TeX4HT::tex4ht_command_math
+# and $Texi2HTML::TeX4HT::tex4ht_options_math
+# $Texi2HTML::TeX4HT::tex4ht_command_tex
+# and $Texi2HTML::TeX4HT::tex4ht_options_tex
+
+use strict;
+
+if (defined($OUTPUT_FORMAT) and $OUTPUT_FORMAT eq 'html')
+{
+push @command_handler_init, \&Texi2HTML::TeX4HT::tex4ht_init;
+push @command_handler_process, \&Texi2HTML::TeX4HT::tex4ht_process;
+# do it once here to have something ready for special regions formatting
+push @command_handler_process, \&Texi2HTML::TeX4HT::tex4ht_output;
+# do it once more if the file was modified (for example see mediawiki.pm)
+push @command_handler_output, \&Texi2HTML::TeX4HT::tex4ht_output;
+push @command_handler_finish, \&Texi2HTML::TeX4HT::tex4ht_finish;
+
+$command_handler{'math'} =
+ { 'init' => \&Texi2HTML::TeX4HT::tex4ht_to_latex,
+ 'expand' => \&Texi2HTML::TeX4HT::tex4ht_do_tex
+ };
+$command_handler{'tex'} =
+ { 'init' => \&Texi2HTML::TeX4HT::tex4ht_to_latex,
+ 'expand' => \&Texi2HTML::TeX4HT::tex4ht_do_tex
+ };
+}
+
+
+{
+use Cwd;
+
+package Texi2HTML::TeX4HT;
+
+use vars qw(
+$STYLE_MATH
+$STYLE_TEX
+$tex4ht_command_math
+$tex4ht_command_tex
+$tex4ht_options_math
+$tex4ht_options_tex
+);
+
+$STYLE_MATH = 'texi' if (!defined($STYLE_MATH));
+$STYLE_TEX = 'tex' if (!defined($STYLE_TEX));
+
+if (!defined($tex4ht_command_math))
+{
+ $tex4ht_command_math = 'httexi';
+ $tex4ht_command_math = 'htlatex' if ($STYLE_MATH eq 'latex');
+ $tex4ht_command_math = 'httex' if ($STYLE_MATH eq 'tex');
+}
+if (!defined($tex4ht_command_tex))
+{
+ $tex4ht_command_tex = 'httex';
+ $tex4ht_command_tex = 'htlatex' if ($STYLE_TEX eq 'latex');
+ $tex4ht_command_tex = 'httexi' if ($STYLE_TEX eq 'texi');
+}
+
+my %commands = ();
+
+my $tex4ht_initial_dir;
+my $tex4ht_out_dir;
+my $tex4ht_latex_failed = 0;
+my %tex4ht_results;
+
+sub tex4ht_init
+{
+ # set file names
+ $tex4ht_initial_dir = Cwd::abs_path;
+ if
($Texi2HTML::Config::null_device_file{$Texi2HTML::THISDOC{'filename'}->{'top'}})
+ {
+ # when output is a null device we skip entirely the tex4ht stuff.
+ $tex4ht_latex_failed = 1;
+ return;
+ }
+ $tex4ht_out_dir = "$Texi2HTML::THISDOC{'destination_directory'}";
+ $tex4ht_out_dir = './' if (!defined($tex4ht_out_dir) or $tex4ht_out_dir =~
/^\s*$/);
+ my $tex4ht_basename = "$Texi2HTML::THISDOC{'file_base_name'}_tex4ht";
+ %tex4ht_results = ();
+ $tex4ht_latex_failed = 0;
+ # this initialization doesn't seems to be needed, but it is cleaner anyway
+ %commands = ();
+ $commands{'math'}->{'style'} = $STYLE_MATH;
+ $commands{'tex'}->{'style'} = $STYLE_TEX;
+ $commands{'math'}->{'exec'} = $tex4ht_command_math;
+ $commands{'tex'}->{'exec'} = $tex4ht_command_tex;
+ foreach my $command ('math', 'tex')
+ {
+ my $style = $commands{$command}->{'style'};
+ $commands{$command}->{'basename'} = $tex4ht_basename . "_$command";
+ my $suffix = '.tex';
+ $suffix = '.texi' if ($style eq 'texi');
+ $commands{$command}->{'basefile'} = $commands{$command}->{'basename'} .
$suffix;
+ $commands{$command}->{'html_file'} = $commands{$command}->{'basename'} .
'.html';
+ $commands{$command}->{'rfile'} = $tex4ht_out_dir .
$commands{$command}->{'basefile'};
+ my $rfile = $commands{$command}->{'rfile'};
+ local *TEX4HT_TEXFILE;
+ unless (open (*TEX4HT_TEXFILE, ">$rfile"))
+ {
+ main::document_warn ("t2h_tex4ht error opening $rfile: $!");
+ $tex4ht_latex_failed = 1;
+ return;
+ }
+ $commands{$command}->{'handle'} = *TEX4HT_TEXFILE;
+ }
+ foreach my $command ('math', 'tex')
+ {
+ $commands{$command}->{'counter'} = 0;
+ my $style = $commands{$command}->{'style'};
+ my $fh = $commands{$command}->{'handle'};
+ my $comment = '@c';
+ $comment = '%' if ($style ne 'texi');
+ $comment .= " Automatically generated\n";
+ if ($style eq 'texi')
+ {
+ print $fh "\\input texinfo
address@hidden $commands{$command}->{'basename'}.info\n";
+ print $fh "$comment";
+ }
+ else
+ {
+ print $fh "$comment";
+ if ($style eq 'latex')
+ {
+ print $fh "\\documentstyle{article}\n\\begin{document}\n";
+ }
+ elsif ($style eq 'tex')
+ {
+ print $fh "\\csname tex4ht\\endcsname\n";
+ }
+ }
+ }
+ $Texi2HTML::THISDOC{'extensions'}->{'tex4ht'} = 1;
+}
+
+sub tex4ht_to_latex
+{
+ my $command = shift;
+ my $text = shift;
+ my $counter = shift;
+ my $style = $commands{$command}->{'style'};
+ my $fh = $commands{$command}->{'handle'};
+
+ # write to tex file
+ my $before_comment_open = "address@hidden";
+ my $after_comment_open = "address@hidden verbatim\n";
+ my $before_comment_close = "address@hidden";
+ my $after_comment_close = "address@hidden verbatim\n";
+
+ if ($style ne 'texi')
+ {
+ $before_comment_open = "\\HCode{\\Hnewline \\Hnewline ";
+ $after_comment_open = "\\Hnewline}\n";
+ $before_comment_close = "\\HCode{\\Hnewline ";
+ $after_comment_close = "\\Hnewline \\Hnewline}\n";
+ }
+
+ my $begin_comment = "<!-- tex4ht_begin $commands{$command}->{'basename'}
$command $counter -->";
+ print $fh "$before_comment_open$begin_comment$after_comment_open";
+ if ($command eq 'tex')
+ {
+ print $fh $text;
+ }
+ elsif ($command eq 'math')
+ {
+ if ($style eq 'texi')
+ {
+ print $fh '@math{' . $text . "}\n";
+ }
+ else
+ {
+ print $fh "\\IgnorePar \$" . $text . "\$";
+ }
+ }
+ my $end_comment = "<!-- tex4ht_end $commands{$command}->{'basename'}
$command $counter -->";
+ print $fh "$before_comment_close$end_comment$after_comment_close";
+ $commands{$command}->{'counter'}++;
+ return 1;
+}
+
+sub tex4ht_process
+{
+ foreach my $command ('math', 'tex')
+ {
+ tex4ht_finish_latex($command);
+ }
+ unless (chdir $tex4ht_out_dir)
+ {
+ main::document_warn ("t2h_tex4ht chdir to $tex4ht_out_dir failed");
+ $tex4ht_latex_failed = 1;
+ return;
+ }
+ print STDERR "cwd($tex4ht_out_dir):" . Cwd::cwd() ."\n" if
(Texi2HTML::Config::get_conf('VERBOSE'));
+
+ foreach my $command ('math', 'tex')
+ {
+ tex4ht_process_command($command);
+ }
+ tex4ht_return_to_dir();
+}
+
+my $tex4ht_output_counter;
+
+sub tex4ht_output
+{
+ $tex4ht_output_counter = 0;
+ unless (chdir $tex4ht_out_dir)
+ {
+ main::document_warn ("t2h_tex4ht chdir to $tex4ht_out_dir failed");
+ $tex4ht_latex_failed = 1;
+ return;
+ }
+ foreach my $command ('math', 'tex')
+ {
+ tex4ht_output_command($command);
+ }
+ tex4ht_return_to_dir();
+}
+
+sub tex4ht_finish_latex
+{
+#print STDERR "$style $tex4ht_latex_failed $tex4ht_counter\n";
+ my $command = shift;
+ return if ($tex4ht_latex_failed);
+
+ my $style = $commands{$command}->{'style'};
+ my $fh = $commands{$command}->{'handle'};
+ # finish the tex file
+ if ($style eq 'latex')
+ {
+ print $fh "\\end{document}\n";
+ }
+ elsif ($style eq 'tex')
+ {
+ print $fh "\n\\bye\n";
+ }
+ else
+ {
+ print $fh "address@hidden";
+ }
+ close ($fh);
+}
+
+sub tex4ht_process_command($)
+{
+ my $command = shift;
+ return unless ($commands{$command}->{'counter'});
+ main::document_warn ("t2h_tex4ht $commands{$command}->{'basefile'} missing")
unless (-f $commands{$command}->{'basefile'});
+ my $style = $commands{$command}->{'style'};
+ # now run tex4ht
+ my $options = '';
+ $options = $tex4ht_options_math if (($style eq 'math') and
defined($tex4ht_options_math));
+ $options = $tex4ht_options_tex if (($style eq 'tex') and
defined($tex4ht_options_tex));
+ my $cmd = "$commands{$command}->{'exec'} $commands{$command}->{'basefile'}
$options";
+ print STDERR "tex4ht command: $cmd\n" if
(Texi2HTML::Config::get_conf('VERBOSE'));
+ if (system($cmd))
+ {
+ main::document_warn ("t2h_tex4ht command: $cmd failed");
+ tex4ht_return_to_dir();
+ $tex4ht_latex_failed = 1;
+ return;
+ }
+ # this have to be done during the 'process' phase, in 'output' it is
+ # too late.
+ push @{$Texi2HTML::THISDOC{'css_import_lines'}}, "address@hidden
\"$commands{$command}->{'basename'}.css\";\n";
+}
+
+sub tex4ht_output_command($)
+{
+ my $command = shift;
+ return unless ($commands{$command}->{'counter'});
+ # extract the html from the file created by tex4ht
+ my $html_basefile = $commands{$command}->{'html_file'};
+ unless (open (TEX4HT_HTMLFILE, $html_basefile))
+ {
+ main::document_warn ("t2h_tex4ht error opening $html_basefile: $!");
+ tex4ht_return_to_dir();
+ $tex4ht_latex_failed = 1;
+ return;
+ }
+ my $got_count = 0;
+ my $line;
+ while ($line = <TEX4HT_HTMLFILE>)
+ {
+ #print STDERR "$html_basefile: while $line";
+ if ($line =~ /!-- tex4ht_begin $commands{$command}->{'basename'} (\w+)
(\d+) --/)
+ {
+ my $command = $1;
+ my $count = $2;
+ my $text = '';
+ my $end_found = 0;
+ while ($line = <TEX4HT_HTMLFILE>)
+ {
+ #print STDERR "while search $command $count $line";
+ if ($line =~ /!-- tex4ht_end $commands{$command}->{'basename'}
$command $count --/)
+ {
+ $got_count++;
+ chomp($text);
+ $tex4ht_results{"${command}_$count"} = $text;
+ $end_found = 1;
+ last;
+ }
+ else
+ {
+ $text .= $line;
+ }
+ }
+ unless ($end_found)
+ {
+ main::document_warn ("t2h_tex4ht: end of $command $count not
found");
+ }
+ }
+ }
+ if ($got_count != $commands{$command}->{'counter'} and
(Texi2HTML::Config::get_conf('VERBOSE')))
+ {
+ main::document_warn ("t2h_tex4ht: got $got_count for
$commands{$command}->{'counter'} items entered");
+ }
+ close (TEX4HT_HTMLFILE);
+
+}
+
+sub tex4ht_return_to_dir
+{
+ unless (chdir $tex4ht_initial_dir)
+ {
+ die "* t2h_tex4ht unable to return to the initial dir\n";
+ }
+}
+
+sub tex4ht_do_tex
+{
+ my $command = shift;
+ my $counter = shift;
+ # return the resulting html
+ if (exists ($tex4ht_results{"${command}_$counter"}) and
defined($tex4ht_results{"${command}_$counter"}))
+ {
+ $tex4ht_output_counter++;
+ return $tex4ht_results{"${command}_$counter"};
+ }
+ else
+ {
+ main::document_warn ("t2h_tex4ht: cannot find text to output for $command
number $counter");
+ return '';
+ }
+}
+
+sub tex4ht_finish
+{
+ my $tex4ht_in_counter = 0;
+ foreach my $command (keys(%commands))
+ {
+ $tex4ht_in_counter += $commands{$command}->{'counter'};
+ }
+ if (($tex4ht_output_counter != $tex4ht_in_counter) and
(Texi2HTML::Config::get_conf('VERBOSE')))
+ {
+ main::document_warn ("t2h_tex4ht: output $tex4ht_output_counter for
$tex4ht_in_counter items entered");
+ }
+}
+
+}
+1;
Index: texi2html/texi2html.init
===================================================================
RCS file: texi2html/texi2html.init
diff -N texi2html/texi2html.init
--- texi2html/texi2html.init 28 Oct 2010 21:38:27 -0000 1.292
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,7385 +0,0 @@
-# -*-perl-*-
-# vim: set filetype=perl:
-######################################################################
-# File: texi2html.init
-#
-# Default values for command-line arguments and for various customizable
-# procedures are set in this file.
-#
-# A copy of this file is pasted into the beginning of texi2html by
-# running './configure'.
-#
-# Copy this file, rename it and make changes to it, if you like.
-# Afterwards, load the file with command-line
-# option --init-file <your_init_file>
-#
-# This file is in the public domain. Thus it may easily be used as an
-# example for further customizations.
-#
-# Originally written by Olaf Bachmann in 2000.
-#
-# Those values may be overrided by values set in $sysconfdir/texi2html/Config
-# and then by values set in $HOME/texi2html/Config.
-#
-# $Id: texi2html.init,v 1.292 2010/10/28 21:38:27 pertusus Exp $
-
-
-##################################################################
-# The following variables can also be set by command-line options
-#
-# command line switches may override these values, and values set in files
-# specified by --init-file are also taken into account.
-#
-# options common with makeinfo
-# -I
-# add a directory to the list of directories where @include files are
-# searched for (besides the directory of the file). additional '-I'
-# args are appended to this list.
-# (APA: Don't implicitely search ., to conform with the docs!)
-# my @INCLUDE_DIRS = (".");
-
-use strict;
-
address@hidden = ();
-
-# -P
-# prepend a directory to the list of directories where @include files are
-# searched for before the directory of the file. additional '-P'
-# args are prepended to this list.
address@hidden = ();
-
-# --split section|chapter|node|none
-# if $SPLIT is set to 'section' (resp. 'chapter') one html file per section
-# (resp. chapter) is generated. If $SPLIT is set to 'node' one html file per
-# node or sectioning element is generated. In all these cases separate pages
-# for Top, Table of content (Toc), Overview and About are generated.
-# Otherwise a monolithic html file that contains the whole document is
-# created.
-set_default('SPLIT', '');
-
-# --separated-footnotes
-# if this is set footnotes are on a separated page. Otherwise they are at
-# the end of each file (if the document is split).
-set_default('footnotestyle', 'end');
-
-# --fill-column
-set_default('FILLCOLUMN', 72);
-
-# --number | --no-number
-# if this is set the sections are numbered, and section names and numbers
-# are used in references and menus (instead of node names).
-set_default('NUMBER_SECTIONS', 1);
-
-# --headers
-# if this is set then navigation panels are printed at the beginning of each
-# section.
-# If the document is split at nodes then navigation panels are
-# printed at the end if there were more than WORDS_IN_PAGE words on page.
-#
-# Navigation panels are always printed at the beginning of output files.
-#
-# This is most useful if you do not want to have section navigation
-# with --split chapter. There will be chapter navigation panel at the
-# beginning and at the end of chapters anyway.
-# this is mostly not used in the default case, important for html.
-set_default('HEADERS', 0);
-
-# -o filename
-# If this is set a monolithic document is outputted into $filename.
-set_default('OUT', undef);
-set_default('OUTFILE', undef);
-
-# --split-size
-# if undef, the info output is not split
-set_default('SPLIT_SIZE', 300000);
-
-# --internal-links
-set_default('INTERNAL_LINKS', undef);
-
-# --no-validate
-# suppress node cross-reference validation
-set_default('novalidate', 0);
-
-# --documentlanguage
-# use gdt('my string') if you want to have translations of 'my string'.
-# Translations are in texinfo/po_document/
-# This is used for the initial language, it is overriden during
-# document processing if there is a @documentlanguage.
-# It is ignored if the language is passed on the command line.
-set_default('documentlanguage', 'en');
-
-# --transliterate-file-names
-# transliterate node names for external refs (and internal if NODE_FILES)
-set_default('TRANSLITERATE_FILE_NAMES', 1);
-
-# --error-limit
-# quit after NUM errors (default 100).
-set_default('ERROR_LIMIT', 100);
-
-# --css-include
-# All the specified css files are used. More precisely the @import sections
-# are added to the beginning of the CSS_LINES the remaining is added at
-# the end of the CSS_LINES (after the css rules generated by the program).
-# cf texinfo manual for more info.
-# - means STDIN
address@hidden = ();
-
-# --css-ref
-# the specified url are used as stylesheet links
address@hidden = ();
-
-# --paragraph-indent
-set_default('paragraphindent',3);
-
-# --enable-encoding
-set_default('ENABLE_ENCODING', 0);
-
-# --force
-set_default('FORCE', 0);
-
-# --no-warn
-set_default('NO_WARN', 0);
-
-# --number-footnotes
-set_default('NUMBER_FOOTNOTES', 1);
-
-# --batch
-set_default('BATCH', 0);
-
-# --silent/--quiet
-set_default('SILENT', 0);
-
-# --Xopt
address@hidden = ();
-
-# not in makeinfo but in texi2dvi
-# --command
address@hidden = ();
-
-##################################################################
-# option specific of texi2html
-# --debug
-# The integer value specifies what kind of debugging output is generated.
-set_default('DEBUG', 0);
-
-# --doctype
-# The value is the 'SystemLiteral' which identifies the canonical DTD
-# for the document.
-# Definition: The SystemLiteral is called the entity's system
-# identifier. It is a URI, which may be used to retrieve the entity.
-# See http://www.xml.com/axml/target.html#NT-ExternalID
-set_default('DOCTYPE', '');
-
-# --frameset-doctype
-# When frames are used, this SystemLiteral identifies the DTD used for
-# the file containing the frame description.
-set_default('FRAMESET_DOCTYPE', '');
-
-# --test
-# If this value is true, some variables which should be dynamically generated
-# (the date, the user running texi2html, the version of texi2html) are set to
-# fix and given values. This is usefull in case the resulting manual is
-# compared with a reference. For example this is used in the tests.
-set_default('TEST', 0);
-
-# --dump-texi
-# This value is usefull for debugging purposes. The result of the first pass is
-# put in <document name>.passtexi, the result of the second pass is put in
-# <document name>.passfirst.
-set_default('DUMP_TEXI', 0);
-
-# --expand
-# the @EXPAND array contains the expanded section names.
address@hidden = ();
-
-# --iso
-# if this value is true, ISO8859 characters are used for quotes.
-# --iso does more than what USE_ISO does.
-set_default('USE_ISO', 0);
-
-# --conf-dir
-# append to the files searched for init files.
address@hidden = ();
-
-# --top-file
-# This file name is used for the top-level file.
-# The extension is set appropriately, if necessary.
-# If empty, <basename of document>.html is used.
-# Typically, you would set this to "index.html".
-set_default('TOP_FILE', '');
-
-# --toc-file
-# This file name is used for the table of contents. The
-# extension is set appropriately, if necessary.
-# If empty, <basename of document>_toc.html is used.
-set_default('TOC_FILE', '');
-
-# --frames
-# if the value is true, HTML 4.0 "frames" are used.
-# A file describing the frame layout is generated, together with a file
-# with the short table of contents.
-set_default('FRAMES', 0);
-
-# --menu | --no-menu
-# if the value is true the Texinfo menus are shown.
-# this is defined in all the formats
-set_default('SHOW_MENU', 1);
-
-# --use-nodes
-# if this is set the nodes are used as sectioning elements.
-# Otherwise the nodes are incorporated in sections.
-set_default('USE_NODES', 1);
-
-# --node-files
-# if this is set one file per node is generated, which can be a target for
-# cross manual references.
-set_default('NODE_FILES', undef);
-
-# --toc-links
-# if this is set, links from headings to toc entries are created.
-set_default('TOC_LINKS', 0);
-
-# --subdir
-# If this is set, then put result files into the specified directory.
-# If not set, then result files are put into the current directory.
-#$SUBDIR = 'html';
-set_default('SUBDIR', undef);
-
-# --short-extn
-# If this is set, then all HTML files will have extension ".htm" instead of
-# ".html". This is helpful when shipping the document to DOS-based systems.
-set_default('SHORTEXTN', 0);
-
-# --prefix
-# This set the output file prefix, prepended to all .html, .gif and .pl files.
-# By default, this is the basename of the document.
-set_default('PREFIX', '');
-
-# --short-ref
-# if this is set cross-references are given without section.
-set_default('SHORT_REF', 1);
-
-# --idx-sum
-# if value is set, then for each @printindex <index name>
-# <document name>_<index name>.idx is created which contains lines of the form
-# key ref sorted alphabetically (case matters).
-set_default('IDX_SUMMARY', 0);
-
-# --def-table
-# If this is set a table construction for @def.... instead of definition
-# lists.
-# (New Option: 27.07.2000 Karl Heinz Marbaise)
-set_default('DEF_TABLE', 0);
-
-# --verbose
-# if this is set chatter about what we are doing.
-set_default('VERBOSE', '');
-
-# --ignore-preamble-text
-# If this is set the text before @node and sectioning commands is ignored.
-set_default('IGNORE_PREAMBLE_TEXT', 0);
-
-# --html-xref-prefix
-# base directory for external manuals. Obsolete.
-set_default('EXTERNAL_DIR', undef);
-
-# --l2h
-# if this is set, latex2html is used for generation of math content.
-set_default('L2H', '');
-
-# --monolithic
-# output only one file including ToC. It only makes sense when not split
-set_default('MONOLITHIC', 1);
-
-######################
-# The following options are only relevant if $L2H is set
-#
-# --l2h-l2h
-# name/location of latex2html program
-set_default('L2H_L2H', 'latex2html');
-
-# --l2h-skip
-# If this is set the actual call to latex2html is skipped. The previously
-# generated content is reused, instead.
-# If set to 0, the cache is not used.
-# If undef the cache is used for as many tex fragments as possible
-# and for the remaining the command is run.
-set_default('L2H_SKIP', undef);
-
-# --l2h-tmp
-# If this is set l2h uses the specified directory for temporary files. The path
-# leading to this directory may not contain a dot (i.e., a ".");
-# otherwise, l2h will fail.
-set_default('L2H_TMP', '');
-
-# --l2h-file
-# If set, l2h uses the file as latex2html init file
-set_default('L2H_FILE', undef);
-
-# --l2h-clean
-# if this is set the intermediate files generated by texi2html in relation with
-# latex2html are cleaned (they all have the prefix <document name>_l2h_).
-set_default('L2H_CLEAN', 1);
-
-##############################################################################
-#
-# The following can only be set in the init file
-#
-##############################################################################
-
address@hidden = ('.txi','.texinfo','.texi','.txinfo','');
-
-set_default('firstparagraphindent', 'none');
-
address@hidden = ('plaintext');
-
-# In file encoding. The @documentencoding allows autodetection of
-# that variable.
-set_default('documentencoding', undef);
-
-# In file encoding, understandable by perl. Set according to documentencoding
-set_default('IN_ENCODING', undef);
-
-# Formatted document encoding name. If undef, set in init_out based on
-# OUT_ENCODING or documentencoding if they are defined
-set_default('ENCODING_NAME', undef);
-
-# Out files encoding, understandable by perl. If undef, set in init_out
-# using ENCODING_NAME or IN_ENCODING if they are defined
-set_default('OUT_ENCODING', undef);
-
-# if undef set to @documentdescription. If there is no @documentdescription,
-# set in page_head.
-set_default('documentdescription', undef);
-
-# EXTERNAL_CROSSREF_SPLIT at the document level set to 1 if SPLIT,
-# to 0 otherwise
-set_default('EXTERNAL_CROSSREF_SPLIT', undef);
-
-# output as @today, and also as the date. Set automatically if not set
-# otherwise.
-set_default('today', undef);
-
-# simple headers formatting, not in a table and using node names.
-set_default('HEADER_IN_TABLE', 0);
-
-# output the generation date in the header.
-set_default('DATE_IN_HEADER', 0);
-
-# use table for indentation of complex formats
-set_default('COMPLEX_FORMAT_IN_TABLE', 0);
-
-# if set, node names are used to construct file names
-# if undef, it is set if split at node, or NODE_FILES is set.
-set_default('NODE_FILENAMES', undef);
-
-# If true do table of contents even if there is no @content
-set_default('contents', undef);
-
-# If true do short table of contents even if there is no @shortcontent
-set_default('shortcontents', undef);
-
-# set by @setcontentsaftertitlepage/@setshortcontentsaftertitlepage
-set_default('setcontentsaftertitlepage', undef);
-set_default('setshortcontentsaftertitlepage', undef);
-
-# corresponds with @kbdinputstyle
-set_default('kbdinputstyle', 'distinct');
-
-# corresponds with @frenchspacing
-set_default('frenchspacing', 'off');
-
-# correspond with @allowcodebreaks
-set_default('allowcodebreaks', 'true');
-
-# corresponds with @setfilename. Set with caution.
-set_default('setfilename', undef);
-
-# if unset, don't show a title
-set_default('SHOW_TITLE', 1);
-
-# if set style is added in attribute.
-set_default('INLINE_CSS_STYLE', 0);
-
-# if set, no css is used.
-set_default('NO_CSS', 0);
-
-# if set, the image files are completed to be relative from the
-# document directory, to the source manual directory and then to
-# the image
-set_default('COMPLETE_IMAGE_PATHS', 0);
-
-# if true, begin outputting at @setfilename, if this command is present.
-set_default('IGNORE_BEFORE_SETFILENAME', 1);
-
-# if true the link in Overview link to the corresponding Toc entry.
-set_default('OVERVIEW_LINK_TO_TOC', 1);
-
-# if set, use node anchors for sections targets
-set_default('USE_NODE_TARGET', 1);
-
-# new style for crossrefs
-set_default('NEW_CROSSREF_STYLE', 1);
-
-# top heading is always at the beginning of the element.
-# FIXME looks like a no-op
-set_default('TOP_HEADING_AT_BEGINNING', 0);
-
-# use titlepage for the title instead of a simplest title
-set_default('USE_TITLEPAGE_FOR_TITLE', 0);
-
-# used as identation for block enclosing command @example, etc
-# If not empty, must be enclosed in <td></td>
-$EXAMPLE_INDENT_CELL = '';
-
-# same as above, only for @small
-$SMALL_EXAMPLE_INDENT_CELL = '';
-
-# unused
-$SMALL_FONT_SIZE = '-1';
-
-# horizontal rules
-# not used
-$SMALL_RULE = '';
-$MIDDLE_RULE = '';
-# used in html
-$DEFAULT_RULE = '';
-$BIG_RULE = '';
-
-# output the program name in the footer
-set_default('PROGRAM_NAME_IN_FOOTER', 0);
-
-# if non-empty, and no @..heading appeared in Top node, then
-# use this as header for top node/section, otherwise use value of
-# @settitle or @shorttitle (in that order)
-$TOP_HEADING = '';
-
-# if set, use this chapter for 'Index' button, else
-# use first chapter with @printindex
-$INDEX_CHAPTER = '';
-
-set_default('SIMPLE_MENU', 1);
-
-set_default('OPEN_QUOTE_SYMBOL', '`');
-set_default('CLOSE_QUOTE_SYMBOL', "'");
-
-$NO_NUMBER_FOOTNOTE_SYMBOL = '*';
-
-# if true put a $MENU_SYMBOL before unnumbered in menus
-$UNNUMBERED_SYMBOL_IN_MENU = 0;
-
-# extension for nodes files when NODE_FILES is true
-set_default('NODE_FILE_EXTENSION', 'txt');
-
-# extension
-set_default('EXTENSION', 'txt');
-
-# file name used for Top node when NODE_FILES is true
-#TOP_NODE_FILE = 'index';
-set_default('TOP_NODE_FILE', undef);
-
-# file name used for Top node in references
-set_default('TOP_NODE_FILE_TARGET', 'index');
-
-# file used as document basename, when input file is -
-$STDIN_DOCU_NAME = 'stdin';
-
-# file used as document output basename, when output file is -
-$STDOUT_DOCU_NAME = 'stdout';
-
-# node name used for Top node when automatic node directions are used
-set_default('TOP_NODE_UP', '(dir)');
-
-# this controls the pre style for menus
-$MENU_PRE_STYLE = 'font-family: serif';
-
-# on bug-texinfo is has been said the the style is not code_style
-# for menus (except for the node name).
-# this controls the menu preformatted format
-# FIXME this is not dynamic, so change in MENU_PRE_STYLE is not taken
-# into account.
-# This is used if the menu appears within a preformatted format (which
-# is certainly an invalid construct), and SIMPLE_MENU is not set.
-$MENU_PRE_COMPLEX_FORMAT = {
- 'class' => 'menu-preformatted',
-# 'style' => 'code'
- };
-
-# This controls the ul style for toc
-$NO_BULLET_LIST_STYLE = '';
-$NO_BULLET_LIST_ATTRIBUTE = '';
-
-# These lines are inserted before and after the shortcontents
-$BEFORE_OVERVIEW = "";
-$AFTER_OVERVIEW = "";
-
-# These lines are inserted before and after the contents
-$BEFORE_TOC_LINES = "";
-$AFTER_TOC_LINES = "";
-
-# text inserted after <body ...>
-$AFTER_BODY_OPEN = '';
-
-# text inserted before </body>, this will be automatically inside <p></p>
-$PRE_BODY_CLOSE = '';
-
-# this is added inside <head></head> after <title> and some <meta name>
-# stuff, it can be used for eg. <style>, <script>, <meta> etc. tags.
-$EXTRA_HEAD = '';
-
-# Specifies the minimum page length required before a navigation panel
-# is placed at the bottom of a page
-# FIXME this is not true:
-# THIS_WORDS_IN_PAGE holds number of words of current page
-set_default('WORDS_IN_PAGE', 300);
-
-# if this is set a vertical navigation panel is used.
-set_default('VERTICAL_HEAD_NAVIGATION', 0);
-
-# html version for latex2html
-set_default('L2H_HTML_VERSION', "4.0");
-
-# use icons.
-set_default('ICONS', 0);
-
-# use old framework for translations
-set_default('I18N_PERL_HASH', 0);
-
-# command name to invoke when used as a texi2dvi wrapper
-set_default('TEXI2DVI', 'texi2dvi');
-
-# this resets some defaults, those that are also set in formats and
-# not set in every formats.
-#
-# this is called below after %default_style_map_texi is defined
-sub t2h_default_set_variables_default()
-{
- $CAPTION_STYLE = 'strong';
-
-# if this variable is true, @setfilename is used if found to determine the
-# out file name
- set_default('USE_SETFILENAME', 1);
-
-# if true, use the filename and extension from setfilename. For Info.
- set_default('USE_SETFILENAME_EXTENSION', 0);
-
-# FIXME is this right?
-# default used in init_out for the setting of the ENCODING_NAME variable
- set_default('DEFAULT_ENCODING', 'utf8');
-
-# if set and menu entry equals menu description, then do not print
-# menu description.
-# Likewise, if node name equals entry name, do not print entry name.
- set_default('AVOID_MENU_REDUNDANCY', 0);
-
-# if true, use the original command if the result is an entity
- set_default('ENABLE_ENCODING_USE_ENTITY', 0);
-
-# if set, output the contents where the command is located
-# This is ignored if set*contentsaftertitlepage is set
- set_default('INLINE_CONTENTS', 1);
-
-# if set, do redirection files for renamed nodes
- set_default('RENAMED_NODES_REDIRECTIONS', undef);
-
-# symbol put at the beginning of nodes entry in menu (and optionnaly of
-# unnumbered in menus, see UNNUMBERED_SYMBOL_IN_MENU variable)
- $MENU_SYMBOL = '*';
-
-# symbol put at the end of nodes entry in menu
- $MENU_ENTRY_COLON = ':';
-
-# symbol put at the end of index entries
- $INDEX_ENTRY_COLON = ':';
-
-# if set, then use node names in menu entries, instead of section names
- set_default('NODE_NAME_IN_MENU', 1);
-
-# if set always separate description and menu link, even in
-# preformatted environment
- set_default('SEPARATE_DESCRIPTION', 0);
-
-# try up sections to complete the node directions
- set_default('USE_UP_FOR_ADJACENT_NODES', 0);
-
-# use accesskey in hrefs
- set_default('USE_ACCESSKEY', 1);
-
-# use rel= and rev= in hrefs. Currently only rel is used
- set_default('USE_REL_REV', 1);
-
-# generate <link> elements in head
- set_default('USE_LINKS', 1);
-
-# if this variable is true, numeric entities are used when there is no
-# corresponding textual entity.
- set_default('USE_NUMERIC_ENTITY', 0);
-
-# if set and SPLIT is set, then split index pages at the next letter
-# after they have more than that many entries
- set_default('SPLIT_INDEX', 0);
-
-# extensions used for images
- @IMAGE_EXTENSIONS = ('png','jpg', 'txt');
-
- set_default('USE_NODES', 1);
-
- set_default('USE_SECTIONS', 1);
-
-# also set by command line options
- set_default('footnotestyle', 'end');
-
- set_default('DOCTYPE', '');
-
- set_default('USE_ISO', 0);
-
- set_default('NUMBER_SECTIONS', 1);
-
- set_default('TOP_FILE', '');
-
- set_default('ENABLE_ENCODING', 0);
-
-#
-# Formatting functions
-#
-# They will be reset here between formats switch
-# if they are defined in this function.
-#
-
-# these are more or less the documented vanilla versions, so they
-# are reset
-$unknown = \&t2h_default_unknown;
-$unknown_style = \&t2h_default_unknown_style;
-$external_ref = \&t2h_default_external_ref;
-$internal_ref = \&t2h_default_internal_ref;
-$tab_item_texi = \&t2h_default_tab_item_texi;
-$complex_format = \&t2h_default_complex_format;
-$toc_body = \&T2H_DEFAULT_toc_body;
-$misc_command_line = \&t2h_default_misc_command_line;
-$misc_command_line_texi = \&t2h_default_misc_command_line;
-$print_title = \&T2H_DEFAULT_print_title;
-# reset in info and xml
-$element_heading = \&t2h_default_element_heading;
-# reset in html
-$inline_contents = \&T2H_DEFAULT_inline_contents;
-# reset in docbook and info.
-$style = \&T2H_GPL_style;
-$format = \&T2H_GPL_format;
-# reset in info
-$simple_command = \&t2h_default_simple_command;
-# reset in info
-$thing_command = \&t2h_default_thing_command;
-# reset in html and xml
-$caption_shortcaption = \&t2h_default_caption_shortcaption;
-$caption_shortcaption_command = \&t2h_default_caption_shortcaption_command;
-# reset in docbook and xml. Not really vanilla, but documented.
-$printindex = \&t2h_GPL_default_printindex;
-# reset by xml and html
-$misc_element_label = \&t2h_default_misc_element_label;
-# set in html
-$init_out = \&t2h_default_init_out;
-# set in info and xml
-$paragraph_style_command = \&t2h_default_paragraph_style_command;
-# set in info
-$colon_command = \&t2h_default_colon_command;
-# set in docbook
-$quotation_prepend_text = \&t2h_default_quotation_prepend_text;
-# set in info
-$copying_comment = \&t2h_default_copying_comment;
-
-# set in html and info
-$print_section = \&T2H_DEFAULT_print_section;
-
-# set in docbook and xml
-%colon_command_punctuation_characters = (
- '.' => '.',
- ':' => ':',
- '?' => '?',
- '!' => '!'
-);
-
-
-
-# in info
-$footnote_texi = undef;
-$begin_paragraph_texi = undef;
-$begin_style_texi = undef;
-$begin_special_region = undef;
-$end_special_region = undef;
-$empty_preformatted = undef;
-
-%line_command_map = (
- 'title' => '',
- 'subtitle' => '',
- 'author' => '',
-);
-
-%format_in_paragraph = (
-);
-# map mapping css specification to style
-
-%css_map =
- (
- );
-
address@hidden = ();
address@hidden = ();
address@hidden = ();
address@hidden = ();
-
-%region_formats_kept = ();
-
-%style_map_texi = ();
-t2h_default_copy_style_map (\%default_style_map_texi, \%style_map_texi);
-
-# reset in info
-%simple_map_texi = %default_simple_map;
-
-# modified in docbook
-%special_accents = (
- 'ringaccent' => 'aA',
- "'" => 'aeiouyAEIOUY',
- ',' => 'cC',
- '^' => 'aeiouAEIOU',
- '`' => 'aeiouAEIOU',
- '~' => 'nNaoAO',
- '"' => 'aeiouyAEIOU',
-# according to http://www2.lib.virginia.edu/small/vhp/download/ISO.txt
-# however this doesn't seems to work in firefox
-# 'ogonek' => 'aeiuAEIU',
-);
-
-# modified by info, xml, docbook
-# %no_paragraph_commands should not be reset since it has been
-# filled with defaults for many other commands.
-
-# FIXME this prevents the user from setting those entries.
-$no_paragraph_commands{'cindex'} = 1;
-$no_paragraph_commands{'float'} = 1;
-delete $no_paragraph_commands{'anchor'};
-
-# modified in docbook and xml
-%stop_paragraph_command = (
- 'titlefont' => 1,
- 'insertcopying' => 1,
- 'sp' => 1,
- 'verbatiminclude' => 1,
- 'page' => 1,
-# FIXME they also stop preformatted, so cannot be here.
-# 'printindex' => 1,
-# 'listoffloats' => 1
-);
-
-}
-
-sub t2h_default_raw_text_load()
-{
- set_default('SPLIT', '');
- # extension for nodes files when NODE_FILES is true
- set_default('NODE_FILE_EXTENSION', 'txt');
-
- # extension
- set_default('EXTENSION', 'txt');
- @T2H_FORMAT_EXPAND = ('plaintext');
- set_default('USE_TITLEPAGE_FOR_TITLE', 0);
- set_default('HEADERS', 0);
- set_default('SIMPLE_MENU', 1);
- set_default('INLINE_INSERTCOPYING', 0);
- # reset here, in case it was set to something else by another
- # format.
- set_default('TOP_NODE_FILE', undef);
-
- %simple_map = %default_simple_map;
- %simple_map_pre = %simple_map;
-
- %things_map = %default_things_map;
- %pre_map = %things_map;
-
- %style_map = ();
- %style_map_pre = ();
- t2h_default_copy_style_map (\%default_style_map, \%style_map);
- t2h_default_copy_style_map (\%default_style_map_pre, \%style_map_pre);
-
- # could also be t2h_default_set_iso_symbols()
- t2h_remove_text_substitutions("'", 1, 0, 0, 1);
- t2h_remove_text_substitutions('`', 1, 0, 0, 1);
- set_default('OPEN_QUOTE_SYMBOL', '`');
- set_default('CLOSE_QUOTE_SYMBOL', "'");
-
- $BEFORE_OVERVIEW = "";
- $AFTER_OVERVIEW = "";
-
- $BEFORE_TOC_LINES = "";
- $AFTER_TOC_LINES = "";
-
-
- foreach my $complex_format ('example', 'smallexample', 'display',
- 'smalldisplay', 'lisp', 'smalllisp', 'format', 'smallformat',
- 'menu', 'detailmenu', 'direntry', 'menu_comment')
- {
- $complex_format_map{$complex_format}->{'begin'} = '';
- $complex_format_map{$complex_format}->{'end'} = '';
- }
-
- %format_map = (
-# 'quotation' => 'blockquote',
- # lists
-# 'itemize' => 'ul',
- 'enumerate' => '',
-# 'multitable' => 'table',
- 'table' => '',
- 'vtable' => '',
- 'ftable' => '',
- 'group' => '',
- 'raggedright' => '',
-# 'detailmenu' => '',
- );
-
- #
- # Controls the layout
- #
-
- $print_page_head = \&T2H_DEFAULT_print_page_head;
- $contents = \&T2H_DEFAULT_contents;
- $shortcontents = \&T2H_DEFAULT_shortcontents;
- $one_section = \&T2H_DEFAULT_one_section;
- $print_Top = \&T2H_DEFAULT_print_Top;
- $print_Top_footer = \&T2H_DEFAULT_print_Top_footer;
- $print_misc_header = \&T2H_DEFAULT_print_misc_header;
- $print_misc_footer = \&T2H_DEFAULT_print_misc_footer;
- $print_section_footer = \&T2H_DEFAULT_print_section_footer;
- $print_chapter_header = \&T2H_DEFAULT_print_chapter_header;
- $print_section_header = \&T2H_DEFAULT_print_section_header;
- $print_chapter_footer = \&T2H_DEFAULT_print_chapter_footer;
- $print_page_foot = \&T2H_DEFAULT_print_page_foot;
- $print_head_navigation = \&T2H_DEFAULT_print_head_navigation;
- $print_foot_navigation = \&T2H_DEFAULT_print_foot_navigation;
- $end_section = \&T2H_DEFAULT_end_section;
- # changed in info
- $print_Footnotes = \&T2H_DEFAULT_print_Footnotes;
- # used if split
- $about_body = \&T2H_DEFAULT_about_body;
- $print_navigation = \&T2H_DEFAULT_print_navigation;
-
- #
- # Controls the formatting
- #
-
- $empty_line = \&t2h_default_empty_line;
- $anchor = \&t2h_default_anchor;
- $anchor_label = \&t2h_default_anchor_label;
- $image = \&t2h_default_image;
- $heading = \&t2h_default_heading;
- $heading_text = \&t2h_default_heading_text;
- $heading_text_preformatted = \&t2h_default_heading_text_preformatted;
- $element_label = \&t2h_default_element_label;
- $index_entry_label = \&t2h_default_index_entry_label;
- #$menu_command = \&t2h_default_menu_command;
- $menu_link = \&t2h_default_menu_link;
- #$menu_description = \&t2h_default_menu_description;
- $paragraph = \&t2h_default_paragraph;
- $preformatted = \&t2h_default_preformatted;
- $protect_text = \&t2h_default_protect_text;
- $normal_text = \&t2h_default_normal_text;
- $acronym_like = \&t2h_default_acronym_like;
- $sp = \&t2h_default_sp;
- $quotation = \&t2h_default_quotation;
- $table_list = \&t2h_default_table_list;
- $list_item = \&t2h_default_list_item;
- $table_line = \&t2h_default_table_line;
- $table_item = \&t2h_default_table_item;
- $cell = \&t2h_default_cell;
- $row = \&t2h_default_row;
- $def_item = \&t2h_default_def_item;
- $def = \&t2h_default_def;
- $def_line = \&t2h_default_def_line;
- $cartouche = \&t2h_default_cartouche;
- $raw = \&t2h_default_raw;
- $format_list_item_texi = \&t2h_default_format_list_item_texi;
- $print_index = \&t2h_default_print_index;
- $index_summary = \&t2h_default_index_summary;
- $index_entry = \&t2h_default_index_entry;
- $index_letter = \&t2h_default_index_letter;
- $foot_line_and_ref = \&t2h_default_foot_line_and_ref;
- $foot_section = \&t2h_default_foot_section;
- $tab_item_texi = \&t2h_default_tab_item_texi;
- $listoffloats = \&t2h_default_listoffloats;
- $listoffloats_entry = \&t2h_default_listoffloats_entry;
- $float = \&t2h_default_float;
-
- t2h_default_set_variables_default();
-}
-
-my %things_map_xml;
-my %pre_map_xml;
-
-sub t2h_default_set_variables_xml()
-{
- t2h_default_set_variables_default();
- set_default('ENABLE_ENCODING_USE_ENTITY', 1);
- set_default('EXTENSION', 'xml');
- t2h_default_set_iso_symbols(1);
-
- $empty_line = \&t2h_default_empty_line;
- $comment = \&xml_default_comment;
- $line_command = \&xml_default_line_command;
-
- %things_map = %things_map_xml;
- %pre_map = %pre_map_xml;
- %simple_format_texi_map = %pre_map;
-
- %simple_format_style_map_texi = ();
- t2h_default_copy_style_map (\%default_style_map_texi,
\%simple_format_style_map_texi);
- foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
- {
-# $simple_format_style_map_texi{$accent_command}->{'args'} = ['normal'];
- $simple_format_style_map_texi{$accent_command}->{'function'} =
\&xml_default_accent;
- }
-}
-
-sub t2h_default_set_variables_texi2html()
-{
- set_default('USE_SETFILENAME', 0);
- set_default('USE_SETFILENAME_EXTENSION', 0);
- set_default('footnotestyle', 'separate');
- set_default('INLINE_CONTENTS', 0);
- set_default('FORCE', 1);
- set_default('AVOID_MENU_REDUNDANCY', 1);
- set_default('TOP_HEADING_AT_BEGINNING', 1);
- set_default('TOP_FILE', '');
- set_default('USE_ACCESSKEY', 0);
- set_default('NODE_NAME_IN_MENU', 0);
- set_default('OVERVIEW_LINK_TO_TOC', 0);
- set_default('USE_UP_FOR_ADJACENT_NODES', 1);
- set_default('USE_REL_REV', 0);
- set_default('USE_LINKS', 0);
- set_default('USE_NODES', undef);
- set_default('USE_SECTIONS', 1);
- set_default('NODE_FILENAMES', 0);
- set_default('USE_NUMERIC_ENTITY', 1);
- set_default('SPLIT', '');
- set_default('SPLIT_INDEX', 100);
- set_default('PROGRAM_NAME_IN_FOOTER', 1);
- set_default('HEADER_IN_TABLE', 1);
- set_default('SHORT_REF', 0);
- set_default('USE_TITLEPAGE_FOR_TITLE', 1);
- $MENU_ENTRY_COLON = '';
- $INDEX_ENTRY_COLON = '';
-
- set_default('ENABLE_ENCODING_USE_ENTITY', 1);
-}
-
-# specify in this array which "buttons" should appear in which order
-# in the navigation panel for sections; use ' ' for empty buttons (space)
address@hidden =
- (
- 'FastBack', 'Back', 'Up', 'Forward', 'FastForward',
- ' ', ' ', ' ', ' ',
- 'Top', 'Contents', 'Index', 'About',
- );
-
-# buttons for misc stuff
address@hidden = ('Top', 'Contents', 'Index', 'About');
-
address@hidden = ( 'Back', 'Forward', ' ','Contents', 'Index', 'About');
address@hidden = ('Top', 'Contents', 'Index', 'About');
-
-
-# buttons for chapter file footers
-# (and headers but only if HEADERS is false)
address@hidden =
- (
- 'FastBack', 'FastForward', ' ',
- ' ', ' ', ' ', ' ',
- 'Top', 'Contents', 'Index', 'About',
- );
-
-# buttons for section file footers
address@hidden =
- (
- 'FastBack', 'Back', 'Up', 'Forward', 'FastForward',
- );
-
address@hidden = @SECTION_BUTTONS;
-
address@hidden =
- (
- 'Top', 'Index', 'Contents', 'About', 'Up', 'NextFile', 'PrevFile'
- );
-
-
-# insert here name of icon images for buttons
-# Icons are used, if ICONS and resp. value are set
-%ACTIVE_ICONS =
- (
- 'Top', '',
- 'Contents', '',
- 'Overview', '',
- 'Index', '',
- 'This', '',
- 'Back', '',
- 'FastBack', '',
- 'Prev', '',
- 'Up', '',
- 'Next', '',
- 'NodeUp', '',
- 'NodeNext', '',
- 'NodePrev', '',
- 'NodeForward', '',
- 'NodeBack', '',
- 'Forward', '',
- 'FastForward', '',
- 'About' , '',
- 'First', '',
- 'Last', '',
- 'NextFile', '',
- 'PrevFile', '',
- ' ', '',
- );
-
-# insert here name of icon images for these, if button is inactive
-%PASSIVE_ICONS =
- (
- 'Top', '',
- 'Contents', '',
- 'Overview', '',
- 'Index', '',
- 'This', '',
- 'Back', '',
- 'FastBack', '',
- 'Prev', '',
- 'Up', '',
- 'Next', '',
- 'NodeUp', '',
- 'NodeNext', '',
- 'NodePrev', '',
- 'NodeForward', '',
- 'NodeBack', '',
- 'Forward', '',
- 'FastForward', '',
- 'About', '',
- 'First', '',
- 'Last', '',
- 'NextFile', '',
- 'PrevFile', '',
- );
-
-%misc_pages_targets = (
- 'Overview' => 'SEC_Overview',
- 'Contents' => 'SEC_Contents',
- 'Footnotes' => 'SEC_Foot',
- 'About' => 'SEC_About'
-);
-
-# determine the null devices
-my $default_null_device = File::Spec->devnull();
-%null_device_file = (
- $default_null_device => 1
-);
-# special case, djgpp recognizes both null devices
-if ($Config{osname} eq 'dos' and $Config{osvers} eq 'djgpp')
-{
- $null_device_file{'/dev/null'} = 1;
- $null_device_file{'NUL'} = 1;
-}
-
-%texi2dvi_formats = (
- 'dvi' => 1,
- 'pdf' => 1,
- 'ps' => 1
-);
-
-$finish_out = \&t2h_default_finish_out;
-$translate_names = \&t2h_default_translate_names;
-
-sub t2h_default_translate_names()
-{
-# Names of text as alternative for icons
-# FIXME maybe get those in simple_format?
- %NAVIGATION_TEXT =
- (
- 'Top', gdt('Top'),
- 'Contents', gdt('Contents'),
- 'Overview', gdt('Overview'),
- 'Index', gdt('Index'),
- ' ', ' ',
- 'This', gdt('Current'),
- 'Back', ' < ',
- 'FastBack', ' << ',
- 'Prev', gdt('Previous'),
- 'Up', gdt('Up'),
- 'Next', gdt('Next'),
- 'NodeUp', gdt('Up'),
- 'NodeNext', gdt('Next'),
- 'NodePrev', gdt('Previous'),
- 'NodeForward', gdt('Forward node'),
- 'NodeBack', gdt('Back node'),
- 'Forward', ' > ',
- 'FastForward', ' >> ',
- 'About', ' ? ',
- 'First', ' |< ',
- 'Last', ' >| ',
- 'NextFile', gdt('Next file'),
- 'PrevFile', gdt('Previous file'),
- );
- %BUTTONS_TEXT = %NAVIGATION_TEXT;
-
- %BUTTONS_GOTO =
- (
- 'Top', gdt('Cover (top) of document'),
- 'Contents', gdt('Table of contents'),
- 'Overview', gdt('Short table of contents'),
- 'Index', gdt('Index'),
- 'This', gdt('Current section'),
- 'Back', gdt('Previous section in reading order'),
- 'FastBack', gdt('Beginning of this chapter or previous chapter'),
- 'Prev', gdt('Previous section on same level'),
- 'Up', gdt('Up section'),
- 'Next', gdt('Next section on same level'),
- 'NodeUp', gdt('Up node'),
- 'NodeNext', gdt('Next node'),
- 'NodePrev', gdt('Previous node'),
- 'NodeForward', gdt('Next node in node reading order'),
- 'NodeBack', gdt('Previous node in node reading order'),
- 'Forward', gdt('Next section in reading order'),
- 'FastForward', gdt('Next chapter'),
- 'About' , gdt('About (help)'),
- 'First', gdt('First section in reading order'),
- 'Last', gdt('Last section in reading order'),
- 'NextFile', gdt('Forward section in next file'),
- 'PrevFile', gdt('Back section in previous file'),
- );
-
- %BUTTONS_NAME =
- (
- 'Top', gdt('Top'),
- 'Contents', gdt('Contents'),
- 'Overview', gdt('Overview'),
- 'Index', gdt('Index'),
- ' ', ' ',
- 'This', gdt('This'),
- 'Back', gdt('Back'),
- 'FastBack', gdt('FastBack'),
- 'Prev', gdt('Prev'),
- 'Up', gdt('Up'),
- 'Next', gdt('Next'),
- 'NodeUp', gdt('NodeUp'),
- 'NodeNext', gdt('NodeNext'),
- 'NodePrev', gdt('NodePrev'),
- 'NodeForward', gdt('NodeForward'),
- 'NodeBack', gdt('NodeBack'),
- 'Forward', gdt('Forward'),
- 'FastForward', gdt('FastForward'),
- 'About', gdt('About'),
- 'First', gdt('First'),
- 'Last', gdt('Last'),
- 'NextFile', gdt('NextFile'),
- 'PrevFile', gdt('PrevFile'),
- );
-
-}
-
-sub t2h_default_set_iso_symbols($;$$)
-{
- my $value = shift;
- my $from_cmd_line = shift;
- my $from_document = shift;
- if ($from_cmd_line)
- {
- main::set_from_cmdline('USE_ISO', $value);
- }
- elsif ($from_document)
- {
- set_from_document('USE_ISO', $value);
- }
- else
- {
- set_default('USE_ISO', $value);
- }
- my ($open_quote, $close_quote);
- if ($value)
- {
- foreach my $association ([\%things_map, \%things_map_xml],
- [\%pre_map, \%pre_map_xml],
- [\%simple_format_simple_map_texi, \%pre_map_xml])
- {
- foreach my $thing (keys(%{$association->[0]}))
- {
- if (defined($association->[0]->{$thing}) and
$association->[0]->{$thing} !~ /^\&\w+\;$/ and
defined($association->[1]->{$thing}) and $association->[1]->{$thing} =~
/^\&\w+\;$/)
- {
- $association->[0]->{$thing} = $association->[1]->{$thing};
- }
- }
- }
- t2h_add_text_substitutions(["'", '’'], 1, 0, 0, 1);
- t2h_add_text_substitutions(['`', '‘'], 1, 0, 0, 1);
- $open_quote = '‘';
- $close_quote = '’';
- }
- else
- {
- foreach my $association ([\%things_map, \%default_things_map],
- [\%pre_map, \%default_things_map],
- [\%simple_format_simple_map_texi,
\%default_things_map])
- {
- foreach my $thing (keys(%{$association->[0]}))
- {
- if (defined($association->[0]->{$thing}) and
$association->[0]->{$thing} =~ /^\&\w+\;$/ and
defined($association->[1]->{$thing}) and $association->[1]->{$thing} !~
/^\&\w+\;$/)
- {
- $association->[0]->{$thing} =
&$protect_text($association->[1]->{$thing});
- }
- }
- }
- t2h_remove_text_substitutions("'", 1, 0, 0, 1);
- t2h_remove_text_substitutions('`', 1, 0, 0, 1);
- $open_quote = '`';
- $close_quote = "'";
- }
- if ($from_cmd_line)
- {
- main::set_from_cmdline('OPEN_QUOTE_SYMBOL', $open_quote);
- main::set_from_cmdline('CLOSE_QUOTE_SYMBOL', $close_quote);
- }
- elsif ($from_document)
- {
- main::set_from_document('OPEN_QUOTE_SYMBOL', $open_quote);
- main::set_from_document('CLOSE_QUOTE_SYMBOL', $close_quote);
- }
- else
- {
- set_default('OPEN_QUOTE_SYMBOL', $open_quote);
- set_default('CLOSE_QUOTE_SYMBOL', $close_quote);
- }
-
-}
-
-# is used in main program for dumping texi too.
-sub t2h_default_set_out_encoding()
-{
- # set in reverse order of precedence, such that later setting
- # override the first settings.
- my $out_encoding_from_documentencoding = main::encoding_alias
(get_conf('documentencoding'), undef, 'determining encoding from
documentencoding');
- set_from_document('OUT_ENCODING', $out_encoding_from_documentencoding) if
(defined($out_encoding_from_documentencoding));
- set_from_document('OUT_ENCODING', get_conf('IN_ENCODING')) if
(defined(get_conf('IN_ENCODING')));
- my $out_encoding_from_encoding_name = main::encoding_alias
(get_conf('ENCODING_NAME'), undef, 'determining encoding from default
encoding');
- set_from_document('OUT_ENCODING', $out_encoding_from_encoding_name) if
(defined($out_encoding_from_encoding_name));
-
- main::document_warn (__("Document encoding is utf8, but there is no
unicode support")) if (defined(get_conf('OUT_ENCODING')) and
get_conf('OUT_ENCODING') eq 'utf-8' and !get_conf('USE_UNICODE'));
-
- set_from_document('ENCODING_NAME', 'us-ascii');
- set_from_document('ENCODING_NAME',
$perl_charset_to_html{get_conf('DEFAULT_ENCODING')}) if
(defined(get_conf('DEFAULT_ENCODING')) and
defined($perl_charset_to_html{get_conf('DEFAULT_ENCODING')}));
- set_from_document('ENCODING_NAME', get_conf('documentencoding')) if
(defined(get_conf('documentencoding')));
- set_from_document('ENCODING_NAME', get_conf('IN_ENCODING')) if
(defined(get_conf('IN_ENCODING')));
- set_from_document('ENCODING_NAME', get_conf('OUT_ENCODING')) if
(defined(get_conf('OUT_ENCODING')));
- set_from_document('ENCODING_NAME',
$perl_charset_to_html{get_conf('documentencoding')}) if
(defined(get_conf('documentencoding')) and
defined($perl_charset_to_html{get_conf('documentencoding')}));
- set_from_document('ENCODING_NAME',
$perl_charset_to_html{get_conf('IN_ENCODING')}) if
(defined(get_conf('IN_ENCODING')) and
defined($perl_charset_to_html{get_conf('IN_ENCODING')}));
- set_from_document('ENCODING_NAME',
$perl_charset_to_html{get_conf('OUT_ENCODING')}) if
(defined(get_conf('OUT_ENCODING')) and
defined($perl_charset_to_html{get_conf('OUT_ENCODING')}));
-
-
- if (get_conf('VERBOSE'))
- {
- # verbose output
- my $out_encoding = get_conf('OUT_ENCODING');
- $out_encoding = 'UNDEF' if (!defined($out_encoding));
- my $in_encoding = get_conf('IN_ENCODING');
- $in_encoding = 'UNDEF' if (!defined($in_encoding));
- my $document_encoding = get_conf('documentencoding');
- $document_encoding = 'UNDEF' if (!defined($document_encoding));
- my $encoding_name = get_conf('ENCODING_NAME');
- print STDERR "# Encodings: doc $document_encoding, in $in_encoding out
$out_encoding, name $encoding_name\n";
- }
-}
-
-sub t2h_default_init_out()
-{
- &$translate_names;
- # set external cross ref splitting like splitting.
- if (get_conf('SPLIT'))
- {
- set_from_document('EXTERNAL_CROSSREF_SPLIT', 1);
- }
- else
- {
- set_from_document('EXTERNAL_CROSSREF_SPLIT', 0);
- }
-}
-
-my %t2h_default_formats_load_table = (
- 'html' => \&html_default_load,
- 'info' => \&info_default_load,
- 'docbook' => \&docbook_default_load,
- 'xml' => \&xml_default_load,
- 'plaintext' => \&plaintext_default_load,
- 'raw-text' => \&t2h_default_raw_text_load,
-);
-
-sub t2h_default_load_format($;$)
-{
- my $format = shift;
- my $from_command_line = shift;
- if (defined($t2h_default_formats_load_table{$format}) or
$texi2dvi_formats{$format})
- {
- $OUTPUT_FORMAT = $format;
- &{$t2h_default_formats_load_table{$format}}($from_command_line) unless
($texi2dvi_formats{$format});
- $Texi2HTML::THISDOC{'format_from_command_line'} = $format if
($from_command_line);
- return 1;
- }
- else
- {
- return 0;
- }
-}
-
-sub t2h_encoding_is_entity($)
-{
- my $text = shift;
- return 0 if (!get_conf('ENABLE_ENCODING_USE_ENTITY'));
- return 1 if ($text =~ /^&/ and $text =~ /;$/);
-}
-
-# this is for info.init
-use vars qw(%t2h_enable_encoding_default_accent);
-my @t2h_enable_encoding_accents_stack;
-my %t2h_enable_encoding_default_commands;
-
-sub t2h_enable_encoding_load()
-{
- t2h_default_push_handler(\&t2h_enable_encoding_init, address@hidden);
- t2h_default_push_handler(\&t2h_enable_encoding_finish, address@hidden);
- #push @command_handler_process, \&t2h_enable_encoding_init;
- #push @command_handler_finish, \&t2h_enable_encoding_finish;
- foreach my $key (keys(%unicode_accents), 'dotless')
- {
- $t2h_enable_encoding_default_accent{'normal'}->{$key} =
$style_map{$key}->{'function'};
- $t2h_enable_encoding_default_accent{'texi'}->{$key} =
$style_map_texi{$key}->{'function'};
- $t2h_enable_encoding_default_accent{'pre'}->{$key} =
$style_map_pre{$key}->{'function'};
- $style_map{$key}->{'function'} = \&t2h_enable_encoding_normal_accent;
- $style_map_texi{$key}->{'function'} = \&t2h_enable_encoding_texi_accent;
- $style_map_pre{$key}->{'function'} = \&t2h_enable_encoding_pre_accent;
- }
- foreach my $key (%things_map)
- {
- if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
- {
- $t2h_enable_encoding_default_commands{'normal'}->{$key} =
$things_map{$key};
- $t2h_enable_encoding_default_commands{'texi'}->{$key} = $texi_map{$key};
- $t2h_enable_encoding_default_commands{'sorting'}->{$key} =
$sorting_things_map{$key};
- $t2h_enable_encoding_default_commands{'pre'}->{$key} = $pre_map{$key};
- }
- }
-}
-
-sub t2h_enable_encoding_finish()
-{
- foreach my $key (%things_map)
- {
- if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
- {
- $things_map{$key} =
$t2h_enable_encoding_default_commands{'normal'}->{$key};
- $texi_map{$key} = $t2h_enable_encoding_default_commands{'texi'}->{$key};
- $sorting_things_map{$key} =
$t2h_enable_encoding_default_commands{'sorting'}->{$key};
- $pre_map{$key} = $t2h_enable_encoding_default_commands{'pre'}->{$key};
- }
- }
-}
-
-sub t2h_enable_encoding_init()
-{
- if (get_conf('ENCODING_NAME') eq 'utf-8')
- {
- foreach my $key (%things_map)
- {
- if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
- {
- $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
- $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
- $sorting_things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($sorting_things_map{$key}));
- $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
- }
- }
- }
- elsif (exists($makeinfo_encoding_to_map{get_conf('ENCODING_NAME')}))
- {
- my $enc_map = $makeinfo_encoding_to_map{get_conf('ENCODING_NAME')};
-
- foreach my $key (%things_map)
- {
- if (exists($unicode_map{$key}) and ($unicode_map{$key} ne '') and
- exists($makeinfo_unicode_to_eight_bit{$enc_map}->{$unicode_map{$key}}))
- { # we let perl handle the conversion
- $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
- $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
- $sorting_things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($sorting_things_map{$key}));
- $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
- }
- }
- @t2h_enable_encoding_accents_stack = ();
- }
-}
-
-sub t2h_default_string_width($)
-{
- my $string = shift;
- if (get_conf('USE_UNICODE'))
- {
- my $width = 0;
- foreach my $character(split '', $string)
- {
- if ($character =~ /\p{Unicode::EastAsianWidth::InFullwidth}/)
- {
- $width += 2;
- }
- else
- {
- $width += 1;
- }
- }
- return $width;
- }
- else
- {
- return length($string);
- }
-}
-
-sub t2h_default_finish_out()
-{
-}
-
-
-########################################################################
-# Control of Page layout:
-# You can make changes of the Page layout at two levels:
-# 1.) For small changes, it is often enough to change the value of
-# some global string/hash/array variables
-# 2.) For larger changes, reimplement one of the T2H_DEFAULT_<fnc>* routines,
-# give them another name, and assign them to the respective
-# $<fnc> variable.
-
-# As a general interface, the hashes Texi2HTML::HREF, Texi2HTML::NAME,
Texi2HTML::NODE, Texi2HTML::NO_TEXI, Texi2HTML::SIMPLE_TEXT hold
-# href, html-name, node-name, name after removal of texi commands of
-# This -- current section (resp. html page)
-# Top -- top element
-# Contents -- Table of contents element
-# Overview -- Short table of contents element
-# Index -- Index page element
-# About -- page which explain "navigation buttons" element
-# First -- first node element
-# Last -- last node element
-#
-# Whether or not the following hash values are set, depends on the context
-# (all values are w.r.t. 'This' section)
-# Next -- next element of texinfo
-# Prev -- previous element of texinfo
-# NodeUp -- up node of texinfo
-# NodeForward -- next node in node reading order, taking menu into account
-# NodeBack -- previous node in node reading order, taking menu into account
-# Forward -- next node in reading order
-# Back -- previous node in reading order
-# Up -- parent given by sectioning commands
-# FastForward -- if leave node, up and next, else next node
-# FastBack -- if leave node, up and prev, else prev node
-#
-# Furthermore, the following global variabels are set:
-# $Texi2HTML::THISDOC{'title'} -- title as set by @title...
-# $Texi2HTML::THISDOC{'title_no_texi'} -- title without texi (without html
elements)
-# $Texi2HTML::THISDOC{'title_texi'} -- title with texinfo @-commands
-# $Texi2HTML::THISDOC{'fulltitle'} -- full title as set by @title...
-# $Texi2HTML::THISDOC{'subtitle'} -- subtitle as set by @subtitle
-# $Texi2HTML::THISDOC{'author'} -- author as set by @author
-# $Texi2HTML::THISDOC{'copying_comment'} -- text of @copying and @end copying
in comment
-#
-# $Texi2HTML::THISDOC{'program'} -- name of program generating the
output
-# $Texi2HTML::THISDOC{'program_homepage'} -- homepage of program
-# $Texi2HTML::THISDOC{'toc_file} -- table of contents file
-# $Texi2HTML::THISDOC{'file_base_name'} -- base name of the texinfo manual
file
-# $Texi2HTML::THISDOC{'input_file_name'} -- name of the texinfo manual file
-# $Texi2HTML::THISDOC{'destination_directory'}
- # -- directory for the resulting files
-# $Texi2HTML::THISDOC{'css_import_lines'} -- ref on @import lines in css files
-# $Texi2HTML::THISDOC{'css_rule_lines'} -- ref on css rules lines
-#
-# and pointer to arrays of lines which need to be printed by main::print_lines
-# $Texi2HTML::THIS_SECTION -- lines of 'This' section
-# $Texi2HTML::OVERVIEW -- lines of short table of contents
-# $Texi2HTML::TOC_LINES -- lines of table of contents
-# $Texi2HTML::TITLEPAGE -- lines of title page
-#
-# $Texi2HTML::THIS_ELEMENT holds the element reference.
-
-# most of the functions are either reset when switching format, in
-# t2h_default_set_variables_default, or set in format, the simplest
-# one being setup above in t2h_default_raw_text_load
-
-#
-# The following generic subs control the layout:
-#
-# misc element formatting functions. They are rather generic,
-# their call is controlled by other variables (separate or not
-# footnotes, about_body, handling of table of contents...).
-# print_Footnotes is the only to be redefined, in info
-$print_Toc = \&T2H_DEFAULT_print_Toc;
-$print_Overview = \&T2H_DEFAULT_print_Overview;
-$print_About = \&T2H_DEFAULT_print_About;
-$print_misc = \&T2H_DEFAULT_print_misc;
-# generic enough (call print_page_head if needed)
-$print_Top_header = \&T2H_DEFAULT_print_Top_header;
-
-# the following are less generic, but in case a specific format
-# doesn't redefine them, the raw text functions are always defined.
-$print_page_head = \&T2H_DEFAULT_print_page_head;
-$contents = \&T2H_DEFAULT_contents;
-$shortcontents = \&T2H_DEFAULT_shortcontents;
-$one_section = \&T2H_DEFAULT_one_section;
-$print_Top = \&T2H_DEFAULT_print_Top;
-$print_Top_footer = \&T2H_DEFAULT_print_Top_footer;
-$print_misc_header = \&T2H_DEFAULT_print_misc_header;
-$print_misc_footer = \&T2H_DEFAULT_print_misc_footer;
-$print_section_footer = \&T2H_DEFAULT_print_section_footer;
-$print_chapter_header = \&T2H_DEFAULT_print_chapter_header;
-$print_section_header = \&T2H_DEFAULT_print_section_header;
-$print_chapter_footer = \&T2H_DEFAULT_print_chapter_footer;
-$print_page_foot = \&T2H_DEFAULT_print_page_foot;
-$print_head_navigation = \&T2H_DEFAULT_print_head_navigation;
-$print_foot_navigation = \&T2H_DEFAULT_print_foot_navigation;
-$end_section = \&T2H_DEFAULT_end_section;
-# changed in info
-$print_Footnotes = \&T2H_DEFAULT_print_Footnotes;
-# used if split
-$about_body = \&T2H_DEFAULT_about_body;
-$print_navigation = \&T2H_DEFAULT_print_navigation;
-
-#
-# generic formatting functions
-#
-
-$button_icon_img = \&T2H_DEFAULT_button_icon_img;
-# not really needed nor relevant except for html
-$print_frame = \&T2H_DEFAULT_print_frame;
-$print_toc_frame = \&T2H_DEFAULT_print_toc_frame;
-# generic
-$titlepage = \&T2H_DEFAULT_titlepage;
-$css_lines = \&T2H_DEFAULT_css_lines;
-$print_redirection_page = \&T2H_DEFAULT_print_redirection_page;
-$node_file_name = \&T2H_DEFAULT_node_file_name;
-$inline_contents = \&T2H_DEFAULT_inline_contents;
-$program_string = \&T2H_DEFAULT_program_string;
-$element_file_name = \&t2h_default_element_file_name;
-
-########################################################################
-# Layout for every sections
-#
-
-sub T2H_DEFAULT_print_section($$$$)
-{
- my $fh = shift;
- my $first_in_page = shift;
- my $previous_is_top = shift;
- my $element = shift;
-
- my $nw = main::print_lines($fh);
-}
-
-sub T2H_DEFAULT_one_section($$)
-{
- my $fh = shift;
- my $element = shift;
- main::print_lines($fh);
- &$print_page_foot($fh);
-}
-
-###################################################################
-# Layout of top-page. It is possible to use @ifnothtml, @ifhtml,
-# @html within the Top texinfo node to specify content of top-level
-# page.
-#
-sub T2H_DEFAULT_print_Top_header($$)
-{
- my $fh = shift;
- my $do_page_head = shift;
- &$print_page_head($fh) if ($do_page_head);
-}
-sub T2H_DEFAULT_print_Top_footer($$$)
-{
- my $fh = shift;
- my $end_page = shift;
- my $element = shift;
- if ($end_page)
- {
- &$print_page_foot($fh);
- }
-}
-
-sub T2H_DEFAULT_print_Top($$$)
-{
- my $fh = shift;
- my $has_top_heading = shift;
- my $element = shift;
-
- if (get_conf('setshortcontentsaftertitlepage'))
- {
- my $shortcontents = &$inline_contents($fh, 'shortcontents');
- print $fh "".join('',@$shortcontents) if (defined($shortcontents));
- }
- if (get_conf('setcontentsaftertitlepage'))
- {
- my $contents = &$inline_contents($fh, 'contents');
- print $fh "".join('',@$contents) if (defined($contents));
- }
-
- main::print_lines($fh, $Texi2HTML::THIS_SECTION);
-}
-
-###################################################################
-# Layout of Toc, Overview, and Footnotes pages
-# By default, we use "normal" layout
-# Texi2HTML::HREF of Next, Prev, Up, Forward, Back, etc are not defined
-# redefine address@hidden to change the navigation
-sub T2H_DEFAULT_print_Toc
-{
- return &$print_misc(@_);
-}
-sub T2H_DEFAULT_print_Overview
-{
- return &$print_misc(@_);
-}
-sub T2H_DEFAULT_print_Footnotes
-{
- return &$print_misc(@_);
-}
-sub T2H_DEFAULT_print_About
-{
- return &$print_misc(@_);
-}
-
-sub T2H_DEFAULT_print_misc_header($$$$)
-{
- my $fh = shift;
- my $buttons = shift;
- my $new_file = shift;
- my $misc_page = shift;
- &$print_page_head($fh) if ($new_file);
-}
-
-sub T2H_DEFAULT_print_misc_footer($$$)
-{
- my $fh = shift;
- my $buttons = shift;
- my $new_file = shift;
- if ($new_file)
- {
- &$print_page_foot($fh);
- }
-}
-
-use vars qw(
-%t2h_default_underline_symbol
-);
-
-%t2h_default_underline_symbol = (
- 0 => '*',
- 1 => '*',
- 2 => '=',
- 3 => '-',
- 4 => '.'
-);
-
-sub t2h_default_heading_text($$$)
-{
- my $command = shift;
- my $text = shift;
- my $level = shift;
-
- return '' if ($text !~ /\S/);
- my $result = $text ."\n";
- # as seen in encodings/nodetest_utf8_no_unicode, the length can be in
- # bytes (certainly) when there hasn't been a require Encode
- #$result .=($t2h_default_underline_symbol{$level} x length($text))."\n";
- $result .=($t2h_default_underline_symbol{$level} x
t2h_default_string_width($text))."\n";
- return $result;
-}
-
-sub t2h_default_heading_text_preformatted($$$)
-{
- my $command = shift;
- my $text = shift;
- my $level = shift;
-
- return t2h_default_heading_text($command, $text, $level);
-}
-
-sub T2H_DEFAULT_print_misc($$$)
-{
- my $fh = shift;
- my $new_file = shift;
- my $misc_page = shift;
- my $buttons = address@hidden;
- &$print_misc_header($fh, $buttons, $new_file, $misc_page);
- print $fh "".&$heading_text('misc heading', $Texi2HTML::NAME{This}, 1) .
"\n";
- main::print_lines($fh);
- &$print_misc_footer($fh, $buttons, $new_file);
-}
-##################################################################
-# section_footer is only called if SPLIT eq 'section'
-# section_footer: after print_section of last section, before print_page_foot
-#
-
-sub T2H_DEFAULT_print_section_footer
-{
- my $fh = shift;
- my $element = shift;
-}
-
-###################################################################
-# chapter_header and chapter_footer are only called if
-# SPLIT eq 'chapter'
-# chapter_header: after print_page_head, before print_section
-# chapter_footer: after print_section of last section, before print_page_foot
-
-sub T2H_DEFAULT_print_chapter_header($$)
-{
- my $fh = shift;
- my $element = shift;
-}
-
-sub T2H_DEFAULT_print_chapter_footer($$)
-{
- my $fh = shift;
- my $element = shift;
-}
-
-sub T2H_DEFAULT_print_section_header($$)
-{
- my $fh = shift;
- my $element = shift;
-}
-
-
-###################################################################
-# Layout of standard header and footer
-#
-
-sub T2H_DEFAULT_print_page_head($)
-{
- my $fh = shift;
-}
-
-sub T2H_DEFAULT_program_string()
-{
- my $date = get_conf('today');
- $date = '' if (!defined($date));
- if ($date ne '')
- {
- return gdt('This document was generated on @emph{{date}} using
@uref{{program_homepage}, @emph{{program}}}.', {
- 'date' => $date, 'program_homepage' =>
$Texi2HTML::THISDOC{'program_homepage'}, 'program' =>
$Texi2HTML::THISDOC{'program_and_version'} },{'duplicate'=>1});
- }
- return gdt('This document was generated using @uref{{program_homepage},
@emph{{program}}}.', {
- 'program_homepage' => $Texi2HTML::THISDOC{'program_homepage'}, 'program'
-=> $Texi2HTML::THISDOC{'program_and_version'} },{'duplicate'=>1});
-}
-
-sub T2H_DEFAULT_end_section($$$)
-{
- my $fh = shift;
- my $misc_or_top_and_section_separation = shift;
- my $element = shift;
-}
-
-sub T2H_DEFAULT_print_page_foot($)
-{
- my $fh = shift;
-}
-
-###################################################################
-# Layout of navigation panel
-
-sub T2H_DEFAULT_print_head_navigation($$$$$)
-{
- my $fh = shift;
- my $buttons = shift;
- my $first_in_page = shift;
- my $previous_is_top = shift;
- my $element = shift;
-
- return '';
-}
-
-sub T2H_DEFAULT_print_foot_navigation($$$$$;$)
-{
- my $fh = shift;
- my $buttons = shift;
- my $rule = shift;
- my $print_navigation_panel = shift;
- my $element = shift;
- my $maybe_in_page = shift;
-
- $rule = '' if (!defined($rule));
- print $fh "$rule\n" if ($rule ne '');
-}
-
-######################################################################
-# navigation panel
-#
-# how to create IMG tag
-# this is only used in html, and only if ICONS is set and the button
-# is active.
-sub T2H_DEFAULT_button_icon_img
-{
- my $button = shift;
- my $icon = shift;
- my $name = shift;
- return '' if (!defined($icon));
- $button = "" if (!defined ($button));
- $name = '' if (!defined($name));
- my $alt = '';
- if ($name ne '')
- {
- if ($button ne '')
- {
- $alt = "$button: $name";
- }
- else
- {
- $alt = $name;
- }
- }
- else
- {
- $alt = $button;
- }
- return "$icon $alt";
-}
-
-sub T2H_DEFAULT_print_navigation
-{
- my $buttons = shift;
- my $vertical = shift;
-
- return '';
-}
-
-######################################################################
-# Frames: this is from "Richard Y. Kim" <address@hidden>
-# Should be improved to be more conforming to other _print* functions
-# toc_file and main_file passed as args are relative to the texinfo manual
-# location, and therefore are not used.
-
-# no-ops in the default case, doesn't really make sense if output is
-# not html
-
-sub T2H_DEFAULT_print_frame
-{
- my $fh = shift;
- my $toc_file = shift;
- my $main_file = shift;
- $main_file = $Texi2HTML::THISDOC{'filename'}->{'top'};
- $toc_file = $Texi2HTML::THISDOC{'filename'}->{'toc_frame'};
-}
-
-sub T2H_DEFAULT_print_toc_frame
-{
- my $fh = shift;
- my $stoc_lines = shift;
-}
-
-# This subroutine is intended to fill @Texi2HTML::TOC_LINES and
-# @Texi2HTML::OVERVIEW with the table of contents and short table of
-# contents.
-#
-# arguments:
-# ref on an array containing all the elements
-
-# each element is a reference on a hash. The following keys might be of
-# use:
-# 'top': true if this is the top element
-# 'toc_level': level of the element in the table of content. Highest level
-# is 1 for the @top element and for chapters, appendix and so on,
-# 2 for section, unnumberedsec and so on...
-# 'tocid': label used for reference linking to the element in table of
-# contents
-# 'file': the file containing the element, usefull to do href to that file
-# in case the document is split.
-# 'text': text of the element, with section number
-# 'text_nonumber': text of the element, without section number
-
-# Relevant configuration variables are:
-# $NO_BULLET_LIST_ATTRIBUTE: usefull in case a list is used
-# $FRAMES: @Texi2HTML::OVERVIEW is used in one of the frames.
-# $BEFORE_OVERVIEW
-# $AFTER_OVERVIEW
-# $BEFORE_TOC_LINES
-# $AFTER_TOC_LINES
-# get_conf('contents')
-# get_conf('shortcontents')
-
-sub T2H_DEFAULT_contents($$)
-{
- my $elements = shift;
- my $toc_file = shift;
- my @result;
- return unless (get_conf('contents'));
- foreach my $element (@$elements)
- {
- my $level = $element->{'toc_level'};
- $level = 1 if ($level < 1);
- my $text = $element->{'text'};
- my $result = (' ' x ($level - 1)) . $text ."\n";
- push @result, $result;
- }
- if (@result)
- {
- unshift @result, $BEFORE_TOC_LINES;
- push @result, $AFTER_TOC_LINES;
- }
- return address@hidden;
-}
-
-sub T2H_DEFAULT_shortcontents($$)
-{
- my $elements = shift;
- my $stoc_file = shift;
- my @result;
- return unless (get_conf('shortcontents'));
- foreach my $element (@$elements)
- {
- my $level = $element->{'toc_level'};
- next if ($level > 1);
- $level = 1 if ($level < 1);
- my $text = $element->{'text'};
- push @result, $text ."\n";
- }
- if (@result)
- {
- unshift @result, $BEFORE_OVERVIEW;
- push @result, $AFTER_OVERVIEW;
- }
- return address@hidden;
-}
-
-sub T2H_DEFAULT_print_title()
-{
- my $element = shift;
- return undef unless (get_conf('SHOW_TITLE'));
- if (get_conf('USE_TITLEPAGE_FOR_TITLE'))
- {
- my ($titlepage_text, $titlepage_no_texi, $titlepage_simple_format) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
-
- &$titlepage([],$titlepage_text, $titlepage_no_texi,
$titlepage_simple_format);
- return $Texi2HTML::TITLEPAGE;
- }
- else
- {
- my $title = '';
- $title = $Texi2HTML::THISDOC{'simpletitle'} if
(defined($Texi2HTML::THISDOC{'simpletitle'}) and
$Texi2HTML::THISDOC{'simpletitle'} !~ /^\s*$/);
- if ($title ne '')
- {
- return &$heading_text('@settitle', $title, 0) . "\n";
- }
- }
-}
-
-sub T2H_DEFAULT_toc_body($)
-{
- my $elements_list = shift;
- my $toc_lines = &$contents($elements_list,
$Texi2HTML::THISDOC{'toc_file'});
- @{$Texi2HTML::TOC_LINES} = @$toc_lines if ($toc_lines);
- my $stoc_lines = &$shortcontents($elements_list,
$Texi2HTML::THISDOC{'stoc_file'});
- @{$Texi2HTML::OVERVIEW} = @$stoc_lines if ($stoc_lines);
-}
-
-# element and elements_list may not be undef when called from the
-# main program, but may be if called from other customization function,
-# for example, here, print_Top.
-sub T2H_DEFAULT_inline_contents($$$$)
-{
- my $fh = shift;
- my $command = shift;
- my $element = shift;
- my $elements_list = shift;
- my $name;
- my $lines;
-
- my $toc_file;
- $toc_file = $element->{'file'} if (defined($element));
-
- my $result = undef;
-
- if ($command eq 'contents')
- {
- $name = $Texi2HTML::NAME{'Contents'};
- $toc_file = $Texi2HTML::THISDOC{'toc_file'} if (!defined($toc_file));
- if (defined($elements_list))
- {
- $lines = &$contents($elements_list, $toc_file);
- }
- else
- {
- $lines = $Texi2HTML::TOC_LINES;
- }
- }
- else
- {
- $name = $Texi2HTML::NAME{'Overview'};
- $toc_file = $Texi2HTML::THISDOC{'stoc_file'} if (!defined($toc_file));
- if (defined($elements_list))
- {
- $lines = &$shortcontents($elements_list, $toc_file);
- }
- else
- {
- $lines = $Texi2HTML::OVERVIEW;
- }
- }
- if ($lines and @{$lines})
- {
- $result = [ &$heading_text("address@hidden", $name, 1), "\n" ];
- my $contents_anchor = &$anchor($element->{'id'});
- if (defined($contents_anchor) and $contents_anchor =~ /\S/)
- {
- unshift @$result, $contents_anchor."\n";
- }
- push @$result, (@$lines, "\n");
- }
- return $result;
-}
-
-
-sub T2H_DEFAULT_css_lines ($$)
-{
- my $import_lines = shift;
- my $rule_lines = shift;
- return if ((address@hidden and address@hidden and !keys(%css_map) and
address@hidden) or get_conf('NO_CSS'));
- my $css_text = "<style type=\"text/css\">\n<!--\n";
- $css_text .= join('',@$import_lines) . "\n" if (@$import_lines);
- foreach my $css_rule (sort(keys(%css_map)))
- {
- next unless ($css_map{$css_rule});
- $css_text .= "$css_rule {$css_map{$css_rule}}\n";
- }
- $css_text .= join('',@$rule_lines) . "\n" if (@$rule_lines);
- $css_text .= "-->\n</style>\n";
- foreach my $ref (@CSS_REFS)
- {
- $css_text .= "<link rel=\"stylesheet\" type=\"text/css\"
href=\"$ref\">\n";
- }
- set_from_document('CSS_LINES', $css_text);
-}
-
-######################################################################
-# About page
-#
-
-# PRE_ABOUT can be a function reference or a scalar.
-# Note that if it is a scalar, T2H_InitGlobals has not been called,
-# and all global variables like $ADDRESS are not available.
-$PRE_ABOUT = sub
-{
- return ' ' . &$program_string() . "\n";
-};
-
-# If customizing $AFTER_ABOUT, be sure to put the content inside <p></p>.
-$AFTER_ABOUT = '';
-
-%BUTTONS_EXAMPLE =
- (
- 'Top', ' ',
- 'Contents', ' ',
- 'Overview', ' ',
- 'Index', ' ',
- 'This', '1.2.3',
- 'Back', '1.2.2',
- 'FastBack', '1',
- 'Prev', '1.2.2',
- 'Up', '1.2',
- 'Next', '1.2.4',
- 'NodeUp', '1.2',
- 'NodeNext', '1.2.4',
- 'NodePrev', '1.2.2',
- 'NodeForward', '1.2.4',
- 'NodeBack', '1.2.2',
- 'Forward', '1.2.4',
- 'FastForward', '2',
- 'About', ' ',
- 'First', '1.',
- 'Last', '1.2.4',
- 'NextFile', ' ',
- 'PrevFile', ' ',
- );
-
-sub T2H_DEFAULT_about_body
-{
- my $about = "";
- if (ref($PRE_ABOUT) eq 'CODE')
- {
- $about .= &$PRE_ABOUT();
- }
- else
- {
- $about .= $PRE_ABOUT;
- }
- return $about;
-}
-
-# return value is currently ignored
-sub T2H_DEFAULT_titlepage($$$$)
-{
- my $titlepage_lines = shift;
- my $titlepage_text = shift;
- my $titlepage_no_texi = shift;
- my $titlepage_simple_format = shift;
-
- $Texi2HTML::TITLEPAGE = $titlepage_text;
- if ($titlepage_text eq '')
- {
- my $title = '';
- $title = $Texi2HTML::THISDOC{'simpletitle'} if
(defined($Texi2HTML::THISDOC{'simpletitle'}) and
$Texi2HTML::THISDOC{'simpletitle'} !~ /^\s*$/);
- if ($title ne '')
- {
- $Texi2HTML::TITLEPAGE = &$heading_text('@settitle', $title, 0);
- $Texi2HTML::TITLEPAGE .= "$DEFAULT_RULE\n";
- }
- }
- else
- {
- $Texi2HTML::TITLEPAGE .= "$DEFAULT_RULE\n";
- }
-
- if (get_conf('setcontentsaftertitlepage') and
(defined($Texi2HTML::THISDOC{'inline_contents'}->{'contents'})) and
@{$Texi2HTML::THISDOC{'inline_contents'}->{'contents'}})
- {
- foreach my
$line(@{$Texi2HTML::THISDOC{'inline_contents'}->{'contents'}})
- {
- $Texi2HTML::TITLEPAGE .= $line;
- }
- $Texi2HTML::TITLEPAGE .= "$DEFAULT_RULE\n";
- }
- if (get_conf('setshortcontentsaftertitlepage') and
(defined($Texi2HTML::THISDOC{'inline_contents'}->{'shortcontents'})) and
@{$Texi2HTML::THISDOC{'inline_contents'}->{'shortcontents'}})
- {
- foreach my
$line(@{$Texi2HTML::THISDOC{'inline_contents'}->{'shortcontents'}})
- {
- $Texi2HTML::TITLEPAGE .= $line;
- }
- $Texi2HTML::TITLEPAGE .= "$DEFAULT_RULE\n";
- }
- return $Texi2HTML::TITLEPAGE;
-}
-
-
-sub T2H_DEFAULT_print_redirection_page()
-{
- #return "Redirection files are not of use for the current format.\n";
- return undef;
-}
-
-sub T2H_DEFAULT_node_file_name($$)
-{
- my $node = shift;
- my $type = shift;
- return undef if ($node->{'external_node'}
- or ($type eq 'top' and !get_conf('NEW_CROSSREF_STYLE')));
- my $node_file_base;
- if ($type eq 'top' and defined(get_conf('TOP_NODE_FILE')))
- {
- $node_file_base = get_conf('TOP_NODE_FILE');
- }
- elsif (get_conf('NEW_CROSSREF_STYLE'))
- {
- if (get_conf('TRANSLITERATE_FILE_NAMES'))
- {
- $node_file_base = $node->{'cross_manual_file'};
- }
- else
- {
- $node_file_base = $node->{'cross_manual_target'};
- }
- }
- else
- {
- $node_file_base = main::remove_texi($node->{'texi'});
- $node_file_base =~ s/[^\w\.\-]/-/g;
- }
- if (defined(get_conf('NODE_FILE_EXTENSION')) and
get_conf('NODE_FILE_EXTENSION') ne '')
- {
- return ($node_file_base . '.' . get_conf('NODE_FILE_EXTENSION'));
- }
- return $node_file_base;
-}
-
-########################################################################
-# Control of formatting:
-# 1.) For some changes, it is often enough to change the value of
-# some global map. It might necessitate building a little
-# function along with the change in hash, if the change is the use
-# of another function (in style_map).
-# 2.) For other changes, reimplement one of the t2h_default_<fnc>* routines,
-# give them another name, and assign them to the respective
-# $<fnc> variable (below).
-
-%deprecated_commands = (
- 'ctrl' => '',
- 'allow-recursion' => N__('recursion is always allowed'),
- 'quote-arg' => N__('arguments are quoted by default'),
-);
-
-#
-# This hash should have keys corresponding with the nonletter command accent
-# whose following character is considered to be the argument
-# This hash associates an accent macro to the ISO name for the accent if any.
-# The customary use of this map is to find the ISO name appearing in html
-# entity (like é) associated with a texinfo accent macro.
-#
-# The keys of the hash are
-# ": umlaut
-# ~: tilda accent
-# ^: circumflex accent
-# `: grave accent
-# ': acute accent
-# =: macron accent
-%accent_map = (
- '"', 'uml',
- '~', 'tilde',
- '^', 'circ',
- '`', 'grave',
- "'", 'acute',
- ",", 'cedil',
- '=', '',
- 'ringaccent', 'ring',
- 'H', '',
- 'dotaccent', '',
- 'u', '',
- 'ubaraccent', '',
- 'udotaccent', '',
- 'v', '',
- 'ogonek', 'ogon',
- );
-
-#
-# ascii representation of texinfo "simple things" @-commands
-%default_simple_map = (
- '*', "\n",
- ' ', ' ',
- "\t", ' ',
- "\n", ' ',
- '-', '', # hyphenation hint
- '|', '', # used in formatting commands @evenfooting and friends
- '/', '',
- ':', '',
- '!', '!',
- '?', '?',
- '.', '.',
- '@', '@',
- '}', '}',
- '{', '{',
-);
-
-# texinfo "simple things" @-commands
-%simple_map = %default_simple_map;
-
-# this map is used in preformatted text
-%simple_map_pre = %simple_map;
-
-# This map is used when texi elements are removed and replaced
-# by simple text
-%simple_map_texi = %default_simple_map;
-
-# maps for the math specific commands
-%simple_map_math = (
- '\\', '\\'
- );
-
-#%simple_map_pre_math = %simple_map_math;
-#%simple_map_texi_math = %simple_map_math;
-
-$punctuation_characters = '.?!';
-$after_punctuation_characters = '"\')]';
-
-
-%default_things_map = (
- 'TeX' => 'TeX',
- 'LaTeX' => 'LaTeX',
- 'bullet' => '*',
- 'copyright' => '(C)',
- 'registeredsymbol' => '(R)',
- 'dots' => '...',
- 'enddots' => '...',
- 'equiv' => '==',
-# FIXME i18n
- 'error' => 'error-->',
- 'expansion' => '==>',
- 'arrow' => '->',
- 'minus' => '-',
- 'point' => '-!-',
- 'print' => '-|',
- 'result' => '=>',
- 'today' => '',
- 'aa' => 'aa',
- 'AA' => 'AA',
- 'ae' => 'ae',
- 'oe' => 'oe',
- 'AE' => 'AE',
- 'OE' => 'OE',
- 'o' => '/o',
- 'O' => '/O',
- 'ss' => 'ss',
- 'l' => '/l',
- 'L' => '/L',
- 'DH' => 'D',
- 'dh' => 'd',
- 'TH' => 'TH', #
http://www.evertype.com/standards/wynnyogh/thorn.html
-
- 'th' => 'th',
- 'exclamdown' => '!',
- 'questiondown' => '?',
- 'pounds' => '#',
- 'ordf' => 'a',
- 'ordm' => 'o',
- 'comma' => ',',
- 'euro' => 'Euro',
- 'geq' => '>=',
- 'leq' => '<=',
- 'tie' => ' ',
- 'textdegree' => 'o',
- 'quotedblleft' => '``',
- 'quotedblright' => "''",
- 'quoteleft' => '`',
- 'quoteright' => "'",
- 'quotedblbase' => ',,',
- 'quotesinglbase' => ',',
- 'guillemetleft' => '<<',
- 'guillemetright' => '>>',
- 'guillemotleft' => '<<',
- 'guillemotright' => '>>',
- 'guilsinglleft' => '<',
- 'guilsinglright' => '>',
-);
-
-%things_map = %default_things_map;
-
-# This map is used in preformatted environments
-%pre_map = %things_map;
-
-# used in math. If not found, pre_map is used.
-%math_map = ();
-
-# text replacing macros when texi commands are removed and plain text is
-# produced.
-%texi_map = %default_things_map;
-
-# used for index sorting.
-%sorting_things_map = %default_things_map;
-foreach my $accent_letter ('o','O','l','L')
-{
- $sorting_things_map{$accent_letter} = $accent_letter;
-}
-$sorting_things_map{'copyright'} = 'C';
-$sorting_things_map{'registeredsymbol'} = 'R';
-$sorting_things_map{'today'} = 't';
-
-%default_texi_map = %texi_map;
-
-#
-# texinfo "things" (@foo{}) to XML ones
-#
-%things_map_xml = (
- 'TeX' => 'TeX',
- 'LaTeX' => 'LaTeX',
-# pertusus: unknown by makeinfo, not in texinfo manual (@* is the right thing)
-# 'br', '<br>', # paragraph break
- 'bullet' => '•',
-# #'copyright' => '(C)',
- 'copyright' => '©',
- 'registeredsymbol' => '®',
- 'dots' => '…',
- 'enddots' => '...',
- 'equiv' => '≡',
-# FIXME i18n
- 'error' => 'error-->',
- 'expansion' => '→',
- 'arrow' => '→',
- 'minus' => '-',
- 'point' => '∗',
- 'print' => '-|',
- 'result' => '⇒',
- # set in code using the language
- # 'today', &pretty_date,
- 'today' => '',
- 'aa' => 'å',
- 'AA' => 'Å',
- 'ae' => 'æ',
- 'oe' => 'œ', #pertusus: also œ. œ
not in html 3.2
- 'AE' => 'Æ',
- 'OE' => 'Œ', #pertusus: also Œ. Œ
not in html 3.2
- 'o' => 'ø',
- 'O' => 'Ø',
- 'ss' => 'ß',
- 'DH' => 'Ð',
- 'dh' => 'ð',
- 'TH' => 'Þ',
- 'th' => 'þ',
- 'l' => 'ł',
- 'L' => 'Ł',
- 'exclamdown' => '¡',
- 'questiondown' => '¿',
- 'pounds' => '£',
- 'ordf' => 'ª',
- 'ordm' => 'º',
- 'comma' => ',',
- 'euro' => '€',
- 'geq' => '≥',
- 'leq' => '≤',
- 'tie' => ' ',
- 'textdegree' => '°',
- 'quotedblleft' => '“',
- 'quotedblright' => '”',
- 'quoteleft' => '‘',
- 'quoteright' => '’',
- 'quotedblbase' => '„',
- 'quotesinglbase' => '‚',
- 'guillemetleft' => '«',
- 'guillemetright' => '»',
- 'guillemotleft' => '«',
- 'guillemotright' => '»',
- 'guilsinglleft' => '‹',
- 'guilsinglright' => '›',
- );
-
-# This map is used in preformatted environments
-%pre_map_xml = %things_map_xml;
-
-# taken from
-#Latin extended additionnal
-#http://www.alanwood.net/unicode/latin_extended_additional.html
-#C1 Controls and Latin-1 Supplement
-#http://www.alanwood.net/unicode/latin_1_supplement.html
-#Latin Extended-A
-#http://www.alanwood.net/unicode/latin_extended_a.html
-#Latin Extended-B
-#http://www.alanwood.net/unicode/latin_extended_b.html
-#dotless i: 0131
-
-#http://www.alanwood.net/unicode/arrows.html 21**
-#http://www.alanwood.net/unicode/general_punctuation.html 20**
-#http://www.alanwood.net/unicode/mathematical_operators.html 22**
-
-%unicode_map = (
- 'bullet' => '2022',
- 'copyright' => '00A9',
- 'registeredsymbol' => '00AE',
- 'dots' => '2026',
- 'enddots' => '',
- 'equiv' => '2261',
- 'error' => '',
- 'expansion' => '2192',
- 'arrow' => '2192',
- 'minus' => '2212', # in mathematical operators
-# 'minus' => '002D', # in latin1
- 'point' => '2605',
- 'print' => '22A3',
- 'result' => '21D2',
- 'today' => '',
- 'aa' => '00E5',
- 'AA' => '00C5',
- 'ae' => '00E6',
- 'oe' => '0153',
- 'AE' => '00C6',
- 'OE' => '0152',
- 'o' => '00F8',
- 'O' => '00D8',
- 'ss' => '00DF',
- 'DH' => '00D0',
- 'dh' => '00F0',
- 'TH' => '00DE',
- 'th' => '00FE',
- 'l' => '0142',
- 'L' => '0141',
- 'exclamdown' => '00A1',
- 'questiondown' => '00BF',
- 'pounds' => '00A3',
- 'ordf' => '00AA',
- 'ordm' => '00BA',
- 'comma' => '002C',
- 'euro' => '20AC',
- 'geq' => '2265',
- 'leq' => '2264',
- 'tie' => '',
-# 'tie' => '0020',
- 'textdegree' => '00B0',
- 'quotedblleft' => '201C',
- 'quotedblright' => '201D',
- 'quoteleft' => '2018',
- 'quoteright' => '2019',
- 'quotedblbase' => '201E',
- 'quotesinglbase' => '201A',
- 'guillemetleft' => '00AB',
- 'guillemetright' => '00BB',
- 'guillemotleft' => '00AB',
- 'guillemotright' => '00BB',
- 'guilsinglleft' => '2039',
- 'guilsinglright' => '203A',
- );
-
-%makeinfo_encoding_to_map = (
- "iso-8859-1", 'iso8859_1',
- "iso-8859-2", 'iso8859_2',
- "iso-8859-15", 'iso8859_15',
- "koi8-r", 'koi8',
- "koi8-u", 'koi8',
-);
-
-foreach my $encoding (keys(%makeinfo_encoding_to_map))
-{
- $t2h_encoding_aliases{$encoding} = $encoding;
- $t2h_encoding_aliases{$makeinfo_encoding_to_map{$encoding}} = $encoding;
-}
-
-# cut and pasted from eigth_bit_makeinfo_maps.pl, in turn generated with
-# ./parse_8bit_makeinfo_maps.pl
-
-%makeinfo_unicode_to_eight_bit = (
- 'iso8859_1' => {
- '00A0' => 'A0',
- '00A1' => 'A1',
- '00A2' => 'A2',
- '00A3' => 'A3',
- '00A4' => 'A4',
- '00A5' => 'A5',
- '00A6' => 'A6',
- '00A7' => 'A7',
- '00A8' => 'A8',
- '00A9' => 'A9',
- '00AA' => 'AA',
- '00AB' => 'AB',
- '00AC' => 'AC',
- '00AD' => 'AD',
- '00AE' => 'AE',
- '00AF' => 'AF',
- '00B0' => 'B0',
- '00B1' => 'B1',
- '00B2' => 'B2',
- '00B3' => 'B3',
- '00B4' => 'B4',
- '00B5' => 'B5',
- '00B6' => 'B6',
- '00B7' => 'B7',
- '00B8' => 'B8',
- '00B9' => 'B9',
- '00BA' => 'BA',
- '00BB' => 'BB',
- '00BC' => 'BC',
- '00BD' => 'BD',
- '00BE' => 'BE',
- '00BF' => 'BF',
- '00C0' => 'C0',
- '00C1' => 'C1',
- '00C2' => 'C2',
- '00C3' => 'C3',
- '00C4' => 'C4',
- '00C5' => 'C5',
- '00C6' => 'C6',
- '00C7' => 'C7',
- '00C7' => 'C7',
- '00C8' => 'C8',
- '00C9' => 'C9',
- '00CA' => 'CA',
- '00CB' => 'CB',
- '00CC' => 'CC',
- '00CD' => 'CD',
- '00CE' => 'CE',
- '00CF' => 'CF',
- '00D0' => 'D0',
- '00D1' => 'D1',
- '00D2' => 'D2',
- '00D3' => 'D3',
- '00D4' => 'D4',
- '00D5' => 'D5',
- '00D6' => 'D6',
- '00D7' => 'D7',
- '00D8' => 'D8',
- '00D9' => 'D9',
- '00DA' => 'DA',
- '00DB' => 'DB',
- '00DC' => 'DC',
- '00DD' => 'DD',
- '00DE' => 'DE',
- '00DF' => 'DF',
- '00E0' => 'E0',
- '00E1' => 'E1',
- '00E2' => 'E2',
- '00E3' => 'E3',
- '00E4' => 'E4',
- '00E5' => 'E5',
- '00E6' => 'E6',
- '00E7' => 'E7',
- '00E8' => 'E8',
- '00E9' => 'E9',
- '00EA' => 'EA',
- '00EB' => 'EB',
- '00EC' => 'EC',
- '00ED' => 'ED',
- '00EE' => 'EE',
- '00EF' => 'EF',
- '00F0' => 'F0',
- '00F1' => 'F1',
- '00F2' => 'F2',
- '00F3' => 'F3',
- '00F4' => 'F4',
- '00F5' => 'F5',
- '00F6' => 'F6',
- '00F7' => 'F7',
- '00F8' => 'F8',
- '00F9' => 'F9',
- '00FA' => 'FA',
- '00FB' => 'FB',
- '00FC' => 'FC',
- '00FD' => 'FD',
- '00FE' => 'FE',
- '00FF' => 'FF',
- },
- 'iso8859_15' => {
- '00A0' => 'A0',
- '00A1' => 'A1',
- '00A2' => 'A2',
- '00A3' => 'A3',
- '20AC' => 'A4',
- '00A5' => 'A5',
- '0160' => 'A6',
- '00A7' => 'A7',
- '0161' => 'A8',
- '00A9' => 'A9',
- '00AA' => 'AA',
- '00AB' => 'AB',
- '00AC' => 'AC',
- '00AD' => 'AD',
- '00AE' => 'AE',
- '00AF' => 'AF',
- '00B0' => 'B0',
- '00B1' => 'B1',
- '00B2' => 'B2',
- '00B3' => 'B3',
- '017D' => 'B4',
- '00B5' => 'B5',
- '00B6' => 'B6',
- '00B7' => 'B7',
- '017E' => 'B8',
- '00B9' => 'B9',
- '00BA' => 'BA',
- '00BB' => 'BB',
- '0152' => 'BC',
- '0153' => 'BD',
- '0178' => 'BE',
- '00BF' => 'BF',
- '00C0' => 'C0',
- '00C1' => 'C1',
- '00C2' => 'C2',
- '00C3' => 'C3',
- '00C4' => 'C4',
- '00C5' => 'C5',
- '00C6' => 'C6',
- '00C7' => 'C7',
- '00C8' => 'C8',
- '00C9' => 'C9',
- '00CA' => 'CA',
- '00CB' => 'CB',
- '00CC' => 'CC',
- '00CD' => 'CD',
- '00CE' => 'CE',
- '00CF' => 'CF',
- '00D0' => 'D0',
- '00D1' => 'D1',
- '00D2' => 'D2',
- '00D3' => 'D3',
- '00D4' => 'D4',
- '00D5' => 'D5',
- '00D6' => 'D6',
- '00D7' => 'D7',
- '00D8' => 'D8',
- '00D9' => 'D9',
- '00DA' => 'DA',
- '00DB' => 'DB',
- '00DC' => 'DC',
- '00DD' => 'DD',
- '00DE' => 'DE',
- '00DF' => 'DF',
- '00E0' => 'E0',
- '00E1' => 'E1',
- '00E2' => 'E2',
- '00E3' => 'E3',
- '00E4' => 'E4',
- '00E5' => 'E5',
- '00E6' => 'E6',
- '00E7' => 'E7',
- '00E8' => 'E8',
- '00E9' => 'E9',
- '00EA' => 'EA',
- '00EB' => 'EB',
- '00EC' => 'EC',
- '00ED' => 'ED',
- '00EE' => 'EE',
- '00EF' => 'EF',
- '00F0' => 'F0',
- '00F1' => 'F1',
- '00F2' => 'F2',
- '00F3' => 'F3',
- '00F4' => 'F4',
- '00F5' => 'F5',
- '00F6' => 'F6',
- '00F7' => 'F7',
- '00F8' => 'F8',
- '00F9' => 'F9',
- '00FA' => 'FA',
- '00FB' => 'FB',
- '00FC' => 'FC',
- '00FD' => 'FD',
- '00FE' => 'FE',
- '00FF' => 'FF',
- },
- 'iso8859_2' => {
- '00A0' => 'A0',
- '0104' => 'A1',
- '02D8' => 'A2',
- '0141' => 'A3',
- '00A4' => 'A4',
- '013D' => 'A5',
- '015A' => 'A6',
- '00A7' => 'A7',
- '00A8' => 'A8',
- '015E' => 'AA',
- '0164' => 'AB',
- '0179' => 'AC',
- '00AD' => 'AD',
- '017D' => 'AE',
- '017B' => 'AF',
- '00B0' => 'B0',
- '0105' => 'B1',
- '02DB' => 'B2',
- '0142' => 'B3',
- '00B4' => 'B4',
- '013E' => 'B5',
- '015B' => 'B6',
- '02C7' => 'B7',
- '00B8' => 'B8',
- '0161' => 'B9',
- '015F' => 'BA',
- '0165' => 'BB',
- '017A' => 'BC',
- '02DD' => 'BD',
- '017E' => 'BE',
- '017C' => 'BF',
- '0154' => 'C0',
- '00C1' => 'C1',
- '00C2' => 'C2',
- '0102' => 'C3',
- '00C4' => 'C4',
- '0139' => 'C5',
- '0106' => 'C6',
- '00C7' => 'C7',
- '010C' => 'C8',
- '00C9' => 'C9',
- '0118' => 'CA',
- '00CB' => 'CB',
- '011A' => 'CC',
- '00CD' => 'CD',
- '00CE' => 'CE',
- '010E' => 'CF',
- '0110' => 'D0',
- '0143' => 'D1',
- '0147' => 'D2',
- '00D3' => 'D3',
- '00D4' => 'D4',
- '0150' => 'D5',
- '00D6' => 'D6',
- '00D7' => 'D7',
- '0158' => 'D8',
- '016E' => 'D9',
- '00DA' => 'DA',
- '0170' => 'DB',
- '00DC' => 'DC',
- '00DD' => 'DD',
- '0162' => 'DE',
- '00DF' => 'DF',
- '0155' => 'E0',
- '00E1' => 'E1',
- '00E2' => 'E2',
- '0103' => 'E3',
- '00E4' => 'E4',
- '013A' => 'E5',
- '0107' => 'E6',
- '00E7' => 'E7',
- '010D' => 'E8',
- '00E9' => 'E9',
- '0119' => 'EA',
- '00EB' => 'EB',
- '011B' => 'EC',
- '00ED' => 'ED',
- '00EE' => 'EE',
- '010F' => 'EF',
- '0111' => 'F0',
- '0144' => 'F1',
- '0148' => 'F2',
- '00F3' => 'F3',
- '00F4' => 'F4',
- '0151' => 'F5',
- '00F6' => 'F6',
- '00F7' => 'F7',
- '0159' => 'F8',
- '016F' => 'F9',
- '00FA' => 'FA',
- '0171' => 'FB',
- '00FC' => 'FC',
- '00FD' => 'FD',
- '0163' => 'FE',
- '02D9' => 'FF',
- },
- 'koi8' => {
- '0415' => 'A3',
- '0454' => 'A4',
- '0456' => 'A6',
- '0457' => 'A7',
- '04D7' => 'B3',
- '0404' => 'B4',
- '0406' => 'B6',
- '0407' => 'B7',
- '042E' => 'C0',
- '0430' => 'C1',
- '0431' => 'C2',
- '0446' => 'C3',
- '0434' => 'C4',
- '0435' => 'C5',
- '0444' => 'C6',
- '0433' => 'C7',
- '0445' => 'C8',
- '0438' => 'C9',
- '0439' => 'CA',
- '043A' => 'CB',
- '043B' => 'CC',
- '043C' => 'CD',
- '043D' => 'CE',
- '043E' => 'CF',
- '043F' => 'D0',
- '044F' => 'D1',
- '0440' => 'D2',
- '0441' => 'D3',
- '0442' => 'D4',
- '0443' => 'D5',
- '0436' => 'D6',
- '0432' => 'D7',
- '044C' => 'D8',
- '044B' => 'D9',
- '0437' => 'DA',
- '0448' => 'DB',
- '044D' => 'DC',
- '0449' => 'DD',
- '0447' => 'DE',
- '044A' => 'DF',
- '042D' => 'E0',
- '0410' => 'E1',
- '0411' => 'E2',
- '0426' => 'E3',
- '0414' => 'E4',
- '0415' => 'E5',
- '0424' => 'E6',
- '0413' => 'E7',
- '0425' => 'E8',
- '0418' => 'E9',
- '0419' => 'EA',
- '041A' => 'EB',
- '041B' => 'EC',
- '041C' => 'ED',
- '041D' => 'EE',
- '041E' => 'EF',
- '041F' => 'F0',
- '042F' => 'F1',
- '0420' => 'F2',
- '0421' => 'F3',
- '0422' => 'F4',
- '0423' => 'F5',
- '0416' => 'F6',
- '0412' => 'F7',
- '042C' => 'F8',
- '042B' => 'F9',
- '0417' => 'FA',
- '0428' => 'FB',
- '042D' => 'FC',
- '0429' => 'FD',
- '0427' => 'FE',
- '042A' => 'FF',
- },
-);
-
-%eight_bit_to_unicode = ();
-foreach my $encoding (keys(%makeinfo_encoding_to_map))
-{
- my $unicode_to_eight =
$makeinfo_unicode_to_eight_bit{$makeinfo_encoding_to_map{$encoding}};
-#print STDERR "$encoding, $makeinfo_encoding_to_map{$encoding},
$unicode_to_eight\n";
- foreach my $utf8_key (keys(%{$unicode_to_eight}))
- {
- $eight_bit_to_unicode{$encoding}->{$unicode_to_eight->{$utf8_key}} =
- $utf8_key;
- }
-}
-
-# currently unused
-my %makeinfo_transliterate_map = (
- '0416' => 'ZH',
- '0447' => 'ch',
- '00EB' => 'e',
- '0414' => 'D',
- '0159' => 'r',
- '00E6' => 'ae',
- '042B' => 'Y',
- '00FA' => 'u',
- '043B' => 'l',
- '00DE' => 'TH',
- '00D9' => 'U',
- '00C4' => 'A',
- '0148' => 'n',
- '00F6' => 'o',
- '0434' => 'd',
- '041E' => 'O',
- '041B' => 'L',
- '044B' => 'y',
- '0107' => 'c',
- '0415' => 'E',
- '00C1' => 'A',
- '00D3' => 'O',
- '00DB' => 'U',
- '016E' => 'U',
- '013A' => 'l',
- '017B' => 'Z',
- '00F1' => 'n',
- '0428' => 'SH',
- '0153' => 'oe',
- '00F4' => 'o',
- '0144' => 'n',
- '0404' => 'IE',
- '0427' => 'CH',
- '0162' => 'T',
- '017A' => 'z',
- '0448' => 'sh',
- '0436' => 'zh',
- '00F9' => 'u',
- '0406' => 'I',
- '0103' => 'a',
- '0422' => 'T',
- '0160' => 'S',
- '0165' => 't',
- '017E' => 'z',
- '00F0' => 'd',
- '043E' => 'o',
- '043D' => 'n',
- '013E' => 'l',
- '0412' => 'V',
- '0111' => 'd',
- '0155' => 's',
- '017C' => 'z',
- '00CE' => 'I',
- '042D' => 'E',
- '00C8' => 'E',
- '00F8' => 'oe',
- '00F2' => 'o',
- '00FF' => 'y',
- '0420' => 'R',
- '0119' => 'e',
- '00D2' => 'O',
- '043C' => 'm',
- '00D0' => 'DH',
- '0179' => 'Z',
- '0110' => 'D',
- '043F' => 'p',
- '0170' => 'U',
- '011A' => 'E',
- '010C' => 'C',
- '015A' => 'S',
- '0433' => 'g',
- '00E1' => 'a',
- '010D' => 'c',
- '00CC' => 'I',
- '016F' => 'u',
- '0457' => 'yi',
- '00C2' => 'A',
- '0438' => 'i',
- '00E3' => 'a',
- '0435' => 'e',
- '0440' => 'r',
- '042A' => 'W',
- '0431' => 'b',
- '00EE' => 'i',
- '0150' => 'O',
- '00E8' => 'e',
- '0418' => 'I',
- '00CF' => 'I',
- '015F' => 's',
- '0142' => 'l',
- '0147' => 'N',
- '00DF' => 'ss',
- '00E5' => 'aa',
- '00C3' => 'A',
- '0106' => 'C',
- '0141' => 'L',
- '0164' => 'T',
- '017D' => 'Z',
- '00EC' => 'i',
- '041C' => 'M',
- '00C9' => 'E',
- '00E0' => 'a',
- '043A' => 'k',
- '00F5' => 'o',
- '042C' => 'X',
- '0449' => 'shch',
- '0444' => 'f',
- '0139' => 'L',
- '0158' => 'R',
- '00F3' => 'o',
- '00FB' => 'u',
- '0424' => 'F',
- '0446' => 'c',
- '0423' => 'U',
- '0442' => 't',
- '00FD' => 'y',
- '0102' => 'A',
- '0104' => 'A',
- '00CB' => 'E',
- '0426' => 'C',
- '00CD' => 'I',
- '0437' => 'z',
- '0178' => 'y',
- '00D4' => 'O',
- '044D' => 'e',
- '0432' => 'v',
- '013D' => 'L',
- '0163' => 't',
- '0456' => 'i',
- '011B' => 'e',
- '044F' => 'ya',
- '0429' => 'SHCH',
- '0411' => 'B',
- '044A' => 'w',
- '00C6' => 'AE',
- '041D' => 'N',
- '00DA' => 'U',
- '00C0' => 'A',
- '0152' => 'OE',
- '00DD' => 'Y',
- '0154' => 'R',
- '00E9' => 'e',
- '00D5' => 'O',
- '041F' => 'P',
- '0161' => 's',
- '0430' => 'a',
- '0445' => 'h',
- '00E2' => 'a',
- '00D6' => 'O',
- '0407' => 'YI',
- '00CA' => 'E',
- '0439' => 'i',
- '0171' => 'u',
- '00DC' => 'U',
- '042F' => 'YA',
- '0425' => 'H',
- '00FE' => 'th',
- '00D1' => 'N',
- '044C' => 'x',
- '010F' => 'd',
- '0410' => 'A',
- '0443' => 'u',
- '00EF' => 'i',
- '0105' => 'a',
- '00EA' => 'e',
- '00E4' => 'a',
- '015E' => 'S',
- '0417' => 'Z',
- '00ED' => 'i',
- '00FC' => 'u',
- '04D7' => 'IO',
- '00D8' => 'OE',
- '0419' => 'I',
- '0421' => 'S',
- '0143' => 'N',
- '010E' => 'D',
- '0413' => 'G',
- '015B' => 's',
- '0151' => 'o',
- '00E7' => 'c',
- '00C5' => 'AA',
- '0441' => 's',
- '0118' => 'E',
- '00C7' => 'C',
- '041A' => 'K',
- '0454' => 'ie',
- '042E' => 'yu',
-);
-
-
-%transliterate_map = (
- '00C5' => 'AA',
- '00E5' => 'aa',
- '00D8' => 'O',
- '00F8' => 'o',
- '00E6' => 'ae',
- '0153' => 'oe',
- '00C6' => 'AE',
- '0152' => 'OE',
- '00DF' => 'ss',
- '0141' => 'L',
- '0142' => 'l',
- '00D0' => 'D',
- '00F0' => 'd',
- '00DE' => 'TH',
- '00FE' => 'th',
- '0415' => 'E',
- '0435' => 'e',
- '0426' => 'C',
- '042A' => 'W',
- '044A' => 'w',
- '042C' => 'X',
- '044C' => 'x',
- '042E' => 'yu',
- '042F' => 'YA',
- '044F' => 'ya',
- '0433' => 'g',
- '0446' => 'c',
- '04D7' => 'IO',
- '00DD' => 'Y', # unidecode gets this wrong ?
- # following appears in tests, this is required to have
- # the same output with and without unidecode
- '4E2D' => 'Zhong',
- '6587' => 'Wen',
- '793A' => 'Shi',
- '4F8B' => 'Li',
- '7B2C' => 'Di',
- '7AE0' => 'Zhang',
- '53E6' => 'Ling',
- '4E2A' => 'Ge',
- # in http://www.cantonese.sheik.co.uk/dictionary/characters/7/
- # unidecode certainly gets it wrong
- '4E00' => 'Yi',
- 'FF08' => '(',
- 'FF09' => ')',
- 'FF0C' => ',',
- '5B66' => 'Xue',
- '7FD2' => 'Xi',
- '30DE' => 'ma',
- '30CB' => 'ni',
- '30E5' => 'yu',
- '30A2' => 'a',
- '30EB' => 'ru',
- );
-
-foreach my $symbol(keys(%unicode_map))
-{
- if ($unicode_map{$symbol} ne '' and !exists($transliterate_map{$symbol}))
- {
- $no_transliterate_map{$unicode_map{$symbol}} = 1;
- }
-}
-
-%ascii_character_map = (
- ' ' => '0020',
- '!' => '0021',
- '"' => '0022',
- '#' => '0023',
- '$' => '0024',
- '%' => '0025',
- '&' => '0026',
- "'" => '0027',
- '(' => '0028',
- ')' => '0029',
- '*' => '002A',
- '+' => '002B',
- ',' => '002C',
- '-' => '002D',
- '.' => '002E',
- '/' => '002F',
- ':' => '003A',
- ';' => '003B',
- '<' => '003C',
- '=' => '003D',
- '>' => '003E',
- '?' => '003F',
- '@' => '0040',
- '[' => '005B',
- '\\' => '005C',
- ']' => '005D',
- '^' => '005E',
- '_' => '005F',
- '`' => '0060',
- '{' => '007B',
- '|' => '007C',
- '}' => '007D',
- '~' => '007E',
-);
-
-%perl_charset_to_html = (
- 'utf8' => 'utf-8',
- 'utf-8-strict' => 'utf-8',
- 'ascii' => 'us-ascii',
- 'shiftjis' => 'shift_jis',
-);
-
-# encoding name normalization to html-compatible encoding names
-%t2h_encoding_aliases = (
- 'latin1' => 'iso-8859-1',
-);
-
-foreach my $perl_charset (keys(%perl_charset_to_html))
-{
- $t2h_encoding_aliases{$perl_charset} = $perl_charset_to_html{$perl_charset};
- $t2h_encoding_aliases{$perl_charset_to_html{$perl_charset}} =
$perl_charset_to_html{$perl_charset};
-}
-
-# These are the encodings from the texinfo manual
-foreach my $canonical_encoding('us-ascii', 'utf-8', 'iso-8859-1',
- 'iso-8859-15','iso-8859-2','koi8-r', 'koi8-u')
-{
- $canonical_texinfo_encodings{$canonical_encoding} = 1;
-}
-
-# not used currently for html, but used in chm.init
-%numeric_entity_map = ();
-
-foreach my $symbol (keys(%unicode_map))
-{
- if ($symbol ne '')
- {
- $numeric_entity_map{$symbol} = '&#' . hex($unicode_map{$symbol}) . ';';
- }
-}
-
-# When the value begins with & the function with that name is used to do the
-# html. The first argument is the text enclosed within {}, the second is the
-# style name (which is also the key of the hash)
-#
-# Otherwithe the value is the html element used to enclose the text, and if
-# there is a " the resulting text is also enclosed within `'
-my %old_style_map = (
- 'acronym', '',
- 'asis', '',
- 'b', 'b',
- 'cite', 'cite',
- 'clicksequence', '',
- 'code', 'code',
- 'command', 'code',
- 'ctrl', '&default_ctrl',
- 'dfn', 'em',
- 'dmn', '',
- 'email', '&default_email',
- 'emph', 'em',
- 'env', 'code',
- 'file', '"tt',
- 'i', 'i',
- 'kbd', 'kbd',
- 'key', 'kbd',
- 'math', 'em',
- 'option', '"samp',
- 'r', '',
- 'samp', '"samp',
- 'sc', '&default_sc',
- 'strong', 'strong',
- 't', 'tt',
- 'uref', '&default_uref',
- 'url', '&default_url',
- 'var', 'var',
- 'verb', 'tt',
- 'titlefont', '&default_titlefont',
- 'w', '',
- );
-
-sub t2h_default_copy_style_map ($$;$)
-{
- my $from = shift;
- my $to = shift;
- my $merge = shift;
-
- foreach my $command (keys(%$from))
- {
- $to->{$command} = {} if (!exists($to->{$command}));
- foreach my $key (keys(%{$from->{$command}}))
- {
- next if (exists($to->{$command}->{$key}) and $merge);
- if ($key eq 'args')
- {
- $to->{$command}->{$key} = [ @{$from->{$command}->{$key}} ];
- }
- else
- {
- $to->{$command}->{$key} = $from->{$command}->{$key};
- }
- }
- }
-}
-
-# default is {'args' => ['normal'], 'attribute' => ''},
-%style_map = (
- 'asis', {},
- 'b', {},
- 'cite', {},
- 'clicksequence', {},
- 'click', {'function' => \&t2h_default_click_normal, 'type' =>
'simple_style'},
- 'code', {'args' => ['code']},
- 'command', {'args' => ['code']},
- 'ctrl', {'function' => \&t2h_default_ctrl,'type' =>
'simple_style'},
- 'dfn', {},
- 'dmn', {'type' => 'simple_style'},
- 'email', {'args' => ['code', 'normal'],
- 'function' => \&t2h_default_email,
- 'type' => 'simple_style'},
- #'email', {'args' => ['normal', 'normal'],
- # 'function' => \&t2h_default_email},
- 'emph', {},
- 'env', {'args' => ['code']},
- 'file', {'args' => ['code'], 'quote' => '"'},
- 'headitemfont', {},
- 'i', {},
- 'slanted', {},
- 'sansserif', {},
- 'kbd', {'args' => ['code'], },
- 'key', {'args' => ['code'], 'begin' => '<', 'end' => '>'},
- 'math', {'function' => \&t2h_default_math, 'args' => ['math'] },
- 'option', {'args' => ['code'], 'quote' => '"'},
- 'r', {},
- 'samp', {'args' => ['code'], 'quote' => '"'},
-# 'sc', {'function' => \&t2h_default_sc},
- 'sc', {},
- 'strong', {},
- 't', {},
- 'uref', {'function' => \&t2h_default_uref,
- 'args' => ['code', 'normal', 'normal'],
- 'type' => 'simple_style' },
- #'uref', {'function' => \&t2h_default_uref,
- # 'args' => ['normal', 'normal', 'normal']},
- 'url', {'function' => \&t2h_default_uref,
- 'args' => ['code', 'normal', 'normal'],
- 'type' => 'simple_style'},
- 'indicateurl', {'args' => ['code'], 'begin' => '<', 'end' => '>','type'
=> 'simple_style'},
- 'var', {},
- 'verb', {'args' => ['code'], },
- 'titlefont', {'function' => \&t2h_default_titlefont,
- 'type' => 'simple_style'},
- 'w', {},
- 'hyphenation', {'function' => \&t2h_default_hyphenation, 'args' =>
['keep']},
- );
-
-%command_type = ();
-
-foreach my $style (keys(%style_map))
-{
- if (exists($style_map{$style}->{'type'}))
- {
- $command_type{$style} = $style_map{$style}->{'type'};
- }
- else
- {
- $command_type{$style} = 'style';
- }
-}
-
-
-sub t2h_default_select_substitution($$$)
-{
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_simple = shift;
-
- if ($in_raw_text)
- {
- return address@hidden;
- }
- elsif ($in_simple)
- {
- return address@hidden;
- }
- elsif ($in_preformatted)
- {
- return address@hidden;
- }
- else
- {
- return address@hidden;
- }
-}
-
-sub t2h_text_substitutions($$$$)
-{
- my $text = shift;
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_simple = shift;
-
- my $substitutions = t2h_default_select_substitution($in_raw_text,
$in_preformatted, $in_simple);
- foreach my $substitution_entry (@$substitutions)
- {
- my $from = quotemeta($substitution_entry->[0]);
- my $to = $substitution_entry->[1];
- $text =~ s/$from/$to/g;
- }
- return $text;
-}
-
-sub t2h_add_text_substitutions($$$$$)
-{
- my $entry = shift;
- my $in_normal = shift;
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_simple = shift;
-
- my @formats_to_be_done = ($in_normal, $in_raw_text, $in_preformatted,
$in_simple);
-
- for (my $index = 0; $index < scalar(@formats_to_be_done); $index++)
- {
- next unless ($formats_to_be_done[$index]);
- my @args = (0, 0, 0);
- my $found = 0;
- $args[$index -1] = 1 if ($index > 0);
- my $substitutions = &t2h_default_select_substitution(@args);
- foreach my $substitution_entry (@$substitutions)
- {
- if ($substitution_entry->[0] eq $entry->[0])
- {
- $found = 1;
- $substitution_entry->[1] = $entry->[1];
- }
- }
- push @$substitutions, $entry unless ($found);
- }
-}
-
-sub t2h_remove_text_substitutions($$$$$)
-{
- my $entry = shift;
- my $in_normal = shift;
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_simple = shift;
-
- my @formats_to_be_done = ($in_normal, $in_raw_text, $in_preformatted,
$in_simple);
-
- for (my $index = 0; $index < scalar(@formats_to_be_done); $index++)
- {
- next unless ($formats_to_be_done[$index]);
- my @args = (0, 0, 0);
- $args[$index -1] = 1 if ($index > 0);
- my $substitutions = &t2h_default_select_substitution(@args);
-
- @$substitutions = grep {$_->[0] ne $entry} @$substitutions;
- }
-}
-
-
-%unicode_diacritical = (
- 'H' => '030B',
- 'ringaccent' => '030A',
- "'" => '0301',
- 'v' => '030C',
- ',' => '0327',
- '^' => '0302',
- 'dotaccent' => '0307',
- '`' => '0300',
- '=' => '0304',
- '~' => '0303',
- '"' => '0308',
- 'udotaccent' => '0323',
- 'ubaraccent' => '0332',
- 'u' => '0306',
- 'tieaccent' => '0361',
- 'ogonek' => '0328'
-);
-
-%unicode_accents = (
- 'dotaccent' => { # dot above
- 'A' => '0226', #C moz-1.2
- 'a' => '0227', #c moz-1.2
- 'B' => '1E02',
- 'b' => '1E03',
- 'C' => '010A',
- 'c' => '010B',
- 'D' => '1E0A',
- 'd' => '1E0B',
- 'E' => '0116',
- 'e' => '0117',
- 'F' => '1E1E',
- 'f' => '1E1F',
- 'G' => '0120',
- 'g' => '0121',
- 'H' => '1E22',
- 'h' => '1E23',
- 'i' => '0069',
- 'I' => '0130',
- 'N' => '1E44',
- 'n' => '1E45',
- 'O' => '022E', #Y moz-1.2
- 'o' => '022F', #v moz-1.2
- 'P' => '1E56',
- 'p' => '1E57',
- 'R' => '1E58',
- 'r' => '1E59',
- 'S' => '1E60',
- 's' => '1E61',
- 'T' => '1E6A',
- 't' => '1E6B',
- 'W' => '1E86',
- 'w' => '1E87',
- 'X' => '1E8A',
- 'x' => '1E8B',
- 'Y' => '1E8E',
- 'y' => '1E8F',
- 'Z' => '017B',
- 'z' => '017C',
- },
- 'udotaccent' => { # dot below
- 'A' => '1EA0',
- 'a' => '1EA1',
- 'B' => '1E04',
- 'b' => '1E05',
- 'D' => '1E0C',
- 'd' => '1E0D',
- 'E' => '1EB8',
- 'e' => '1EB9',
- 'H' => '1E24',
- 'h' => '1E25',
- 'I' => '1ECA',
- 'i' => '1ECB',
- 'K' => '1E32',
- 'k' => '1E33',
- 'L' => '1E36',
- 'l' => '1E37',
- 'M' => '1E42',
- 'm' => '1E43',
- 'N' => '1E46',
- 'n' => '1E47',
- 'O' => '1ECC',
- 'o' => '1ECD',
- 'R' => '1E5A',
- 'r' => '1E5B',
- 'S' => '1E62',
- 's' => '1E63',
- 'T' => '1E6C',
- 't' => '1E6D',
- 'U' => '1EE4',
- 'u' => '1EE5',
- 'V' => '1E7E',
- 'v' => '1E7F',
- 'W' => '1E88',
- 'w' => '1E89',
- 'Y' => '1EF4',
- 'y' => '1EF5',
- 'Z' => '1E92',
- 'z' => '1E93',
- },
- 'ubaraccent' => { # line below
- 'B' => '1E06',
- 'b' => '1E07',
- 'D' => '1E0E',
- 'd' => '1E0F',
- 'h' => '1E96',
- 'K' => '1E34',
- 'k' => '1E35',
- 'L' => '1E3A',
- 'l' => '1E3B',
- 'N' => '1E48',
- 'n' => '1E49',
- 'R' => '1E5E',
- 'r' => '1E5F',
- 'T' => '1E6E',
- 't' => '1E6F',
- 'Z' => '1E94',
- 'z' => '1E95',
- },
- ',' => { # cedilla
- 'C' => '00C7',
- 'c' => '00E7',
- 'D' => '1E10',
- 'd' => '1E11',
- 'E' => '0228', #C moz-1.2
- 'e' => '0229', #c moz-1.2
- 'G' => '0122',
- 'g' => '0123',
- 'H' => '1E28',
- 'h' => '1E29',
- 'K' => '0136',
- 'k' => '0137',
- 'L' => '013B',
- 'l' => '013C',
- 'N' => '0145',
- 'n' => '0146',
- 'R' => '0156',
- 'r' => '0157',
- 'S' => '015E',
- 's' => '015F',
- 'T' => '0162',
- 't' => '0163',
- },
- '=' => { # macron
- 'A' => '0100',
- 'a' => '0101',
- 'E' => '0112',
- 'e' => '0113',
- 'I' => '012A',
- 'i' => '012B',
- 'G' => '1E20',
- 'g' => '1E21',
- 'O' => '014C',
- 'o' => '014D',
- 'U' => '016A',
- 'u' => '016B',
- 'Y' => '0232', #? moz-1.2
- 'y' => '0233', #? moz-1.2
- },
- '"' => { # diaeresis
- 'A' => '00C4',
- 'a' => '00E4',
- 'E' => '00CB',
- 'e' => '00EB',
- 'H' => '1E26',
- 'h' => '1E27',
- 'I' => '00CF',
- 'i' => '00EF',
- 'O' => '00D6',
- 'o' => '00F6',
- 't' => '1E97',
- 'U' => '00DC',
- 'u' => '00FC',
- 'W' => '1E84',
- 'w' => '1E85',
- 'X' => '1E8C',
- 'x' => '1E8D',
- 'y' => '00FF',
- 'Y' => '0178',
- },
- 'u' => { # breve
- 'A' => '0102',
- 'a' => '0103',
- 'E' => '0114',
- 'e' => '0115',
- 'G' => '011E',
- 'g' => '011F',
- 'I' => '012C',
- 'i' => '012D',
- 'O' => '014E',
- 'o' => '014F',
- 'U' => '016C',
- 'u' => '016D',
- },
- "'" => { # acute
- 'A' => '00C1',
- 'a' => '00E1',
- 'C' => '0106',
- 'c' => '0107',
- 'E' => '00C9',
- 'e' => '00E9',
- 'G' => '01F4',
- 'g' => '01F5',
- 'I' => '00CD',
- 'i' => '00ED',
- 'K' => '1E30',
- 'k' => '1E31',
- 'L' => '0139',
- 'l' => '013A',
- 'M' => '1E3E',
- 'm' => '1E3F',
- 'N' => '0143',
- 'n' => '0144',
- 'O' => '00D3',
- 'o' => '00F3',
- 'P' => '1E54',
- 'p' => '1E55',
- 'R' => '0154',
- 'r' => '0155',
- 'S' => '015A',
- 's' => '015B',
- 'U' => '00DA',
- 'u' => '00FA',
- 'W' => '1E82',
- 'w' => '1E83',
- 'Y' => '00DD',
- 'y' => '00FD',
- 'Z' => '0179',
- 'z' => '018A',
- },
- '~' => { # tilde
- 'A' => '00C3',
- 'a' => '00E3',
- 'E' => '1EBC',
- 'e' => '1EBD',
- 'I' => '0128',
- 'i' => '0129',
- 'N' => '00D1',
- 'n' => '00F1',
- 'O' => '00D5',
- 'o' => '00F5',
- 'U' => '0168',
- 'u' => '0169',
- 'V' => '1E7C',
- 'v' => '1E7D',
- 'Y' => '1EF8',
- 'y' => '1EF9',
- },
- '`' => { # grave
- 'A' => '00C0',
- 'a' => '00E0',
- 'E' => '00C8',
- 'e' => '00E8',
- 'I' => '00CC',
- 'i' => '00EC',
- 'N' => '01F8',
- 'n' => '01F9',
- 'O' => '00D2',
- 'o' => '00F2',
- 'U' => '00D9',
- 'u' => '00F9',
- 'W' => '1E80',
- 'w' => '1E81',
- 'Y' => '1EF2',
- 'y' => '1EF3',
- },
- '^' => { # circumflex
- 'A' => '00C2',
- 'a' => '00E2',
- 'C' => '0108',
- 'c' => '0109',
- 'E' => '00CA',
- 'e' => '00EA',
- 'G' => '011C',
- 'g' => '011D',
- 'H' => '0124',
- 'h' => '0125',
- 'I' => '00CE',
- 'i' => '00EE',
- 'J' => '0134',
- 'j' => '0135',
- 'O' => '00D4',
- 'o' => '00F4',
- 'S' => '015C',
- 's' => '015D',
- 'U' => '00DB',
- 'u' => '00FB',
- 'W' => '0174',
- 'w' => '0175',
- 'Y' => '0176',
- 'y' => '0177',
- 'Z' => '1E90',
- 'z' => '1E91',
- },
- 'ringaccent' => { # ring
- 'A' => '00C5',
- 'a' => '00E5',
- 'U' => '016E',
- 'u' => '016F',
- 'w' => '1E98',
- 'y' => '1E99',
- },
- 'v' => { # caron
- 'A' => '01CD',
- 'a' => '01CE',
- 'C' => '010C',
- 'c' => '010D',
- 'D' => '010E',
- 'd' => '010F',
- 'E' => '011A',
- 'e' => '011B',
- 'G' => '01E6',
- 'g' => '01E7',
- 'H' => '021E', #K with moz-1.2
- 'h' => '021F', #k with moz-1.2
- 'I' => '01CF',
- 'i' => '01D0',
- 'K' => '01E8',
- 'k' => '01E9',
- 'L' => '013D', #L' with moz-1.2
- 'l' => '013E', #l' with moz-1.2
- 'N' => '0147',
- 'n' => '0148',
- 'O' => '01D1',
- 'o' => '01D2',
- 'R' => '0158',
- 'r' => '0159',
- 'S' => '0160',
- 's' => '0161',
- 'T' => '0164',
- 't' => '0165',
- 'U' => '01D3',
- 'u' => '01D4',
- 'Z' => '017D',
- 'z' => '017E',
- },
- 'H' => { # double acute
- 'O' => '0150',
- 'o' => '0151',
- 'U' => '0170',
- 'u' => '0171',
- },
- 'ogonek' => {
- 'A' => '0104',
- 'a' => '0105',
- 'E' => '0118',
- 'e' => '0119',
- 'I' => '012E',
- 'i' => '012F',
- 'U' => '0172',
- 'u' => '0173',
- 'O' => '01EA',
- 'o' => '01EB',
- },
-);
-
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
-{
- $style_map{$accent_command} = { 'function' => \&t2h_default_accent };
- $old_style_map{$accent_command} = '&default_accent';
- $style_map_texi{$accent_command} = { 'function' => \&t2h_default_accent };
-}
-
-
-%transliterate_accent_map = ();
-foreach my $command (keys(%unicode_accents))
-{
- foreach my $letter(keys (%{$unicode_accents{$command}}))
- {
- $transliterate_accent_map{$unicode_accents{$command}->{$letter}}
- = $letter
- unless
(exists($transliterate_map{$unicode_accents{$command}->{$letter}}));
- }
-}
-
-sub default_accent($$)
-{
- my $text = shift;
- my $accent = shift;
- return "&${text}$accent_map{$accent};" if (defined($accent_map{$accent})
and defined($special_accents{$accent}) and ($text =~
/^[$special_accents{$accent}]$/));
- return '&' . $text . 'ring;' if (($accent eq 'ringaccent') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
- return $text . '<' if ($accent eq 'v');
- return ascii_accents($text, $accent);
-}
-
-sub t2h_default_accent($$)
-{
- my $accent = shift;
- my $args = shift;
-
- my $text = $args->[0];
-
- return ascii_accents($text, $accent);
-}
-
-####################################################################
-# special accent/encoding commands
-#
-# Some functions used to override normal formatting functions in specific
-# cases. The user shouldn't want to change them, but can use them.
-#
-
-sub ascii_accents($$)
-{
- my $text = shift;
- my $accent = shift;
- return $text if ($accent eq 'dotless');
- return $text . "''" if ($accent eq 'H');
- return $text . '.' if ($accent eq 'dotaccent');
- return $text . '*' if ($accent eq 'ringaccent');
- return $text . '[' if ($accent eq 'tieaccent');
- return $text . '(' if ($accent eq 'u');
- return $text . '_' if ($accent eq 'ubaraccent');
- return '.' . $text if ($accent eq 'udotaccent');
- return $text . '<' if ($accent eq 'v');
- return $text . ';' if ($accent eq 'ogonek');
- return $text . $accent if (defined($accent_map{$accent}));
-}
-
-sub xml_default_accent($$)
-{
- my $accent = shift;
- my $args = shift;
-
- my $text = $args->[0];
-
- return "&${text}$accent_map{$accent};" if (defined($accent_map{$accent})
and defined($special_accents{$accent}) and ($text =~
/^[$special_accents{$accent}]$/));
- return '&' . $text . 'ring;' if (($accent eq 'ringaccent') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
- return $text . '<' if ($accent eq 'v');
-# FIXME here there could be a conversion to the character in the right
-# encoding, like
-# if (get_conf('USE_UNICODE') and defined($OUT_ENCODING) and $OUT_ENCODING
ne ''
-# and exists($unicode_accents{$accent}) and
exists($unicode_accents{$accent}->{$text}))
-# {
-# my $encoded_char = Encode::encode($OUT_ENCODING,
chr(hex($unicode_map{$thing})), Encode::FB_QUIET);
-# return $encoded_char if ($encoded_char ne '');
-# }
- if (get_conf('USE_NUMERIC_ENTITY'))
- {
- if (exists($unicode_accents{$accent}) and
exists($unicode_accents{$accent}->{$text}))
- {
- return ('&#' . hex($unicode_accents{$accent}->{$text}) . ';');
- }
- }
- return ascii_accents($text, $accent);
-}
-
-# used to utf8 encode the result
-sub t2h_utf8_accent($$$)
-{
- my $accent = shift;
- my $args = shift;
- my $style_stack = shift;
-
- my $text = $args->[0];
- #print STDERR "$accent\[".scalar(@$style_stack) ."\] (@$style_stack)\n";
-
- # special handling of @dotless{i}
- if ($accent eq 'dotless')
- {
- if (($text eq 'i') and (!defined($style_stack->[-1]) or
(!defined($unicode_accents{$style_stack->[-1]})) or ($style_stack->[-1] eq
'tieaccent')))
- {
- return "\x{0131}";
- }
- #return "\x{}" if ($text eq 'j'); # not found !
- return $text;
- }
-
- # FIXME \x{0131}\x{0308} for @dotless{i} @" doesn't lead to NFC 00ef.
- return Unicode::Normalize::NFC($text .
chr(hex($unicode_diacritical{$accent})))
- if (defined($unicode_diacritical{$accent}));
- return ascii_accents($text, $accent);
-}
-
-sub t2h_utf8_normal_text($$$$$$$;$)
-{
- my $text = shift;
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- $text = &$protect_text($text) unless($in_raw_text);
- $text = uc($text) if (in_small_caps($style_stack));
-
- if (!$in_code and !$in_preformatted)
- {
- $text =~ s/---/\x{2014}/g;
- $text =~ s/--/\x{2013}/g;
- $text =~ s/``/\x{201C}/g;
- $text =~ s/''/\x{201D}/g;
- }
- $text = t2h_text_substitutions($text, $in_raw_text, ($in_preformatted or
$in_code), $in_simple);
- return Unicode::Normalize::NFC($text);
-}
-
-sub t2h_enable_encoding_normal_accent($$$)
-{
- return t2h_enable_encoding_accent ('normal', @_);
-}
-sub t2h_enable_encoding_texi_accent($$$)
-{
- return t2h_enable_encoding_accent ('texi', @_);
-}
-sub t2h_enable_encoding_pre_accent($$$)
-{
- return t2h_enable_encoding_accent ('pre', @_);
-}
-
-sub t2h_enable_encoding_accent($$$$)
-{
- my $context = shift;
- my @other_args = @_;
-
- my $accent = shift;
- my $args = shift;
- my $style_stack = shift;
- my $text = $args->[0];
-
-#print STDERR "enable_encoding_accent called($context) $accent
(@$style_stack)\n";
-
- # in case ENCODING_NAME is not known, the accent functions saved previously
- # are used.
- # This should happen rarely, like during @setfilename parsing.
- return
&{$t2h_enable_encoding_default_accent{$context}->{$accent}}(@other_args) if
(!defined(get_conf('ENCODING_NAME')));
-
- return t2h_utf8_accent($accent,[$text],$style_stack) if
(get_conf('ENCODING_NAME') eq 'utf-8');
-
- # use the saved default handling if this is not a known 8 bit encoding
- return
&{$t2h_enable_encoding_default_accent{$context}->{$accent}}(@other_args) if
(!exists($makeinfo_encoding_to_map{get_conf('ENCODING_NAME')}));
-
- # the following is for the handling of known 8 bit encodings.
- if (scalar(@t2h_enable_encoding_accents_stack))
- {
- # in that case, we already have a result ready that corresponds with the
- # formatting of a part of the stack mapped to
- # t2h_enable_encoding_accents_stack, so it is emptied and the innermost
- # $text is returned as is, such that the unmodified already formatted
- # innermost formatted accented text is returned.
-
- #print STDERR " doing nothing, still in stack
(@t2h_enable_encoding_accents_stack), accent: $accent";
- my $stack_accent = shift @t2h_enable_encoding_accents_stack;
- #print STDERR " stack_accent $stack_accent\n";
- return $text;
- }
-
- # in that case there is no t2h_enable_encoding_accents_stack, so we are
- # at the closing of the innermost accented command. We will try to format
- # all the stack in reverse(@$style_stack) that coresponds with
- # accent commands
- my @accents_stack = ();
- my @styles = reverse(@$style_stack);
-
- # accents are formatted and the intermediate results are kept, such
- # that we can return the maximum of multiaccented letters that can be
- # rendered with a given eight bit formatting.
-
- # first put the letter in the stack
- my @utf8_partial_results = { 'result' => $text,
- 'accents_stack' => [ @accents_stack ]};
-
- # then the accent that is associated with the function call
- my $current_accent = t2h_utf8_accent($accent,[$text],$style_stack);
- @accents_stack = ($accent);
- push @utf8_partial_results, { 'result' => $current_accent,
- 'accents_stack' => [ @accents_stack ]};
-
- # and then all the other accents on the stack
- while (scalar(@styles) and (defined($unicode_accents{$styles[0]}) or
$styles[0] eq 'dotless'))
- {
- my $next_style = shift @styles;
- my @new_stack = reverse(@styles);
- $current_accent =
t2h_utf8_accent($next_style,[$current_accent],address@hidden);
- push @accents_stack, $next_style;
- push @utf8_partial_results, { 'result' => $current_accent,
- 'accents_stack' => [ @accents_stack ]}
- ;
- }
-
- my $enc_map = $makeinfo_encoding_to_map{get_conf('ENCODING_NAME')};
- my $eight_bit;
- my $result;
- # At this point we have the utf8 encoded results for the accent
- # commands stack, with all the intermediate results.
- # For each one we'll check if it is possible to encode it in the
- # current eight bit output encoding table
- foreach my $partial_result (@utf8_partial_results)
- {
- my $char = $partial_result->{'result'};
- my $new_eight_bit = '';
- my $new_codepoint;
-
- if (ord($char) <= 128)
- {
- $new_eight_bit = uc(sprintf("%02x",ord($char)));
- $new_codepoint = uc(sprintf("%04x",ord($char)));
- }
- elsif (ord($char) <= hex(0xFFFF))
- {
- $new_codepoint = uc(sprintf("%04x",ord($char)));
- if (exists($makeinfo_unicode_to_eight_bit{$enc_map}->{$new_codepoint}))
- {
- $new_eight_bit =
$makeinfo_unicode_to_eight_bit{$enc_map}->{$new_codepoint};
- }
- }
- #my $eight_bit_txt = 'undef';
- #$eight_bit_txt = $eight_bit if (defined($eight_bit));
- #print STDERR "" . Encode::encode('utf8', "$char") . "
(@{$partial_result->{'accents_stack'}}), new_codepoint: $new_codepoint 8bit:
$new_eight_bit old:$eight_bit_txt\n";
- # no corresponding eight bit character found
- last if ($new_eight_bit eq '');
-
- # in that case, the new eight bit character is the same than the one
- # found with one less character (and it isnt a @dotless{i}). It may
- # mean 2 things
- # -> there are 2 characters in accent. This could happen, for example
- # if an accent that cannot be rendered is found and it leads to
- # appending or prepending a character. For example this happens for
- # @={@,address@hidden, where @,address@hidden is expanded to a 2
character:
- # n with a tilde, followed by a ,
- # In nthat case, the additional utf8 accent is prepended, which
- # means that it is composed with the , and leaves n with a tilde
- # untouched.
- # -> ord(char) leads to the same for the more inner character.
- # this, for example, happens for @ubaraccent{a}, where ord(a) is
- # the same than ord(a with underbar).
- last if (defined($eight_bit) and (($new_eight_bit eq $eight_bit)
- and !($partial_result->{'accents_stack'}[0] eq 'dotless' and $char eq
'i')));
- $result = $partial_result;
- $eight_bit = $new_eight_bit;
- }
- if (defined($result) and scalar(@{$result->{'accents_stack'}}))
- {
- # we got a result, return it and put in t2h_enable_encoding_accents_stack
- # the stack of accent commands that were processed. They wont be used
- # further, but only unshifted.
-
- #print STDERR "Result: ".Encode::encode('utf8', $result->{'result'}) ."
'$eight_bit' (@{$result->{'accents_stack'}})\n" if defined($result);
- @t2h_enable_encoding_accents_stack = @{$result->{'accents_stack'}};
- # remove the first, it is the accent being processed
- shift @t2h_enable_encoding_accents_stack;
- # it should be noted that we return the 'utf8' accent (which is really
- # a codepoint, and not the eight bit representation, we leave the
- # conversion to perl, which should handle it fine
- return $result->{'result'};
- }
-
- return
&{$t2h_enable_encoding_default_accent{$context}->{$accent}}(@other_args);
-}
-
-# end special accent/encoding commands
-####################################################################
-
-####################################################################
-# TeX/LaTeX, that can especially be used in @math
-# To load the appropriate hash, use
-# default_load_tex_math
-
-my %tex_default_simple_map_math = (
- '{' => '\{',
- '}' => '\}',
- '\\' => '\\'
-);
-
-my %tex_default_math_things_map = %default_things_map;
-
-$tex_default_math_things_map{'bullet'} = '\bullet';
-$tex_default_math_things_map{'copyright'} = '\copyright';
-$tex_default_math_things_map{'registeredsymbol'} = '\circledR';
-$tex_default_math_things_map{'dots'} = '\dots';
-$tex_default_math_things_map{'endots'} = '\dots';
-$tex_default_math_things_map{'equiv'} = '\equiv';
-$tex_default_math_things_map{'expansion'} = '\mapsto';
-$tex_default_math_things_map{'arrow'} = '\rightarrow';
-$tex_default_math_things_map{'point'} = '\star';
-$tex_default_math_things_map{'print'} = '\dashv';
-$tex_default_math_things_map{'result'} = '\Rightarrow';
-$tex_default_math_things_map{'pounds'} = '\pounds';
-$tex_default_math_things_map{'geq'} = '\geq';
-$tex_default_math_things_map{'leq'} = '\leq';
-$tex_default_math_things_map{'textdegree'} = '^\circ';
-
-my %latex_default_math_things_map = %tex_default_math_things_map;
-
-$latex_default_math_things_map{'aa'} = '\mathring{a}';
-$latex_default_math_things_map{'AA'} = '\mathring{A}';
-
-# FIXME Maybe this should not be there since it is not for math but
-# more for a completly separate format.
-my %latex_default_things_map;
-
-foreach my $thing (keys(%default_things_map))
-{
- $latex_default_things_map{$thing} = '\\'.$thing;
-}
-
-$latex_default_things_map{'error'} = '\fbox{error}';
-$latex_default_things_map{'enddots'} = '\dots\@';
-$latex_default_things_map{'exclamdown'} = '\textexclamdown';
-$latex_default_things_map{'questiondown'} = '\textquestiondown';
-$latex_default_things_map{'tie'} = '~';
-$latex_default_things_map{'registeredsymbol'} = '\textregistered';
-$latex_default_things_map{'ordf'} = '\textordfeminine';
-$latex_default_things_map{'ordm'} = '\textordmasculine';
-$latex_default_things_map{'guillemetleft'} = '\guillemotleft';
-$latex_default_things_map{'guillemetright'} = '\guillemotright';
-
-foreach my $text_prefixed_symbols ('bullet', 'exclamdown', 'questiondown',
- 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright')
-{
- $latex_default_things_map{$text_prefixed_symbols} =
'\text'.$text_prefixed_symbols;
-}
-
-foreach my $math_only ('equiv', 'expansion', 'arrow', 'minus', 'point',
- 'print', 'result', 'geq', 'leq')
-{
- $latex_default_things_map{$math_only} =
'$'.$latex_default_math_things_map{$math_only}.'$';
-}
-
-
-# End TeX/LaTeX
-#############################################################
-
-sub default_sc($$)
-{
- return uc($_[0]);
-}
-
-sub default_ctrl($$)
-{
- return "^$_[0]";
-}
-
-# obsolete, no warning, but noop
-sub t2h_default_ctrl($$$)
-{
- shift;
- my $args = shift;
- #return "^$args->[0]";
- return "$args->[0]";
-}
-
-sub default_sc_pre($$)
-{
- return uc($_[0]);
-}
-
-sub default_titlefont($$)
-{
- return "<h1 class=\"titlefont\">$_[0]</h1>" if ($_[0] =~ /\S/);
- return '';
-}
-
-# Return nothing if the text is empty
-sub t2h_default_titlefont($$$)
-{
- shift;
- my $args = shift;
- my $heading = $args->[0];
- return '' unless ($heading =~ /\S/);
- return &$heading_text('@titlefont', $heading, 0);
-}
-
-# At some point in time (before 4.7?) according to the texinfo
-# manual, url shouldn't lead to a link but rather be formatted
-# like text. It is now what indicateurl do, url is the same that
-# uref with one arg. If we did like makeinfo did it would have been
-#sub url($$)
-#{
-# return '<<code>' . $_[0] . '</code>>';
-#}
-#
-# This is unused, t2h_default_uref is used instead
-sub t2h_default_url ($$)
-{
- shift;
- my $args = shift;
- my $url = shift @$args;
- $url = main::normalise_space($url);
- return '' unless ($url =~ /\S/);
- return t2h_default_url_and_text($url);
-}
-
-sub default_url ($$)
-{
- my $url = shift;
- my $command = shift;
- $url =~ s/\s*$//;
- $url =~ s/^\s*//;
- return t2h_default_url_and_text($url);
-}
-
-sub default_uref($$)
-{
- my $arg = shift;
- my $command = shift;
- my ($url, $text, $replacement);
- ($url, $text, $replacement) = split /,\s*/, $arg;
- $url =~ s/\s*$//;
- $url =~ s/^\s*//;
- $text = $replacement if (defined($replacement));
- return t2h_default_url_and_text($url, $text);
-}
-
-sub t2h_default_uref($$)
-{
- shift;
- my $args = shift;
- my $url = shift @$args;
- my $text = shift @$args;
- my $replacement = shift @$args;
- $url = main::normalise_space($url);
- $replacement = '' if (!defined($replacement));
- $replacement = main::normalise_space($replacement);
- $text = '' if (!defined($text));
- $text = main::normalise_space($text);
- $text = $replacement if ($replacement ne '');
- return t2h_default_url_and_text($url, $text);
-}
-
-sub t2h_default_math($$)
-{
- shift;
- my $args = shift;
- my $text = shift @$args;
- return "$text";
-}
-
-sub default_email($$)
-{
- my $arg = shift;
- my $command = shift;
- my ($mail, $text);
- ($mail, $text) = split /,\s*/, $arg;
- $mail =~ s/\s*$//;
- $mail =~ s/^\s*//;
- return t2h_default_url_and_text("mailto:$mail";, $text);
-}
-
-sub t2h_default_email($$)
-{
- my $command = shift;
- my $args = shift;
- my $mail = shift @$args;
- my $text = shift @$args;
- $mail = main::normalise_space($mail);
- if (defined($text))
- {
- $text = main::normalise_space($text);
- }
- my $mailto = '';
- $mailto = "mailto:$mail"; if ($mail ne '');
- return t2h_default_url_and_text($mailto, $text);
-}
-
-sub t2h_default_click_normal($$$)
-{
- return t2h_default_click('normal', @_);
-}
-
-sub t2h_default_click_pre($$$)
-{
- return t2h_default_click('pre', @_);
-}
-
-sub t2h_default_click_texi($$$)
-{
- return t2h_default_click('texi', @_);
-}
-
-sub t2h_default_click($$$$$)
-{
- my $context = shift;
- my $command = shift;
- my $args = shift;
- my $arg = shift @$args;
- my $cmd = get_conf('clickstyle');
- $cmd = 'arrow' if (!defined($cmd) or ($cmd eq ''));
-
- my $hash = \%things_map;
- if ($context eq 'pre')
- {
- $hash = \%pre_map;
- }
- elsif ($context eq 'texi')
- {
- $hash = \%texi_map;
- }
- return $hash->{$cmd} . $arg if (exists($hash->{$cmd}));
- return $arg;
-}
-
-sub t2h_default_hyphenation($$)
-{
- my $command = shift;
- my $args = shift;
- my $text = shift @$args;
- $text =~ s/^\s*//;
- $text =~ s/\s*$//;
- my @list = split /\s+/, $text;
- foreach my $entry (@list)
- {
- my $word = $entry;
- $word =~ s/-//g;
- $Texi2HTML::THISDOC{'hyphenation'}->{$word} = $entry;
- }
-}
-
-sub t2h_default_no_texi_email
-{
- my $command = shift;
- my $args = shift;
- my $mail = shift @$args;
- my $text = shift @$args;
- $mail = main::normalise_space($mail);
- if (defined($text))
- {
- $text = main::normalise_space($text);
- }
- return $text if (defined($text) and ($text ne ''));
- return $mail;
-}
-
-sub t2h_default_no_texi_image($$$$)
-{
- my $command = shift;
- my $args = shift;
- my $file = $args->[0];
- $file = main::trim_around_spaces($file);
- return main::substitute_line($file, "address@hidden", {'remove_texi' => 1,
'code_style' => 1});
-}
-
-sub t2h_default_no_texi_acronym_like($$)
-{
- my $command = shift;
- my $args = shift;
- my $acronym_texi = $args->[0];
- return (main::remove_texi($acronym_texi));
-}
-
-sub t2h_remove_command($$$$)
-{
- return '';
-}
-
-# This is used for style in preformatted sections
-my %old_style_map_pre = %old_style_map;
-$old_style_map_pre{'sc'} = '&default_sc_pre';
-$old_style_map_pre{'titlefont'} = '';
-
-foreach my $command (keys(%style_map))
-{
- $style_map_texi{$command} = {} if (!exists($style_map_texi{$command}));
- $style_map_texi{$command}->{'args'} = [ @{$style_map{$command}->{'args'}} ]
- if (exists($style_map{$command}->{'args'}));
- #print STDERR "COMMAND $command";
-}
-
-%style_map_pre = ();
-
-t2h_default_copy_style_map(\%style_map, \%style_map_pre);
-
-$style_map_pre{'sc'} = {};
-$style_map_pre{'titlefont'} = {};
-$style_map_pre{'click'}->{'function'} = \&t2h_default_click_pre;
-
-$style_map_texi{'sc'} = {};
-$style_map_texi{'email'}->{'function'} = \&t2h_default_no_texi_email;
-$style_map_texi{'click'}->{'function'} = \&t2h_default_click_texi;
-
-####### special styles. You shouldn't need to change them
-%special_style = (
- #'xref' => ['keep','normal','normal','keep','normal'],
- 'xref' => { 'args' => ['keep','keep','keep','keep','keep'],
- 'function' => \&main::do_xref },
- 'ref' => { 'args' => ['keep','keep','keep','keep','keep'],
- 'function' => \&main::do_xref },
- 'pxref' => { 'args' => ['keep','keep','keep','keep','keep'],
- 'function' => \&main::do_xref },
- 'inforef' => { 'args' => ['keep','keep','keep'],
- 'function' => \&main::do_xref },
- 'image' => { 'args' => ['keep','keep','keep','keep','keep'],
'function' => \&main::do_image },
- 'anchor' => { 'args' => ['keep'], 'function' =>
\&main::do_anchor_label },
- 'footnote' => { 'args' => ['keep'], 'function' =>
\&main::do_footnote },
- 'shortcaption' => { 'args' => ['keep'], 'function' =>
\&main::do_caption_shortcaption },
- 'caption' => { 'args' => ['keep'], 'function' =>
\&main::do_caption_shortcaption },
- 'acronym', {'args' => ['keep','keep'], 'function' =>
\&main::do_acronym_like},
- 'abbr', {'args' => ['keep','keep'], 'function' =>
\&main::do_acronym_like},
-);
-
-# @image is replaced by the first arg in strings
-$style_map_texi{'image'} = { 'args' => ['keep','keep','keep','keep','keep'],
- 'function' => \&t2h_default_no_texi_image };
-
-$style_map_texi{'acronym'} = { 'args' => ['keep','keep'],
- 'function' => \&t2h_default_no_texi_acronym_like };
-$style_map_texi{'abbr'} = { 'args' => ['keep','keep'],
- 'function' => \&t2h_default_no_texi_acronym_like };
-
-foreach my $special (keys(%special_style))
-{
- $style_map{$special} = $special_style{$special}
- unless (defined($style_map{$special}));
- $style_map_pre{$special} = $special_style{$special}
- unless (defined($style_map_pre{$special}));
- $style_map_texi{$special} = { 'args' => ['keep'],
- 'function' => \&t2h_remove_command }
- unless (defined($style_map_texi{$special}));
-}
-####### end special styles.
-
-
-#foreach my $command (keys(%style_map))
-#{
-# print STDERR "STYLE_MAP_TEXI $command($style_map_texi{$command}) ";
-# print STDERR "ARGS $style_map_texi{$command}->{'args'} " if
(defined($style_map_texi{$command}->{'args'}));
-# print STDERR "FUN $style_map_texi{$command}->{'function'} " if
(defined($style_map_texi{$command}->{'function'}));
-# print STDERR "\n";
-#}
-
-# uncomment to use the old interface
-#%style_map = %old_style_map;
-#%style_map_pre = %old_style_map_pre;
-
-%simple_format_simple_map_texi = %simple_map_pre;
-%simple_format_texi_map = %pre_map;
-%simple_format_style_map_texi = ();
-
-t2h_default_copy_style_map(\%style_map_texi, \%simple_format_style_map_texi);
-
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
-{
-# $simple_format_style_map_texi{$accent_command}->{'args'} = ['normal'];
- $simple_format_style_map_texi{$accent_command}->{'function'} =
\&t2h_default_accent;
-}
-
-foreach my $hash (\%style_map, \%style_map_pre, \%style_map_texi,
\%simple_format_style_map_texi)
-{
- foreach my $style (keys(%{$hash}))
- {
- $hash->{$style}->{'args'} = ['normal'] if
(!exists($hash->{$style}->{'args'}));
- }
-}
-
-%default_style_map = ();
-%default_style_map_pre = ();
-%default_style_map_texi = ();
-%default_simple_format_style_map_texi = ();
-
-t2h_default_copy_style_map(\%style_map, \%default_style_map);
-t2h_default_copy_style_map(\%style_map_pre, \%default_style_map_pre);
-t2h_default_copy_style_map(\%style_map_texi, \%default_style_map_texi);
-t2h_default_copy_style_map(\%simple_format_style_map_texi,
\%default_simple_format_style_map_texi);
-
-# called here because %default_style_map_texi is used.
-t2h_default_set_variables_default();
-
-#################################################################
-# TeX/LaTeX styles, that can be used in math
-
-my %default_style_tex_map;
-my %default_style_latex_map;
-
-t2h_default_copy_style_map(\%default_style_map, \%default_style_tex_map);
-t2h_default_copy_style_map(\%default_style_map, \%default_style_latex_map);
-
-# common in TeX and LaTeX and both for math and normal text
-
-$default_style_latex_map{'w'}->{'inline_begin'} = '\mbox{';
-$default_style_tex_map{'w'}->{'inline_begin'} = '\mbox{';
-$default_style_latex_map{'dmn'}->{'inline_begin'} = '{\thinspace ';
-$default_style_tex_map{'dmn'}->{'inline_begin'} = '{\thinspace ';
-
-my %default_style_latex_math_map;
-
-t2h_default_copy_style_map(\%default_style_latex_map,
\%default_style_latex_math_map);
-
-my %default_tex_latex_map = (
- 'bf' => [ 'b', 'strong' ],
- 'tt' => [ 'code', 'command', 'env', 'file', 'option', 'samp', 't' ],
- 'it' => [ 'i', 'var', 'emph' ],
- 'sf' => [ 'sanserif' ],
- 'rm' => [ 'r' ],
- 'sl' => [ 'dfn', 'slanted' ],
-);
-
-foreach my $style (keys (%default_tex_latex_map))
-{
- foreach my $command (@{$default_tex_latex_map{$style}})
- {
- $default_style_tex_map{$command}->{'inline_begin'} = '{\\' . $style .' ';
- $default_style_latex_map{$command}->{'inline_begin'} = '\text' . $style
.'{';
- $style = 'normal' if ($style eq 'sl');
- $default_style_latex_math_map{$command}->{'inline_begin'} = '\math' .
$style .'{';
- }
-}
-
-# only in text
-
-$default_style_latex_map{'emph'}->{'inline_begin'} = '\emph{';
-$default_style_latex_map{'var'}->{'inline_begin'} = '\emph{';
-$default_style_latex_map{'sc'}->{'inline_begin'} = '\textsc{';
-
-foreach my $hash (\%default_style_tex_map, \%default_style_latex_map,
\%default_style_latex_math_map)
-{
- foreach my $command (keys(%$hash))
- {
- $hash->{$command}->{'inline_end'} = '}' if
($hash->{$command}->{'inline_begin'});
- }
-}
-
-# no kbd key sc in math
-# 'kbd' - ?
-# 'key' - ?
-
-my %default_style_tex_math_map;
-
-t2h_default_copy_style_map(\%default_style_tex_map,
\%default_style_tex_math_map);
-
-# We don't want to override special commands in math mode for now, as long
-# as they are not handled especially. Also we don't want to modify the math
-# function, it is called to close the @math command and we don't want
-# it to be the turned to the default one when calling
-# FIXME maybe it would be even better not to duplicate default styles in
-# math, like 'email', 'uref'....
-foreach my $command (keys(%special_style), 'math')
-{
- delete $default_style_tex_math_map{$command};
- delete $default_style_latex_math_map{$command};
-}
-
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
-{
- $default_style_latex_map{$accent_command} = { 'function' =>
\&default_tex_accent };
- $default_style_tex_map{$accent_command} = { 'function' =>
\&default_tex_accent };
- $default_style_tex_math_map{$accent_command} = { 'function' =>
\&default_tex_math_accent };
- $default_style_latex_math_map{$accent_command} = { 'function' =>
\&default_latex_math_accent };
-}
-
-my %tex_text_accent_map = (
- ',' => 'c',
- 'ringaccent' => 'r',
- 'dotaccent' => '.',
- 'ubaraccent' => 'b',
- 'udotaccent' => 'd',
- 'ogonek' => 'k',
- 'tieaccent' => 'tie',
-);
-
-sub default_tex_accent($$)
-{
- my $text = shift;
- my $accent = shift;
- return "\\$tex_text_accent_map{$accent}\{$text\}" if
($tex_text_accent_map{$accent});
- if ($accent eq 'dotless')
- {
- return "\\$text" if ($text eq 'i' or $text eq 'j');
- return $text;
- }
- return "\\$accent\{$text\}";
-}
-
-my %tex_math_accent_map = (
- "'" => 'acute',
- '^' => 'hat',
- '`' => 'grave',
- '~' => 'tilde',
- '"' => 'ddot',
- '=' => 'bar',
- 'dotaccent' => 'dot',
- 'u' => 'breve',
- 'ubaraccent' => 'underline',
-);
-
-sub default_latex_math_accent($$)
-{
- my $text = shift;
- my $accent = shift;
- return '\mathring{'.$text.'}' if ($accent eq 'ringaccent');
- return default_tex_math_accent($text, $accent);
-}
-
-sub default_tex_math_accent($$)
-{
- my $text = shift;
- my $accent = shift;
- return "\\$tex_text_accent_map{$accent}\{$text\}" if
($tex_text_accent_map{$accent});
- if ($accent eq 'dotless')
- {
- return "\\${text}math" if ($text eq 'i' or $text eq 'j');
- return $text;
- }
- return ascii_accent($text, $accent);
-}
-
-my $kept_normal_text;
-
-# We assume that in @math the TeX characters have already been
-# rightly protected and so don't protect once more.
-sub default_tex_normal_math_text($$$$$$$;$)
-{
- my @initial_args = @_;
- my $text = shift;
- my $in_raw_text = shift; # remove_texi
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- # Don't protect text in math
- if ($in_math)
- {
- $text = uc($text) if (in_cmd($style_stack, 'sc'));
- return $text;
- }
- return &kept_normal_text(@initial_args);
-}
-
-# This is the entry point to be used by users.
-sub default_load_tex_math(;$)
-{
- my $style = shift;
- $style = 'latex' if (!defined($style));
- %simple_map_math = %tex_default_simple_map_math;
- if ($style eq 'tex')
- {
- %math_map = %tex_default_math_things_map;
- t2h_default_copy_style_map(\%default_style_tex_math_map,
\%style_map_math);
- }
- else
- {
- %math_map = %latex_default_math_things_map;
- t2h_default_copy_style_map(\%default_style_latex_math_map,
\%style_map_math);
- }
- $kept_normal_text = $normal_text;
- $normal_text = \&default_tex_normal_math_text;
-}
-
-# End TeX/LaTeX styles
-#################################################################
-
-# regions expanded or not depending on the value of this hash.
-# @EXPAND sets entries in this hash, and you should better use
-# @EXPAND unless you know what you are doing.
-%texi_formats_map = (
- 'iftex' => 0,
- 'ignore' => 0,
- 'menu' => 0,
- 'ifplaintext' => 0,
- 'ifinfo' => 0,
- 'ifxml' => 0,
- 'ifhtml' => 0,
- 'ifdocbook' => 0,
-# 'html' => 0,
-# 'tex' => 0,
-# 'xml' => 0,
-# 'docbook' => 0,
- 'titlepage' => 1,
- 'documentdescription' => 1,
- 'copying' => 1,
- 'ifnothtml' => 1,
- 'ifnottex' => 1,
- 'ifnotplaintext' => 1,
- 'ifnotinfo' => 1,
- 'ifnotxml' => 1,
- 'ifnotdocbook' => 1,
- 'direntry' => 'normal',
- 'verbatim' => 'raw',
- 'macro' => 'raw',
- 'ifclear' => 'value',
- 'ifset' => 'value' ,
- );
-
-%format_map = (
-# 'quotation' => 'blockquote',
- # lists
-# 'itemize' => 'ul',
- 'enumerate' => '',
-# 'multitable' => 'table',
- 'table' => '',
- 'vtable' => '',
- 'ftable' => '',
- 'group' => '',
- 'raggedright' => '',
-# 'detailmenu' => '',
- );
-
-%special_list_commands = (
- 'table' => {},
- 'vtable' => {},
- 'ftable' => {},
-# 'itemize' => { 'bullet' => '' }
- 'itemize' => {},
- );
-
-%inter_item_commands = (
- 'c' => 1,
- 'comment' => 1,
- 'cindex' => 1
-);
-#
-# texinfo format to align attribute of paragraphs
-#
-
-%paragraph_style = (
- 'center' => 'center',
- 'flushleft' => 'left',
- 'flushright' => 'right',
- );
-
-# complex formats (preformatted)
-%complex_format_map = ();
-foreach my $complex_format ('example', 'smallexample', 'display',
- 'smalldisplay', 'lisp', 'smalllisp', 'format', 'smallformat',
- 'menu', 'detailmenu', 'direntry', 'menu_comment')
-{
- $complex_format_map{$complex_format} = { 'begin' => '', 'end' => '' };
-}
-foreach my $code_complex_format ('example', 'smallexample', 'lisp',
'smalllisp')
-{
- $complex_format_map{$code_complex_format}->{'style'} = 'code';
-}
-
-# not in code_style, according to post on bug-texinfo
-foreach my $format ('menu', 'detailmenu', 'direntry')
-{
- $complex_format_map{$format}->{'class'} = 'menu-preformatted';
-}
-
-# not in code_style, according to post on bug-texinfo
-$complex_format_map{'menu_comment'}->{'class'} = 'menu-comment';
-
-%def_map = (
- # basic commands
- 'deffn', [ 'f', 'category', 'name', 'arg' ],
- 'defvr', [ 'v', 'category', 'name' ],
- 'deftypefn', [ 'f', 'category', 'type', 'name', 'argtype' ],
- 'deftypeop', [ 'f', 'category', 'class' , 'type', 'name', 'argtype' ],
- 'deftypevr', [ 'v', 'category', 'type', 'name' ],
- 'defcv', [ 'v', 'category', 'class' , 'name' ],
- 'deftypecv', [ 'v', 'category', 'class' , 'type', 'name' ],
- 'defop', [ 'f', 'category', 'class' , 'name', 'arg' ],
- 'deftp', [ 't', 'category', 'name', 'argtype' ],
- # shortcuts
- # FIXME i18n
- 'defun', 'deffn Function',
- 'defmac', 'deffn Macro',
- 'defspec', 'deffn {Special Form}',
- 'defvar', 'defvr Variable',
- 'defopt', 'defvr {User Option}',
- 'deftypefun', 'deftypefn {Function}',
- 'deftypevar', 'deftypevr Variable',
- 'defivar', 'defcv {Instance Variable}',
- 'deftypeivar', 'deftypecv {Instance Variable}',
- 'defmethod', 'defop Method',
- 'deftypemethod', 'deftypeop Method',
- );
-
-$def_always_delimiters = "()[]";
-$def_in_type_delimiters = ",;";
-$def_argument_separator_delimiters = "()[],";
-
-$warn_var_character_quoted = quotemeta("()[],");
-
-# basic x commands
-foreach my $key (keys(%def_map))
-{
- $def_map{$key . 'x'} = $def_map{$key};
-}
-
-#
-# miscalleneous commands
-#
-# Depending on the value, the command arg or spaces following the command
-# are handled differently:
-#
-# the value is a reference on a hash.
-# the hash keys are
-# 'arg' if the value is 'line' then the remaining of the line is the arg
-# if it is a number it is the number of args (separated by spaces)
-# 'skip' if the value is 'line' then the remaining of the line is skipped
-# if the value is 'space' space but no newline is skipped
-# if the value is 'whitespace' space is skipped
-# if the value is 'linewhitespace' space is skipped if there are
-# only spaces remaining on the line
-# if the value is 'linespace' space but no newline is skipped if
-# there are only spaces remaining on the line
-# 'keep' if true the args and the macro are kept, otherwise the macro
-# args and skipped stuffs are removed
-%misc_command = (
- 'bye' => {'skip' => 'line'}, # no arg
- # set, clear
- #'set' => {'skip' => 'line'}, # special arg
- 'set' => {'arg' => 'line'}, # special arg
- #'clear' => {'skip' => 'line'}, # special arg
- 'clear' => {'arg' => 1, 'skip' => 'line'}, # special arg
- 'alias' => {'args' => 3, 'skip' => 'line'}, # special arg
- # comments
- 'comment' => {'arg' => 'line'},
- 'c' => {'arg' => 'line'},
-
- # not needed for formatting
- 'raisesections' => {'skip' => 'line'}, # no arg
- 'lowersections' => {'skip' => 'line'}, # no arg
- 'contents' => {}, # no arg
- 'shortcontents' => {}, # no arg
- 'summarycontents'=> {}, # no arg
- 'setcontentsaftertitlepage' => {}, # no arg
- 'setshortcontentsaftertitlepage' => {}, # no arg
- #'clickstyle' => {'skip' => 'line'}, # arg should be an @-command
- 'clickstyle' => {'arg' => 'line'}, # arg should be an @-command
- # in preamble
- 'novalidate' => {}, # no arg
- 'dircategory'=> {'arg' => 'line'}, # line. Position with regard
- # with direntry is significant
- 'pagesizes' => {'skip' => 'line', 'arg' => 'line'}, # can have 2 args
- # or one? 200mm,150mm 11.5in
- 'finalout' => {'skip' => 'line'}, # no arg
- 'paragraphindent' => {'skip' => 'line', 'arg' => 1}, # arg none asis
- # or a number and forbids anything else on the
line
- 'firstparagraphindent' => {'skip' => 'line', 'arg' => 1}, # none insert
- 'frenchspacing' => {'arg' => 1, 'skip' => 'line'}, # on off
- # not so sure about 'skip' => 'line'
- 'fonttextsize' => {'arg' => 1}, # 10 11
- 'allowcodebreaks' => {'arg' => 1, 'skip' => 'line'}, # false or true
- 'exampleindent' => {'skip' => 'line', 'arg' => 1}, # asis or a number
- 'footnotestyle'=> {'skip' => 'line', 'arg' => 1}, # end and separate
- # and nothing else on the line
- 'afourpaper' => {'skip' => 'line'}, # no arg
- 'afivepaper' => {'skip' => 'line'}, # no arg
- 'afourlatex' => {'skip' => 'line'}, # no arg
- 'afourwide' => {'skip' => 'line'}, # no arg
- 'headings'=> {'skip' => 'line', 'arg' => 1},
- #off on single double singleafter doubleafter
- # interacts with setchapternewpage
- 'setchapternewpage' => {'skip' => 'line', 'arg' => 1}, # off on odd
- 'everyheading' => {'arg' => 'line'},
- 'everyfooting' => {'arg' => 'line'},
- 'evenheading' => {'arg' => 'line'},
- 'evenfooting' => {'arg' => 'line'},
- 'oddheading' => {'arg' => 'line'},
- 'oddfooting' => {'arg' => 'line'},
- 'smallbook' => {'skip' => 'line'}, # no arg
- 'setfilename' => {'arg' => 'line'},
- 'definfoenclose' => {'arg' => 'line'},
- #'shorttitle' => {'arg' => 'line', 'texi' => 1},
- #'shorttitlepage' => {'arg' => 'line', 'texi' => 1},
- #'settitle' => {'arg' => 'line', 'texi' => 1},
- #'author' => {'arg' => 'line', 'texi' => 1},
- #'subtitle' => {'arg' => 'line', 'texi' => 1},
- #'title' => {'arg' => 'line', 'texi' => 1},
- 'shorttitle' => {'arg' => 'line'},
- 'shorttitlepage' => {'arg' => 'line'},
- 'settitle' => {'arg' => 'line'},
- 'author' => {'arg' => 'line'},
- 'subtitle' => {'arg' => 'line'},
- 'title' => {'arg' => 'line'},
- 'syncodeindex' => {'skip' => 'line', 'arg' => 2},
- # args are index identifiers
- 'synindex' => {'skip' => 'line', 'arg' => 2},
- 'defindex' => {'skip' => 'line', 'arg' => 1}, # one identifier arg
- 'defcodeindex' => {'skip' => 'line', 'arg' => 1}, # one identifier arg
- #'documentlanguage' => {'skip' => 'whitespace', 'arg' => 1},
- 'documentlanguage' => {'skip' => 'line', 'arg' => 1},
- # language code arg
- 'kbdinputstyle' => {'skip' => 'whitespace', 'arg' => 1}, # code
- #example distinct
- 'everyheadingmarks' => {'skip' => 'line', 'arg' => 1}, # top bottom
- 'everyfootingmarks' => {'skip' => 'whitespace', 'arg' => 1},
- 'evenheadingmarks' => {'skip' => 'whitespace', 'arg' => 1},
- 'oddheadingmarks' => {'skip' => 'whitespace', 'arg' => 1},
- 'evenfootingmarks' => {'skip' => 'whitespace', 'arg' => 1},
- 'oddfootingmarks' => {'skip' => 'whitespace', 'arg' => 1},
- 'sp' => {'skip' => 'line', 'arg' => 1}, # no arg
- # at the end of line or a numerical arg
- # formatting
- 'page' => {}, # no arg (pagebreak)
- 'refill' => {}, # no arg (obsolete, to be ignored)
- 'noindent' => {'skip' => 'whitespace'}, # no arg
- 'indent' => {'skip' => 'whitespace'},
- 'need' => {'skip' => 'line', 'arg' => 1}, # one numerical/real arg
- 'exdent' => {'skip' => 'space'},
- # not valid for info (should be in @iftex)
- 'vskip' => {'arg' => 'line'}, # arg line in TeX
- 'cropmarks' => {}, # no arg
- # miscalleneous
- 'verbatiminclude'=> {'arg' => 'line'},
- 'documentencoding' => {'arg' => 1, 'skip' => 'line'},
- # obsolete @-commands. Remove spaces and end of lines after the
- # commands? If no, they can lead to empty lines
- 'quote-arg' => {'skip' => 'line'},
- 'allow-recursion' => {'skip' => 'line'},
- );
-
-my %misc_command_old = (
- # not needed for formatting
- 'raisesections', 'line', # no arg
- 'lowersections', 'line', # no arg
- 'contents', 1, # no arg
- 'shortcontents', 1, # no arg
- 'summarycontents', 1, # no arg
- 'detailmenu', 'whitespace', # no arg
- 'end detailmenu', 'whitespace', # no arg
- #'end detailmenu', 1, # no arg
- 'novalidate', 1, # no arg
- 'bye', 'line', # no arg
- # comments
- 'comment', 'line',
- 'c', 'line',
- # in preamble
- 'dircategory', 'line', # line. Position with regard with direntry is
- # significant
- 'pagesizes', 'line arg2', # can have 2 args
- 'finalout', 1, # no arg
- 'paragraphindent', 'line arg1', # in fact accepts only none asis
- # or a number and forbids anything else on the
line
- 'firstparagraphindent', 'line arg1', # in fact accepts only none insert
- 'exampleindent', 'line arg1', # in fact accepts only asis or a number
- 'footnotestyle', 'line arg1', # in fact accepts only end and separate
- # and nothing else on the line
- 'afourpaper', 'line', # no arg
- 'afourlatex', 'line', # no arg
- 'afourwide', 'line', # no arg
- 'headings', 'line', # one arg, possibilities are
- #off on single double singleafter doubleafter
- # interacts with setchapternewpage
- 'setchapternewpage', 'line', # no arg
- 'everyheading', 'line',
- 'everyfooting', 'line',
- 'evenheading', 'line',
- 'evenfooting', 'line',
- 'oddheading', 'line',
- 'oddfooting', 'line',
- 'smallbook', 'line', # no arg
- 'setfilename', 'line',
- 'shorttitle', 'linetexi',
- 'shorttitlepage', 'linetexi',
- 'settitle', 'linetexi',
- 'author', 'linetexi',
- 'subtitle', 'linetexi',
- 'title','linetexi',
- 'syncodeindex','linespace arg2', # args are
- 'synindex','linespace arg2',
- 'defindex', 'line arg1', # one identifier arg
- 'defcodeindex', 'line arg1', # one identifier arg
- 'documentlanguage', 'whitespace arg1', # one language code arg
- 'kbdinputstyle', 'whitespace arg1', # one arg within
- #code example distnct
- 'sp', 'whitespace arg1', # no arg at the en of line or a numerical arg
- # formatting
- 'page', 1, # no arg (pagebreak)
- 'refill', 1, # no arg (obsolete, to be ignored))
- 'noindent', 'space', # no arg
- 'need', 'line arg1', # one numerical/real arg
- 'exdent', 'space',
- # not valid for info (should be in @iftex)
- 'vskip', 'line', # arg line in TeX
- 'cropmarks', 1, # no arg
- # miscalleneous
- 'verbatiminclude', 'line',
- 'documentencoding', 'arg1',
- );
-
-# The command_handler arrays are for commands formatted externally.
-# The function references in @command_handler_init are called
-# before the second pass, before the @-commands text collection.
-# Those in @command_handler_process are called between the second pass
-# and the third pass, after collection of @-commands text and before their
-# expansion.
-# Those in @command_handler_process are called after the third pass,
-# after the document generation.
address@hidden = ();
address@hidden = ();
address@hidden = ();
address@hidden = ();
address@hidden = ();
address@hidden = ();
-
-
-sub t2h_default_push_handler($$)
-{
- my $function = shift;
- my $handlers = shift;
- push @$handlers, $function unless (grep {$_ eq $function} @$handlers);
-}
-
-# the keys of %command_handler are @-command names and the value
-# is a hash reference with the following keys:
-# 'init' function reference used to collect the @-command text
-# 'expand' function reference used when expanding the @-command text
-%command_handler = ();
-
-
-# formatting functions
-
-$anchor = \&t2h_default_anchor;
-$def_item = \&t2h_default_def_item;
-$def = \&t2h_default_def;
-$menu_command = \&t2h_default_menu_command;
-$menu_link = \&t2h_default_menu_link;
-#$menu_comment = \&t2h_default_menu_comment;
-$menu_description = \&t2h_default_menu_description;
-#$simple_menu_link = \&t2h_default_simple_menu_link;
-$table_item = \&t2h_default_table_item;
-$table_line = \&t2h_default_table_line;
-$table_list = \&t2h_default_table_list;
-$row = \&t2h_default_row;
-$cell = \&t2h_default_cell;
-$list_item = \&t2h_default_list_item;
-$comment = \&t2h_default_comment;
-$def_line = \&t2h_default_def_line;
-$def_line_no_texi = \&t2h_default_def_line_no_texi;
-$raw = \&t2h_default_raw;
-$raw_no_texi = \&t2h_default_raw_no_texi;
-$heading = \&t2h_default_heading;
-$heading_text = \&t2h_default_heading_text;
-$heading_text_preformatted = \&t2h_default_heading_text_preformatted;
-$element_heading = \&t2h_default_element_heading;
-$heading_no_texi = \&t2h_default_heading_no_texi;
-$external_href = \&t2h_default_external_href;
-$paragraph = \&t2h_default_paragraph;
-$preformatted = \&t2h_default_preformatted;
-$foot_line_and_ref = \&t2h_default_foot_line_and_ref;
-$foot_section = \&t2h_default_foot_section;
-$image_files = \&t2h_default_image_files;
-$image = \&t2h_default_image;
-$index_entry_label = \&t2h_default_index_entry_label;
-$index_summary = \&t2h_default_index_summary;
-$summary_letter = \&t2h_default_summary_letter;
-$index_entry = \&t2h_default_index_entry;
-$index_entry_command = \&t2h_default_index_entry_command;
-$index_letter = \&t2h_default_index_letter;
-#$printindex = \&t2h_default_printindex;
-$print_index = \&t2h_default_print_index;
-$protect_text = \&t2h_default_protect_text;
-$normal_text = \&t2h_default_normal_text;
-$cartouche = \&t2h_default_cartouche;
-$sp = \&t2h_default_sp;
-$definition_category = \&t2h_default_definition_category;
-$definition_index_entry = \&t2h_default_definition_index_entry;
-$copying_comment = \&t2h_default_copying_comment;
-$documentdescription = \&t2h_default_documentdescription;
-$index_summary_file_entry = \&t2h_default_index_summary_file_entry;
-$index_summary_file_end = \&t2h_default_index_summary_file_end;
-$index_summary_file_begin = \&t2h_default_index_summary_file_begin;
-$empty_line = \&t2h_default_empty_line;
-$float = \&t2h_default_float;
-$listoffloats = \&t2h_default_listoffloats;
-$listoffloats_entry = \&t2h_default_listoffloats_entry;
-$listoffloats_caption = \&t2h_default_listoffloats_caption;
-$listoffloats_float_style = \&t2h_default_listoffloats_float_style;
-$listoffloats_style = \&t2h_default_listoffloats_style;
-$acronym_like = \&t2h_default_acronym_like;
-$quotation = \&t2h_default_quotation;
-$paragraph_style_command = \&t2h_default_paragraph_style_command;
-$heading_texi = \&t2h_default_heading_texi;
-$index_element_heading_texi = \&t2h_default_index_element_heading_texi;
-$element_label = \&t2h_default_element_label;
-$anchor_label = \&t2h_default_anchor_label;
-$preserve_misc_command = \&t2h_default_preserve_misc_command;
-$format_list_item_texi = \&t2h_default_format_list_item_texi;
-$begin_format_texi = \&t2h_default_begin_format_texi;
-$insertcopying = \&t2h_default_insertcopying;
-$simple_command = \&t2h_default_simple_command;
-$thing_command = \&t2h_default_thing_command;
-$line_command = \&t2h_default_line_command;
-$internal_links = \&t2h_default_internal_links;
-
-# address is not used anymore
-$address = \&t2h_default_address;
-
-# return the line after preserving things according to misc_command map.
-# You should not change it. It is here, nevertheless, to be used
-# in other function references if needed.
-sub t2h_default_preserve_misc_command($$)
-{
- my $line = shift;
- my $macro = shift;
- my $text = '';
- my $args = [];
- my $skip_spec = '';
- my $arg_spec = '';
-
-#print STDERR "HHHHHHHHH $line $macro\n";
- $skip_spec = $misc_command{$macro}->{'skip'}
- if (defined($misc_command{$macro}->{'skip'}));
- $arg_spec = $misc_command{$macro}->{'arg'}
- if (defined($misc_command{$macro}->{'arg'}));
-
- if ($arg_spec eq 'line')
- {
- $text .= $line;
- $args = [ $line ];
- $line = '';
- }
- elsif ($arg_spec)
- {
- my $arg_nr = $misc_command{$macro}->{'arg'};
- while ($arg_nr)
- {
- if ($line =~ s/^(\s+)(\S*)//o)
- {
- $text .= $1.$2;
- my $argument = $2;
- push @$args, $argument if ($argument ne '');
- }
- else
- {
- last;
- }
- $arg_nr--;
- }
-# while ($arg_nr)
-# {
-# $line =~ s/(\s+\S*)//o;
-# my $argument = $1;
-# if (defined($argument))
-# {
-# $text .= $argument;
-# push @$args, $argument;
-# }
-# $arg_nr--;
-# }
- }
-
- if ($macro eq 'bye')
- {
- $line = '';
- $text = "\n";
- }
- elsif ($skip_spec eq 'linespace')
- {
- if ($line =~ /^\s*$/o)
- {
- $line =~ s/^([ \t]*)//o;
- $text .= $1;
- }
- }
- elsif ($skip_spec eq 'linewhitespace')
- {
- if ($line =~ /^\s*$/o)
- {
- $text .= $line;
- $line = '';
- }
- }
- elsif ($skip_spec eq 'line')
- {
- $text .= $line;
- $line = '';
- }
- elsif ($skip_spec eq 'whitespace')
- {
- $line =~ s/^(\s*)//o;
- $text .= $1;
- }
- elsif ($skip_spec eq 'space')
- {
- $line =~ s/^([ \t]*)//o;
- $text .= $1;
- }
- $line = '' if (!defined($line));
- return ($line, $text, $args);
-}
-
-sub t2h_default_simple_command($$$$$)
-{
- my $command = shift;
- my $in_preformatted = shift;
- my $in_math = shift;
- my $line_nr = shift;
- my $state = shift;
-
- if ($in_math)
- {
- my $result = $simple_map_pre{$command};
- $result = $simple_map_math{$command} if
(defined($simple_map_math{$command}));
- return $result;
- }
- elsif ($in_preformatted)
- {
- return $simple_map_pre{$command};
- }
- else
- {
- return $simple_map{$command};
- }
-}
-
-sub t2h_default_thing_command($$$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $in_preformatted = shift;
- my $in_math = shift;
- my $line_nr = shift;
- my $state = shift;
-
- my $result;
- if ($in_math)
- {
- $result = $pre_map{$command};
- $result = $math_map{$command} if (defined($math_map{$command}));
- }
- elsif ($in_preformatted)
- {
- $result = $pre_map{$command};
- }
- else
- {
- $result = $things_map{$command};
- }
- return $result . $text;
-}
-
-# this is called each time a format begins. Here it is used to keep a
-# record of the multitables to have a faithful count of the cell nr.
-sub t2h_default_begin_format_texi($$$)
-{
- my $command = shift;
- my $line = shift;
- my $state = shift;
-
- # remove space in front of center, unless it removes the end of line!
- $line =~ s/^\s*// if ($command eq 'center' and $line =~ /\S/);
- return $line;
-}
-
-# This function is called whenever a complex format is processed
-#
-# arguments:
-# name of the format
-# text appearing inside the format
-#
-# an eval of $complex_format->{format name}->{'begin'} should lead to the
-# beginning of the complex format, an eval of
-# $complex_format->{format name}->{'end'} should lead to the end of the
-# complex format.
-sub t2h_default_complex_format($$)
-{
- my $name = shift;
- my $text = shift;
- return '' if ($text eq '');
- return '' if ($name eq 'direntry');
- my $beginning;
- my $end;
- # FIXME obsoleted in nov 2009
- if (exists($complex_format_map->{$name}))
- {
- $beginning = eval "$complex_format_map->{$name}->{'begin'}";
- if ($@ ne '')
- {
- main::msg_debug("Evaluation of
$complex_format_map->{$name}->{'begin'}: $@");
- $beginning = '';
-
- }
- $end = eval "$complex_format_map->{$name}->{'end'}";
- if ($@ ne '')
- {
- main::msg_debug("Evaluation of
$complex_format_map->{$name}->{'end'}: $@");
- $end = '';
- }
- }
- else
- {
- $beginning = $complex_format_map{$name}->{'begin'};
- $beginning = '' if (!defined($beginning));
- $end = $complex_format_map{$name}->{'end'};
- $end = '' if (!defined($end));
- }
- return $beginning . $text . $end;
-}
-
-sub t2h_default_empty_line($$)
-{
- my $text = shift;
- my $state = shift;
- #ignore the line if it just follows a deff
- return '' if ($state->{'deff_line'});
- return $text;
-}
-
-sub t2h_default_unknown($$$$$)
-{
- my $macro = shift;
- my $line = shift;
- my $pass = shift;
- my $stack = shift;
- my $state = shift;
-
- my ($result_line, $result, $result_text, $message);
- return ($line, 0, undef, undef);
-}
-
-sub t2h_default_unknown_style($$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $state = shift;
- my $no_close = shift;
- my $no_open = shift;
-
- my ($result, $result_text, $message);
- return (0, undef, undef);
-}
-
-sub t2h_default_caption_shortcaption($)
-{
- my $float = shift;
- my $caption_lines;
- my $shortcaption_lines;
- my $style = $float->{'style_texi'};
- if (defined($float->{'nr'}))
- {
- my $nr = $float->{'nr'};
- if ($style ne '')
- {
- $style = gdt('{style} {number}', { 'style' => $style, 'number' =>
$nr});
- }
- else
- {
- $style = $nr;
- }
- }
- my $empty_caption = 1;
- if (defined($float->{'caption_texi'}) and @{$float->{'caption_texi'}})
- {
- @$caption_lines = @{$float->{'caption_texi'}};
- $caption_lines->[0] =~ s/^\s*//;
- if ($caption_lines->[0] =~ /\S/ or @$caption_lines > 2)
- {
- $empty_caption = 0;
- }
- }
-
- if (!$empty_caption)
- {
- if (defined($style))
- {
- $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' . gdt('{style}:
{caption_first_line}', { 'style' => $style, 'caption_first_line' =>
$caption_lines->[0] });
- }
- else
- {
- $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
$caption_lines->[0];
- }
- push @$caption_lines, "}\n";
- }
- elsif (defined($style))
- {
- $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' . $style . '}' . "\n";
- }
-
- my $empty_shortcaption = 1;
- if (defined($float->{'shortcaption_texi'}) and
@{$float->{'shortcaption_texi'}})
- {
- @$shortcaption_lines = @{$float->{'shortcaption_texi'}};
- $shortcaption_lines->[0] =~ s/^\s*//;
- if ($shortcaption_lines->[0] =~ /\S/ or @$shortcaption_lines > 1)
- {
- $empty_shortcaption = 0;
- }
- }
-
- if (!$empty_shortcaption)
- {
- if (defined($style))
- {
- $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
gdt('{style}: {shortcaption_first_line}', { 'style' => $style,
'shortcaption_first_line' => $shortcaption_lines->[0] });
- }
- else
- {
- $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
$shortcaption_lines->[0];
- }
- push @$shortcaption_lines, "}\n";
- }
- elsif (defined($style))
- {
- $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' . $style . '}' .
"\n";
- }
- return ($caption_lines, $shortcaption_lines);
-}
-
-# everything is done in &$float
-sub t2h_default_caption_shortcaption_command($$$$)
-{
- my $command = shift;
- my $text = shift;
- my $texi_lines = shift;
- my $float_element = shift;
- return '';
-}
-
-sub t2h_default_float($$$$$)
-{
- my $text = shift;
- my $float = shift;
- my $caption = shift;
- my $shortcaption = shift;
-
- my $label = '';
- if (exists($float->{'id'}))
- {
- $label = &$anchor($float->{'id'});
- }
- my $caption_text = '';
-
- if (defined($float->{'caption_texi'}))
- {
- $caption_text = $caption;
- }
- elsif (defined($float->{'shortcaption_texi'}))
- {
- $caption_text = $shortcaption;
- }
- elsif (defined($caption))
- {
- $caption_text = $caption;
- }
-
- return $text . "\n" . $caption_text;
-}
-
-sub t2h_default_listoffloats_style($)
-{
- my $style_texi = shift;
- return ($style_texi);
-}
-
-sub t2h_default_listoffloats_float_style($$)
-{
- my $style_texi = shift;
- my $float = shift;
-
- my $style = $float->{'style_texi'};
- #print STDERR "listoffloat/float style mismatch $style_texi $style\n" if
($style_texi ne $style);
- if (defined($float->{'nr'}))
- {
- my $nr = $float->{'nr'};
- if ($style ne '')
- {
- $style = gdt('{style} {number}', { 'style' => $style, 'number'
=> $nr});
- }
- else
- {
- $style = $nr;
- }
- }
- return $style;
-}
-
-sub t2h_default_listoffloats_caption($)
-{
- my $float = shift;
- if (defined($float->{'shortcaption_texi'}))
- {
- return ([ @{$float->{'shortcaption_texi'}} ], 'shortcaption');
- }
- elsif (defined($float->{'caption_texi'}))
- {
- return ([ @{$float->{'caption_texi'}} ], 'caption');
- }
- return ([ ], undef);
-}
-
-sub t2h_default_listoffloats_entry($$$$)
-{
- my $style_texi = shift;
- my $float = shift;
- my $float_style = shift;
- my $caption = shift;
- my $href = shift;
-
- my @lines = split /^/, $caption;
- $caption = $lines[0];
- $caption = '' if (!defined($caption));
- chomp ($caption);
-
- $caption = $float->{'text'} if ($caption eq '' and
defined($float->{'text'}) and $float->{'text'} =~ /\S/);
-
- return "* $float_style: ${caption}\n";
-}
-
-sub t2h_default_listoffloats($$$)
-{
- my $style_texi = shift;
- my $style = shift;
- my $float_entries = shift;
-
- my $result = "* List of $style:\n";
- foreach my $float_entry (@$float_entries)
- {
- $result .= $float_entry;
- }
- return $result . "\n";
-}
-
-sub t2h_default_insertcopying($$$)
-{
- my $text = shift;
- my $comment = shift;
- my $simple_text = shift;
- return $text;
-}
-
-sub t2h_default_protect_text($)
-{
- my $text = shift;
- return $text;
-}
-
-# This function is used to protect characters which are special in xml
-# in inline text: &, ", <, and >.
-#
-# argument:
-# text to be protected
-sub xml_default_protect_text($)
-{
- my $text = shift;
- $text =~ s/&/&/g;
- $text =~ s/</</g;
- $text =~ s/>/>/g;
- $text =~ s/\"/"/g;
- return $text;
-}
-
-sub in_cmd($$)
-{
- my $style_stack = shift;
- my $command = shift;
- my $result = 0;
- if ($style_stack and scalar(@{$style_stack}))
- {
- my $level = $#$style_stack;
- #print STDERR ":::$level ::@{$style_stack}\n";
- while ($level >= 0)
- {
- if ($style_stack->[$level] eq $command)
- {
- $result = 1;
- last;
- }
- $level--;
- }
- }
- return $result;
-}
-#
-#
-
-sub in_small_caps($)
-{
- my $style_stack = shift;
- my $in_sc = 0;
- if ($style_stack and scalar(@{$style_stack}))
- {
- my $level = $#$style_stack;
- #print STDERR ":::$level ::@{$style_stack}\n";
- while ($level >= 0)
- {
- if ($style_stack->[$level] eq 'sc')
- {
- $in_sc = 1;
- last;
- }
- $level--;
- }
- }
- return $in_sc;
-}
-#
-#
-sub t2h_default_normal_text($$$$$$$;$)
-{
- my @initial_args = @_;
- my $text = shift;
- my $in_raw_text = shift; # remove_texi
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- # like utf8.init
- if (get_conf('ENABLE_ENCODING') and !get_conf('ENABLE_ENCODING_USE_ENTITY')
and defined(get_conf('ENCODING_NAME')) and get_conf('ENCODING_NAME') eq 'utf-8'
and get_conf('USE_UNICODE'))
- {
- return &t2h_utf8_normal_text(@initial_args);
- }
-
- $text = uc($text) if (in_cmd($style_stack, 'sc'));
- if (! $in_code and !$in_preformatted)
- {
- $text =~ s/---/\x{1F}/g;
- $text =~ s/--/-/g;
- $text =~ s/\x{1F}/--/g;
- $text =~ s/``/"/g;
- $text =~ s/\'\'/"/g;
- }
- else
- {
- # to be like tex. This would be wrong, however.
-# my $special_code = 0;
-# $special_code = 1 if (in_cmd($style_stack, 'code') or
-# in_cmd($style_stack, 'example') or in_cmd($style_stack,
'verbatim'));
-# $text =~ s/'/\&rsquo\;/g unless ($special_code and
exists($main::value{'txicodequoteundirected'}));
-# $text =~ s/`/\&lsquo\;/g unless ($special_code and
exists($main::value{'txicodequotebacktick'}));
- }
- $text = t2h_text_substitutions($text, $in_raw_text, ($in_preformatted or
$in_code), $in_simple);
- return $text;
-}
-
-sub t2h_default_url_and_text($;$)
-{
- my $url = shift;
- my $text = shift;
- if (!defined($text) or $text eq '')
- {
- return "<$url>" if (defined($url) and $url ne '');
- return '';
- }
- else
- {
- return $text if (!defined($url) or $url eq '');
- return "$text <$url>";
- }
-}
-
-# This function produces an anchor. This need is quite html specific.
-#
-# arguments:
-# $name : anchor name
-# $href : anchor href
-# text : text displayed
-# extra_attribs : added to anchor attributes list
-sub t2h_default_anchor($;$$$)
-{
- my $name = shift;
- my $href = shift;
- my $text = shift;
- my $attributes = shift;
- return $text if (defined($text));
- return '';
-}
-
-# This function is used to format the text associated with a @deff/@end deff
-#
-# argument:
-# text
-#
-# DEF_TABLE should be used to distinguish between @def formatted as table
-# and as definition lists.
-sub t2h_default_def_item($$$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $command = shift;
- if ($text =~ /\S/)
- {
- return $text;
- }
- return '';
-}
-
-sub t2h_default_definition_category($$$$)
-{
- my $name = shift;
- my $class = shift;
- my $style = shift;
- my $command = shift;
- return ($name) if (!defined($class) or $class =~ /^\s*$/);
- if ($style eq 'f')
- {
- return gdt('{name} on {class}', { 'name' => $name, 'class' => $class
});
- }
- elsif ($style eq 'v')
- {
- return gdt('{name} of {class}', { 'name' => $name, 'class' => $class
});
- }
- else
- {
- return $name;
- }
-}
-
-sub t2h_default_definition_index_entry($$$$)
-{
- my $name = shift;
- my $class = shift;
- my $style = shift;
- my $command = shift;
- return ($name) if (!defined($class) or $class =~ /^\s*$/);
- if ($style eq 'f')
- {
- return gdt('{name} on {class}', { 'name' => $name, 'class' => $class
});
- }
- elsif ($style eq 'v' and $command ne 'defcv')
- {
- return gdt('{name} of {class}', { 'name' => $name, 'class' => $class
});
- }
- else
- {
- return $name;
- }
-}
-
-sub t2h_default_summary_letter($$$$$$$)
-{
- my $letter = shift;
- my $file = shift;
- my $default_identifier = shift;
- my $index_element_id = shift;
- my $number = shift;
- my $index_element = shift;
- my $index_name = shift;
-
- return '';
-}
-
-
-# format the container for the @deffn line and text
-#
-# argument
-# text of the whole @def, line and associated text.
-#
-# DEF_TABLE should be used.
-sub t2h_default_def($$)
-{
- my $text = shift;
- my $command = shift;
- if ($text =~ /\S/)
- {
- return $text;
- }
- return '';
-
-}
-
-# a whole menu
-#
-# argument:
-# the whole menu text (entries and menu comments)
-#
-# argument:
-# whole menu text.
-# not used since menu is a normal preformatted command with SIMPLE_MENU
-sub t2h_default_menu_command($$$)
-{
- my $format = shift;
- my $text = shift;
- my $in_preformatted = shift;
- return "* Menu:\n".$text."\n";
-
-}
-
-# formats a menu entry link pointing to a node or section
-#
-# arguments:
-# the entry text
-# the state, a hash reference holding informations about the context, with a
-# usefull entry, 'preformatted', true if we are in a preformatted format
-# (a format keeping space between words). In that case a function
-# of the main program, main::do_preformatted($text, $state) might
-# be used to format the text with the current format style.
-# href is optionnal. It is the reference to the section or the node anchor
-# which should be used to make the link (typically it is the argument
-# of a href= attribute in a <a> element).
-sub t2h_default_menu_link($$$$$$$$)
-{
- my $entry = shift;
- my $state = shift;
- my $href = shift;
- my $node = shift;
- my $title = shift;
- my $ending = shift;
- my $has_title = shift;
- my $command_stack = shift;
- my $preformatted = shift;
-
- $title = '' unless ($has_title);
- $title .= ':' if ($title ne '');
- return "$MENU_SYMBOL$title$node$ending" if (get_conf('NODE_NAME_IN_MENU'));
- return "$MENU_SYMBOL$title$entry$ending";
-}
-
-# formats a menu entry description, ie the text appearing after the node
-# specification in a menu entry an spanning until there is another
-# menu entry, an empty line or some text at the very beginning of the line
-# (we consider that text at the beginning of the line begins a menu comment)
-#
-# arguments:
-# the description text
-# the state. See menu_entry.
-# the heading of the element associated with the node.
-# not usd since in SIMPLE_MENU
-sub t2h_default_menu_description($$$$)
-{
- my $text = shift;
- my $state = shift;
- my $element_text = shift;
- my $command_stack = shift;
- my $preformatted = shift;
-
- return $text;
-}
-
-%htmlxref_entries = (
- 'node' => [ 'node', 'section', 'chapter', 'mono' ],
- 'section' => [ 'section', 'chapter','node', 'mono' ],
- 'chapter' => [ 'chapter', 'section', 'node', 'mono' ],
- 'mono' => [ 'mono', 'chapter', 'section', 'node' ],
-);
-
-
-# Construct a href to an external source of information.
-# node is the node with texinfo @-commands
-# node_id is the node transliterated and transformed as explained in the
-# texinfo manual
-# node_xhtml_id is the node transformed such that it is unique and can
-# be used to make an html cross ref as explained in the texinfo manual
-# file is the file in '(file)node'
-# This is used to construct href, so is likely to be ignored oustside of
-# html.
-sub t2h_default_external_href($$$)
-{
- my $node = shift;
- my $node_id = shift;
- my $node_xhtml_id = shift;
- my $file = shift;
- $file = '' if (!defined($file));
- my $default_target_split = get_conf('EXTERNAL_CROSSREF_SPLIT');
- my $target_split;
- #my $target_mono;
- #my $href_split;
- #my $href_mono;
- if ($file ne '')
- {
- if (get_conf('NEW_CROSSREF_STYLE'))
- {
- $file =~ s/\.[^\.]*$//;
- $file =~ s/^.*\///;
- my $href;
- my $document_split = get_conf('SPLIT');
- $document_split = 'mono' if (!$document_split);
- my $split_found;
- if (exists($Texi2HTML::THISDOC{'htmlxref'}->{$file}))
- {
- foreach my $split_ordered
(@{$htmlxref_entries{$document_split}})
- {
- if
(defined($Texi2HTML::THISDOC{'htmlxref'}->{$file}->{$split_ordered}))
- {
- $split_found = $split_ordered;
- $href =
$Texi2HTML::THISDOC{'htmlxref'}->{$file}->{$split_ordered};
- last;
- }
- }
- }
- if (defined($split_found))
- {
- $target_split = 1 unless ($split_found eq 'mono');
- }
- else
- { # nothing specified for that manual, use default
- $target_split = $default_target_split;
- }
-
- if ($target_split)
- {
- if (defined($href))
- {
- $file = $href;
- }
- elsif (defined(get_conf('EXTERNAL_DIR')))
- {
- $file = get_conf('EXTERNAL_DIR')."/$file";
- }
- elsif (get_conf('SPLIT'))
- {
- $file = "../$file";
- }
- $file .= "/";
- }
- else
- {# target not split
- if (defined($href))
- {
- $file = $href;
- }
- else
- {
- if (defined(get_conf('EXTERNAL_DIR')))
- {
- $file = get_conf('EXTERNAL_DIR')."/$file";
- }
- elsif (get_conf('SPLIT'))
- {
- $file = "../$file";
- }
- $file .= "." . get_conf('NODE_FILE_EXTENSION');
- }
- }
- }
- else
- {
- $file .= "/";
- if (defined(get_conf('EXTERNAL_DIR')))
- {
- $file = get_conf('EXTERNAL_DIR') . $file;
- }
- else
- {
- $file = '../' . $file;
- }
- }
- }
- else
- {
- $target_split = $default_target_split;
- }
- if ($node eq '')
- {
- if (get_conf('NEW_CROSSREF_STYLE'))
- {
- if ($target_split)
- {
- if (defined(get_conf('TOP_NODE_FILE_TARGET')))
- {
- return $file . get_conf('TOP_NODE_FILE_TARGET') . '.' .
get_conf('NODE_FILE_EXTENSION') . '#Top';
- }
- else
- {
- return $file . '#Top';
- }
- }
- else
- {
- return $file . '#Top';
- }
- }
- else
- {
- return $file;
- }
- }
- my $target;
- if (get_conf('NEW_CROSSREF_STYLE'))
- {
- $node = $node_id;
- $target = $node_xhtml_id;
- }
- else
- {
- $node = main::remove_texi($node);
- $node =~ s/[^\w\.\-]/-/g;
- }
- my $file_basename = $node;
- $file_basename = get_conf('TOP_NODE_FILE_TARGET') if ($node =~ /^top$/i
and defined(get_conf('TOP_NODE_FILE_TARGET')));
- if (get_conf('NEW_CROSSREF_STYLE'))
- {
- if ($target_split)
- {
- return $file . $file_basename .
'.'.get_conf('NODE_FILE_EXTENSION') . '#' . $target;
- }
- else
- {
- return $file . '#' . $target;
- }
- }
- else
- {
- return $file . $file_basename . '.'.get_conf('NODE_FILE_EXTENSION');
- }
-}
-
-# format a reference external to the generated manual. This produces a full
-# reference with introductive words and the reference itself.
-#
-# arguments:
-# type of the reference: xref (reference at the beginning of a sentence),
-# pxref (reference in a parenthesis),
-# section in the book. This might be undef.
-# book name.
-# manual file name
-# href linking to the html page containing the referenced node. A typical
-# use for this href is a href attribute in an <a> element
-# cross reference name
-# array of texi arguments of the reference
-# array of the formatted arguments of the reference
-# node name
-sub t2h_default_external_ref($$$$$$$$$)
-{
- my $type = shift;
- my $section = shift;
- my $book = shift;
- my $file = shift;
- #my $file_node = shift;
- my $href = shift;
- my $cross_ref = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
- my $node = shift;
-
- my $name = $section;
- $name = $cross_ref if ($name eq '');
- $name = $node if ($name eq '');
-
- my $reference = $name;
-
- if ($book eq '' and $file ne '')
- {
- $name = "($file)$name";
- }
- $reference = &$anchor('', $href, $name) if ($href ne '');
-
- # Yes, this is ugly, yet this helps internationalization
- if ($type eq 'pxref')
- {
- if (($book ne '') and ($href ne ''))
- {
- return gdt('see {reference} in @cite{{book}}', { 'reference' =>
$reference, 'book' => $book },{'duplicate'=>1});
- }
- elsif (($book ne '') and ($reference ne ''))
- {
- return gdt('see `{section}\' in @cite{{book}}', { 'section' =>
$reference, 'book' => $book },{'duplicate'=>1});
- }
- elsif ($book ne '')
- { # should seldom or even never happen
- return gdt('see @cite{{book}}', { 'book' => $book
},{'duplicate'=>1});
- }
- elsif ($href ne '')
- {
- return gdt('see {reference}', { 'reference' => $reference
},{'duplicate'=>1});
- }
- elsif ($reference ne '')
- {
- return gdt('see `{section}\'', { 'section' => $reference
},{'duplicate'=>1});
- }
- }
- if ($type eq 'xref' or $type eq 'inforef')
- {
- if (($book ne '') and ($href ne ''))
- {
- return gdt('See {reference} in @cite{{book}}', { 'reference' =>
$reference, 'book' => $book },{'duplicate'=>1});
- }
- elsif (($book ne '') and ($reference ne ''))
- {
- return gdt('See `{section}\' in @cite{{book}}', { 'section' =>
$reference, 'book' => $book },{'duplicate'=>1});
- }
- elsif ($book ne '')
- { # should seldom or even never happen
- return gdt('See @cite{{book}}', { 'book' => $book
},{'duplicate'=>1});
- }
- elsif ($href ne '')
- {
- return gdt('See {reference}', { 'reference' => $reference
},{'duplicate'=>1});
- }
- elsif ($reference ne '')
- {
- return gdt('See `{section}\'', { 'section' => $reference
},{'duplicate'=>1});
- }
- }
- if ($type eq 'ref')
- {
- if (($book ne '') and ($href ne ''))
- {
- return gdt('{reference} in @cite{{book}}', { 'reference' =>
$reference, 'book' => $book },{'duplicate'=>1});
- }
- elsif (($book ne '') and ($reference ne ''))
- {
- return gdt('`{section}\' in @cite{{book}}', { 'section' =>
$reference, 'book' => $book },{'duplicate'=>1});
- }
- elsif ($book ne '')
- { # should seldom or even never happen
- return gdt('@cite{{book}}', { 'book' => $book
},{'duplicate'=>1});
- }
- elsif ($href ne '')
- {
- return gdt('{reference}', { 'reference' => $reference
},{'duplicate'=>1});
- }
- elsif ($reference ne '')
- {
- return gdt('`{section}\'', { 'section' => $reference
},{'duplicate'=>1});
- }
- }
- return '';
-}
-
-# format a reference to a node or a section in the generated manual. This
-# produces a full reference with introductive words and the reference itself.
-#
-# arguments:
-# type of the reference: xref (reference at the beginning of a sentence),
-# pxref (reference in a parenthesis),
-# href linking to the html page containing the node or the section. A typical
-# use for this href is a href attribute in an <a> element
-# short name for this reference
-# name for this reference
-# boolean true if the reference is a reference to a section
-#
-# SHORT_REF should be used.
-sub t2h_default_internal_ref($$$$$$$$)
-{
- my $type = shift;
- my $href = shift;
- my $short_name = shift;
- my $name = shift;
- my $is_section = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
- my $element = shift;
-
- if (! get_conf('SHORT_REF'))
- {
- $name = &$anchor('', $href, $name);
- if ($type eq 'pxref')
- {
- return gdt('see section {reference_name}', { 'reference_name' =>
$name },{'duplicate'=>1}) if ($is_section);
- return gdt('see {reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- elsif ($type eq 'xref' or $type eq 'inforef')
- {
- return gdt('See section {reference_name}', { 'reference_name' =>
$name },{'duplicate'=>1}) if ($is_section);
- return gdt('See {reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- elsif ($type eq 'ref')
- {
- return gdt('{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- }
- else
- {
- $name = &$anchor('', $href, $short_name);
- if ($type eq 'pxref')
- {
- return gdt('see {reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- elsif ($type eq 'xref' or $type eq 'inforef')
- {
- return gdt('See {reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- elsif ($type eq 'ref')
- {
- return gdt('{reference_name}', { 'reference_name' => $name
},{'duplicate'=>1});
- }
- }
- return '';
-}
-
-# text after @item in table, vtable and ftable
-sub t2h_default_table_item($$$$$$$)
-{
- my $text = shift;
- my $index_label = shift;
- my $format = shift;
- my $command = shift;
- my $style_stack = shift;
- my $item_cmd = shift;
- my $formatted_index_entry = shift;
-
- return $text . "\n";
-}
-
-# format text on the line following the @item line (in table, vtable and
ftable)
-sub t2h_default_table_line($$$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- if ($text =~ /\S/)
- {
- return $text;
- }
- return '';
-}
-
-#my $cell_nr = -1;
-
-# row in multitable
-sub t2h_default_row($$$$$$$$)
-{
- my $text = shift;
- my $macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- if ($text =~ /\S/)
- {
- return $text ."\n";
- }
- return '';
-}
-
-# cell in multitable
-sub t2h_default_cell($$$$$$$$)
-{
- my $text = shift;
- my $row_macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- $text =~ s/^\s*//;
- $text =~ s/\s*$//;
-
- return " $text";
-}
-
-# format an itemize, enumerate or @*table @item line, returning
-# a texinfo line.
-sub t2h_default_format_list_item_texi($$$$$)
-{
- my $format = shift;
- my $line = shift;
- my $prepended = shift;
- my $command = shift;
- my $number = shift;
-
- my $result_line;
- my $open_command = 0;
-
- $command = 'bullet' if ((!defined($command) or $command eq '') and
(!defined($prepended) or $prepended eq '') and $format eq 'itemize');
- $prepended = "address@hidden" if (defined($command) and $command ne '');
- $prepended = "$number." if (defined($number) and $number ne '');
-
- if (defined($command) and $command ne '' and $format ne 'itemize')
- {
- address@hidden
- $open_command = 1;
- $line =~ s/^\s*//;
- $line =~ s/\s*$//;
- if (exists ($style_map{$command}))
- {
- $result_line = "address@hidden";
- }
- elsif (exists ($things_map{$command}))
- {
- $result_line = "address@hidden $line\n";
- }
- else
- {
- $result_line = "address@hidden $line\n";
- }
- }
- elsif (defined($prepended) and $prepended ne '')
- {
- $prepended =~ s/^\s*//;
- $prepended =~ s/\s*$//;
- $line =~ s/^\s*//;
- $result_line = $prepended . ' ' . $line;
- }
- return ($result_line, $open_command);
-}
-
-
-# format an item in a list
-#
-# argument:
-# text of the item
-# format of the list (itemize or enumerate)
-# command passed as argument to the format
-# formatted_command leading command formatted, if it is a thing command
-sub t2h_default_list_item($$$$$$$$$$$$)
-{
- my $text = shift;
- my $format = shift;
- my $command = shift;
- my $formatted_command = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $prepended = shift;
- my $prepended_formatted = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
- my $item_command = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- if ($text =~ /\S/)
- {
- return $text;
- }
- return '';
-}
-
-sub t2h_default_table_list($$$$$$$$$)
-{
- my $format_command = shift;
- my $text = shift;
- my $command = shift;
- my $formatted_command = shift;
-# enumerate
- my $item_nr = shift;
- my $enumerate_style = shift;
-# itemize
- my $prepended = shift;
- my $prepended_formatted = shift;
-# multitable
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
-# my $number = shift;
- return $text;
-}
-
-# an comment
-sub t2h_default_comment($)
-{
- my $text = shift;
- return '';
-}
-
-# an xml comment
-sub xml_default_comment($)
-{
- my $text = shift;
- $text =~ s/--+/-/go;
- return '<!-- ' . $text . ' -->' . "\n";
-}
-
-sub t2h_collect_styles($)
-{
- my $cmd_stack = shift;
- my @result = ();
- foreach my $style (reverse(@$cmd_stack))
- {
-# last unless (defined($command_type{$style}) and $command_type{$style}
eq 'style');
- push @result, $style if (defined($command_type{$style}) and
$command_type{$style} eq 'style');
- }
- return @result;
-}
-
-sub html_default_parse_attribute($)
-{
- my $element = shift;
- return ('', '', '') if (!defined($element));
- my ($class, $attributes) = ('', '');
- if ($element =~ /^(\w+)(\s+.*)/)
- {
- $element = $1;
- $attributes = $2;
- if ($attributes =~ s/^\s+class=\"([^\"]+)\"//)
- {
- $class = $1;
- }
- }
- return ($element, $class, $attributes);
-}
-
-sub t2h_get_attribute($;$)
-{
- my $command = shift;
- my $map_ref = shift;
- $map_ref = \%style_map if (!defined($map_ref));
- return unless (defined($map_ref->{$command}));
- my ($element, $class, $attributes) = ('', '', '');
- if (defined($map_ref->{$command}))
- {
- if (ref($map_ref->{$command}) eq 'HASH')
- {
- ($element, $class, $attributes) = t2h_html_parse_attribute
($map_ref->{$command}->{'attribute'});
- }
- elsif ($map_ref->{$command} !~ /^&/)
- {
- $element = $map_ref->{$command};
- $element =~ s/^\"//;
- }
- }
- return ($element, $class, $attributes);
-}
-
-# a paragraph
-# arguments:
-# $text of the paragraph
-# $align for the alignement
-# $indent for the indent style (indent or noindent)
-# The following is usefull if the paragraph is in an itemize.
-# $paragraph_command is the leading formatting command (like @minus)
-# $paragraph_command_formatted is the leading formatting command formatted
-# $paragraph_number is a reference on the number of paragraphs appearing
-# in the format. The value should be increased if a paragraph is done
-# $format is the format name (@itemize)
-sub t2h_default_paragraph($$$$$$$$$$$$)
-{
- my $text = shift;
- my $align = shift;
- my $indent = shift;
- my $paragraph_command = shift;
- my $paragraph_command_formatted = shift;
- my $paragraph_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-#print STDERR "format: $format\n" if (defined($format));
-#print STDERR "paragraph @$command_stack_at_end; @$command_stack_at_begin\n";
-# $paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
-# exists($special_list_commands{$format}->{$paragraph_command}));
- return '' if ($text =~ /^\s*$/);
-
- return $text;
-}
-
-# a preformatted region
-# arguments:
-# $text of the preformatted region
-# $pre_style css style
-# $class identifier for the preformatted region (example, menu-comment)
-# The following is usefull if the preformatted is in an itemize.
-# $leading_command is the leading formatting command (like @minus)
-# $leading_command_formatted is the leading formatting command formatted
-# $preformatted_number is a reference on the number of preformatteds appearing
-# in the format. The value should be increased if a preformatted is done
-sub t2h_default_preformatted($$$$$$$$$$$$)
-{
- my $text = shift;
- my $pre_style = shift;
- my $class = shift;
- my $leading_command = shift;
- my $leading_command_formatted = shift;
- my $preformatted_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
-#print STDERR "preformatted @$command_stack_at_end;
@$command_stack_at_begin\n";
- return '' if ($text eq '');
-
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- if ($top_stack eq 'multitable')
- {
- $text =~ s/^\s*//;
- $text =~ s/\s*$//;
- }
-
- # add a new line at the end in case there is none
- chomp($text);
- return $text . "\n";
-}
-
-# $new_element is set if the element is associated with a different
-# reference element than the preceding element. This is where we
-# do the navigation. For example it could be a @node before a @section.
-#
-# The heading function is always called, though -- in the default case
-# nodes don't lead to an outputted title.
-sub t2h_default_element_heading($$$$$$$$$$$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
- my $one_section = shift;
- my $element_heading = shift;
- my $first_in_page = shift;
- my $is_top = shift;
- my $previous_is_top = shift;
- my $command_line = shift;
- my $element_id = shift;
- my $new_element = shift;
-#print STDERR ":::::::: $element $command i_p $in_preformatted o_s
$one_section e_h $element_heading f_p $first_in_page i_t $is_top p_i_t
$previous_is_top id $element_id new $new_element\n";
-
-# my $result = '';
- my $result = &$element_label($element_id, $element, $command,
$command_line);
-
- # in default case, print_head_navigation and print_navigation are no-ops.
- # and $print_element_header is undef, so the following nothing.
- if ($new_element and !$one_section)
- {
- main::msg_debug ("For $element->{'texi'}, element_ref not defined",
$element->{'line_nr'}) if (!defined($element->{'element_ref'}));
- if (!defined($element->{'element_ref'}->{'top'}))
- {
- if (defined($print_element_header))
- { # FIXME backward compatibility, print_element_header is obsoleted
in nov 2009
- $result .= &$print_element_header($first_in_page,
$previous_is_top);
- }
- else
- {
- if (($first_in_page or $previous_is_top) and
get_conf('HEADERS'))
- {
- $result .= &$print_head_navigation(undef, address@hidden,
$first_in_page, $previous_is_top, $element);
- }
- else
- { # got to do this here, as it isn't done otherwise sinc
- # print_head_navigation is not called
- $result .= &$print_navigation(address@hidden) if
(get_conf('HEADERS') or get_conf('SPLIT') eq 'node');
- }
- }
- }
- else
- { # this is here because we want to always print the head navigation
for top
- # and use TOP_BUTTONS
- $result .= &$print_head_navigation(undef, address@hidden,
$first_in_page, $previous_is_top, $element)
- if (get_conf('SPLIT') or get_conf('HEADERS'));
- }
- }
- return $result. &$heading($element, $command, $texi_line, $line,
$in_preformatted, $one_section, $element_heading);
-}
-
-# This function formats a heading for an element
-#
-# argument:
-# an element. It is a hash reference for a node or a sectioning command.
-# it may be the wrong one in case of headings.
-# The interesting keys are:
-# 'text': the heading text
-# 'text_nonumber': the heading text without section number
-# 'node': true if it is a node
-# 'level': level of the element. 0 for @top, 1 for chapter, heading,
-# appendix..., 2 for section and so on...
-# 'tag_level': the sectioning element name, raisesections and lowersections
-# taken into account
-sub t2h_default_heading($$$$$;$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
- my $one_section = shift;
- my $element_heading = shift;
-
- my $level = $element->{'level'};
- if ($element->{'node'})
- {
- if ($element->{'text'} =~ /^top$/i)
- {
- $level = 0;
- }
- else
- {
- $level = 3;
- }
- return '' if (!$element->{'this'} or $element->{'with_section'})
- }
- else
- {
- $command = $element->{'tag_level'};
- }
- my $text = $element->{'text'};
-
- if (get_conf('TOC_LINKS') and $command !~ /heading/ and
defined($element->{'tocid'}))
- {
- $text = &$anchor ('',
"$Texi2HTML::THISDOC{'toc_file'}#$element->{'tocid'}", $text);
- }
-
- my $result;
- if ($in_preformatted)
- {
- $result = &$heading_text_preformatted("address@hidden", $text, $level);
- }
- else
- {
- $result = &$heading_text("address@hidden", $text, $level);
- }
- #$result .= "\n";
- return $result;
-}
-
-sub t2h_default_heading_no_texi($$$)
-{
- my $element = shift;
- my $command = shift;
- my $line = shift;
- return main::remove_texi($line) . "\n";
-}
-
-# formatting of raw regions
-# if L2H is true another mechanism is used for tex
-sub t2h_default_raw($$;$)
-{
- my $style = shift;
- my $text = shift;
- my $line_nr = shift;
- my $expanded = 1 if (grep {$style eq $_} @EXPAND);
- if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($style eq
'tex' and $expanded))
- {
- return $text;
- }
- elsif ($expanded)
- {
- main::line_warn (sprintf(__("Raw format %s is not converted"),
$style), $line_nr);
- return $text;
- }
- else
- {
- return '';
- }
-}
-
-# raw environment when removing texi (in comments)
-sub t2h_default_raw_no_texi($$)
-{
- my $style = shift;
- my $text = shift;
- if ($style eq 'verbatim' or $style eq 'verbatiminclude' or grep {$style eq
$_} @EXPAND)
- {
- return $text;
- }
- return '';
-}
-
-# This function formats a footnote reference and the footnote text associated
-# with a given footnote.
-# The footnote reference is the text appearing in the main document pointing
-# to the footnote text.
-#
-# arguments:
-# absolute number of the footnote (in the document)
-# relative number of the footnote (in the page)
-# identifier for the footnote
-# identifier for the footnote reference in the main document
-# main document file
-# footnote text file
-# array with the footnote text lines
-# the state. See menu entry.
-#
-# returns:
-# reference on an array containing the footnote text lines which should
-# have been updated
-# the text for the reference pointing on the footnote text
-sub t2h_default_foot_line_and_ref($$$$$$$$$)
-{
- my $number_in_doc = shift;
- my $number_in_page = shift;
- my $footnote_id = shift;
- my $place_id = shift;
- my $document_file = shift;
- my $footnote_file = shift;
- my $lines = shift;
- my $document_state = shift;
-
- $number_in_doc = $NO_NUMBER_FOOTNOTE_SYMBOL if
(!get_conf('NUMBER_FOOTNOTES'));
-
- if ($document_file eq $footnote_file)
- {
- $document_file = $footnote_file = '';
- }
- unshift (@$lines, "($number_in_doc)\n");
- push @$lines, "\n";
- return ($lines, "($number_in_doc)");
-}
-
-# formats a group of footnotes.
-#
-# argument:
-# array reference on the footnotes texts lines
-#
-# returns an array reference on the group of footnotes lines
-sub t2h_default_foot_section($)
-{
- my $lines = shift;
- my $header = &$heading_text('footnotes', gdt('Footnotes'), 3);
- unshift (@$lines, "$header\n");
- return $lines;
-}
-
-sub t2h_default_image_files($$$$)
-{
- my $base = shift;
- my $extension = shift;
- my $texi_base = shift;
- my $texi_extension = shift;
- my @files = ();
- return @files if (!defined($base) or ($base eq ''));
- if (defined($extension) and ($extension ne ''))
- {
- push @files,["$base.$extension", "$texi_base.$texi_extension"];
- }
- foreach my $ext (@IMAGE_EXTENSIONS)
- {
- push @files,["$base.$ext", "$texi_base.$ext"];
- }
- return @files;
-}
-
-# format an image
-#
-# arguments:
-# image file name with path
-# image basename
-# a boolean true if we are in a preformatted format
-# image file name without path
-# alt text
-# width
-# height
-# raw alt
-# extension
-# path to working dir
-# path to file relative from working dir
-sub t2h_default_image($$$$$$$$$$$$$$$$$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- my $file_name = shift;
- my $alt = shift;
- my $width = shift;
- my $height = shift;
- my $raw_alt = shift;
- my $extension = shift;
- my $working_dir = shift;
- my $file_path = shift;
- my $in_paragraph = shift;
- my $file_locations = shift;
- my $base_simple_format = shift;
- my $extension_simple_format = shift;
- my $file_name_simple_format = shift;
- my $line_nr = shift;
-
- if (!defined($file_path) or $file_path eq '')
- {
- if (defined($extension) and $extension ne '')
- {
- $file = "$base.$extension";
- }
- else
- {
- $file = "$base.txt";
- }
- }
- elsif (! get_conf('COMPLETE_IMAGE_PATHS'))
- {
- $file = $file_name;
- }
- my $alt_txt = '';
- $alt_txt = ": $alt" if (defined($alt) and $alt =~ /\S/);
- return "[ $file$alt_txt ]";
- # it is possible that $file_name is more correct as it allows the user
- # to chose the relative path.
-}
-
-# address put in footer describing when was generated and who did the manual
-# not used anymore
-sub t2h_default_address($)
-{
- my $date = shift;
- $date = '' if (!defined($date));
- if ($date ne '')
- {
- return gdt('on @emph{{date}}', { 'date' => $date });
- }
- return '';
-}
-
-# format a target in the main document for an index entry.
-#
-# arguments:
-# target identifier
-# boolean true if in preformatted format
-sub t2h_default_index_entry_label($$$$$$$$$)
-{
- my $identifier = shift;
- my $preformatted = shift;
- my $entry = shift;
- my $index_name = shift;
- my $index_command = shift;
- my $texi_entry = shift;
- my $formatted_entry = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
- return '' if (!defined($identifier) or ($identifier !~ /\S/));
- my $label = &$anchor($identifier);
- return $label;
-}
-
-sub t2h_default_index_entry_command($$$$$$)
-{
- my $command = shift;
- my $index_name = shift;
- my $label = shift;
- my $entry_texi = shift;
- my $entry_formatted = shift;
- my $index_entry_ref = shift;
-
- return $label;
-}
-
-# process definition commands line @deffn for example
-sub t2h_default_def_line($$$$$$$$$$$$$$$$)
-{
- my $category_prepared = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- my $index_label = shift;
- my $arguments_array = shift;
- my $arguments_type_array = shift;
- my $unformatted_arguments_array = shift;
- my $command = shift;
- my $class_name = shift;
- my $category = shift;
- my $class = shift;
- my $style = shift;
- my $original_command = shift;
-
- $name = '' if (!defined($name) or ($name =~ /^\s*$/));
- $type = '' if (!defined($type) or $type =~ /^\s*$/);
- $arguments = '' if (!defined($arguments) or $arguments =~ /^\s*$/);
-
- my $type_name = '';
- $type_name .= "$type " if ($type ne '');
- $type_name .= $name if ($name ne '');
-
- my $result = " -- $category_prepared: ${type_name}$arguments";
- $result =~ s/\s*$//;
- $result .= "\n";
-
-}
-
-# process definition commands line @deffn for example while removing texi
-# commands
-sub t2h_default_def_line_no_texi($$$$$)
-{
- my $category = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- $name = '' if (!defined($name) or ($name =~ /^\s*$/));
- $type = '' if (!defined($type) or $type =~ /^\s*$/);
- if (!defined($arguments) or $arguments =~ /^\s*$/)
- {
- $arguments = '';
- }
- my $type_name = '';
- $type_name = " $type" if ($type ne '');
- $type_name .= ' ' . $name if ($name ne '');
- $type_name .= $arguments;
- if (! get_conf('DEF_TABLE'))
- {
- return $category . ':' . $type_name . "\n";
- }
- else
- {
-
- return $type_name . " " . $category . "\n";
- }
-}
-
-# a cartouche
-sub t2h_default_cartouche($$)
-{
- my $text = shift;
-
- if ($text =~ /\S/)
- {
- return $text;
- }
- return '';
-}
-
-my $IDXFILE;
-# key:
-# origin_href:
-# entry:
-# texi entry:
-# element_href:
-# element_text:
-sub t2h_default_index_summary_file_entry ($$$$$$$$$)
-{
- my $index_name = shift;
- my $key = shift;
- my $origin_href = shift;
- my $entry = shift;
- my $texi_entry = shift;
- my $element_href = shift;
- my $element_text = shift;
- my $is_printed = shift;
- my $manual_name = shift;
-
- $element_text = 'UNDEF' if (!defined($element_text));
- print $IDXFILE "key: $key\n origin_href: $origin_href\n entry: $entry\n"
- . " texi_entry: $texi_entry\n"
- . " element_href: $element_href\n element_text: $element_text\n";
-}
-
-sub t2h_default_index_summary_file_begin($$$)
-{
- my $name = shift;
- my $is_printed = shift;
- my $manual_name = shift;
-
- $IDXFILE =
main::open_out("$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}"
. "_$name.idx");
-}
-
-sub t2h_default_index_summary_file_end($$$)
-{
- my $name = shift;
- my $is_printed = shift;
- my $manual_name = shift;
-
- close ($IDXFILE);
-}
-
-sub t2h_default_sp($$)
-{
- my $number = shift;
- my $preformatted = shift;
- return "\n" x $number;
-}
-
-sub t2h_default_acronym_like($$$$$$)
-{
- my $command = shift;
- my $acronym_texi = shift;
- my $acronym_text = shift;
- my $with_explanation = shift;
- my $explanation_lines = shift;
- my $explanation_text = shift;
- my $explanation_simply_formatted = shift;
-
- if ($with_explanation)
- {
- #return "$acronym_text ($explanation_text)";
- return gdt('{acronym_like} ({explanation})', {'acronym_like' =>
$acronym_text, 'explanation' => $explanation_text},{'duplicate'=>1});
- }
- else
- {
- return "$acronym_text";
- }
-
-}
-
-sub t2h_default_quotation_prepend_text($$)
-{
- my $command = shift;
- my $text = shift;
- return undef if (!defined($text) or $text =~ /^$/);
- # If there is a @ protecting the end of line the result is,
- # after the chomp:
- # @b{some text @:}
- # It is likely not to be what was intended, but it is certainly right.
- # this is tested in formatting/quotation.texi
- chomp($text);
- return gdt('@b{{quotation_arg}:} ', {'quotation_arg' => $text},
{'keep_texi' => 1});
-}
-
-sub t2h_default_quotation($$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $argument_text = shift;
- my $argument_text_texi = shift;
- my $authors = shift;
- my $class_text = '';
- # this allows to add an end of line if there was none, which can happen
- # if there is an argument to @quotation, but an empty quotation, like
- # @quotation something
- # @end quotation
- chomp($text);
- $text .= "\n";
- return $text;
-}
-
-# format the text within a paragraph style format,
-#
-# argument:
-# format name
-# text within the format
-sub t2h_default_paragraph_style_command($$)
-{
- my $format = shift;
- my $text = shift;
- return $text;
-}
-
-# format a whole index
-#
-# argument:
-# index text
-# index name
-sub t2h_default_print_index($$)
-{
- my $text = shift;
- my $name = shift;
- return '' if (!defined($text));
- return "* Index:\n" . $text;
-}
-
-# format a letter entry in an index page. The letter entry contains
-# the index entries for the words beginning with that letter. It is
-# a target for links pointing from the summary of the index.
-#
-# arguments:
-# the letter
-# identifier for the letter entry. This should be used to make the target
-# identifier
-# text of the index entries
-sub t2h_default_index_letter($$$)
-{
- my $letter = shift;
- my $id = shift;
- my $text = shift;
- return $text;
-}
-
-# format an index entry (in a letter entry).
-#
-# arguments:
-# href to the main text, linking to the place where the index entry appears
-# entry text
-# href to the main text, linking to the section or node where the index
-# entry appears
-# section or node heading
-sub t2h_default_index_entry($$$$$$$$$$)
-{
- my $text_href = shift;
- my $entry = shift;
- my $element_href = shift;
- my $element_text = shift;
- my $entry_file = shift;
- my $current_element_file = shift;
- my $entry_target = shift;
- my $entry_element_target = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
- return '' if ($in_region_not_in_output);
- #!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
- my $state = {};
- $state = { 'code_style' => 1 } if ($index_entry_ref->{'in_code'});
- $entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in
address@hidden", $state);
- return '' if ($entry =~ /^\s*$/);
-
- my $real_element_text;
- my $element = $index_entry_ref->{'real_element'};
- # in case $element->{'text'} is not defined, it certainly means that we
- # are n a special elemet, most likely the virtual element appearing
- # before anything else
- if (defined($element->{'text'}))
- {
- my $element_set = 0;
- if (get_conf('NODE_NAME_IN_INDEX'))
- {
- if ($element->{'node'})
- {
- $element_set = 1;
- }
- elsif ($element->{'with_node'})
- {
- $element = $element->{'with_node'};
- $element_set = 1;
- }
- }
- elsif (defined(get_conf('NODE_NAME_IN_INDEX')))
- {
- if (!$element->{'node'})
- {
- $element_set = 1;
- }
- elsif ($element->{'with_section'})
- {
- $element = $element->{'with_section'};
- $element_set = 1;
- }
- }
- $element = $element->{'element_ref'} if ($element->{'element_ref'} and
!$element_set);
- $real_element_text = $element->{'text'};
- }
- else
- {
- $real_element_text = gdt('(outside of any element)');
- }
- return "* $entry: ".$real_element_text . '.'."\n";
-}
-
-
-sub t2h_default_copying_comment($$$$)
-{
- my $copying_lines = shift;
- my $copying_text = shift;
- my $copying_no_texi = shift;
- my $copying_simple_text = shift;
- return '' if ($copying_no_texi eq '');
- my $text = &$comment($copying_no_texi);
- return $text;
-}
-
-# return value is currently ignored
-sub t2h_default_documentdescription($$$$)
-{
- my $decription_lines = shift;
- my $description_text = shift;
- my $description_no_texi = shift;
- my $description_simple_text = shift;
-
- #return '' if ($description_no_texi eq '');
- #my @documentdescription = split (/\n/, $description_no_texi);
- if ($description_simple_text eq '')
- {
- set_from_document('documentdescription', undef);
- return;
- }
- my @documentdescription = split (/\n/, $description_simple_text);
- my $document_description = shift @documentdescription;
- chomp $document_description;
- foreach my $line (@documentdescription)
- {
- chomp $line;
- $document_description .= ' ' . $line;
- }
- set_from_document('documentdescription', $document_description);
-}
-
-# format an index summary. This is a list of letters linking to the letter
-# entries.
-#
-# arguments:
-# array reference containing the formatted alphabetical letters
-# array reference containing the formatted non lphabetical letters
-sub t2h_default_index_summary($$)
-{
- my $alpha = shift;
- my $nonalpha = shift;
-
- my $join = '';
- my $nonalpha_text = '';
- my $alpha_text = '';
- return '';
-}
-
-# return the heading with number texinfo text
-# also called for nodes.
-sub t2h_default_heading_texi($$$)
-{
- my $tag = shift;
- my $texi = shift;
- my $number = shift;
- #$texi = main::trim_around_spaces($texi);
- return "$number $texi" if (get_conf('NUMBER_SECTIONS') and
defined($number) and ($number !~ /^\s*$/)) ;
- return $texi;
-}
-
-# return the heading texinfo text for split index sections
-sub t2h_default_index_element_heading_texi($$$)
-{ # FIXME i18n
- my $heading_texi = shift;
- my $tag = shift;
- my $texi = shift;
- my $number = shift;
- my $first_letter = shift;
- my $last_letter = shift;
- return "$heading_texi: $first_letter -- $last_letter" if ($last_letter ne
$first_letter);
- return "$heading_texi: $first_letter";
-}
-
-sub t2h_default_element_label($$$$)
-{
- my $id = shift;
- my $element = shift;
- my $command = shift;
- my $line = shift;
-
- return &$anchor($id);
-}
-
-sub t2h_default_misc_element_label($$)
-{
- my $id = shift;
- my $misc_page_name = shift;
- return &$anchor($id);
-}
-
-sub t2h_default_anchor_label($$$$)
-{
- my $id = shift;
- my $anchor_text = shift;
- my $anchor_reference = shift;
- my $in_special_region = shift;
- return &$anchor($id);
-}
-
-sub t2h_default_colon_command($)
-{
- my $punctuation_character = shift;
- return $colon_command_punctuation_characters{$punctuation_character} if
defined($colon_command_punctuation_characters{$punctuation_character});
- return $punctuation_character;
-}
-
-# called each time a @tab or an @itemx is encountered.
-# To be noticed that there is another function better suited for
-# formatting of an @item line: $format_list_item_texi
-sub t2h_default_tab_item_texi($$$$$$)
-{
- my $command = shift;
- my $commands_stack = shift;
- my $stack = shift;
- my $state = shift;
- my $line = shift;
- my $line_nr = shift;
-
- return undef;
-}
-
-sub xml_default_line_command($$$$)
-{
- my $command = shift;
- my $arg_text = shift;
- my $arg_texi = shift;
- my $state = shift;
-
- my $style = $line_command_map{$command};
- return '' if ($arg_text eq '' and !defined($style) or $style eq '');
- if ($style)
- {
- my $attribute_text = '';
- if ($style =~ /^(\w+)(\s+.*)/)
- {
- $style = $1;
- $attribute_text = $2;
- }
- $arg_text = "<${style}$attribute_text>$arg_text</$style>";
- }
- $arg_text .= "\n";
- return $arg_text;
-}
-
-sub t2h_default_line_command($$$$)
-{
- my $command = shift;
- my $arg_text = shift;
- my $arg_texi = shift;
- my $state = shift;
-
- return $arg_text;
-}
-
-# info is special, since it doesn't use the basename but directly the
-# setfilename output, contrary to all the other formats
-sub t2h_default_element_file_name($$$)
-{
- my $element = shift;
- my $type = shift;
- my $prefix = shift;
-
- my $outname;
- return unless (get_conf('USE_SETFILENAME_EXTENSION') and
get_conf('PREFIX') eq '');
- my $outfile = get_conf('OUTFILE');
- $outname = $outfile if (defined($outfile) and $outfile ne '' and
$Texi2HTML::THISDOC{'input_file_number'} == 0);
- if ($type eq 'doc' or !get_conf('SPLIT'))
- {
- if (defined(get_conf('setfilename')) and !defined($outname))
- {
- main::document_override('EXTENSION', '');
- return get_conf('setfilename');
- }
- }
-
- return undef;
-}
-
-sub t2h_default_misc_command_line($$$$$)
-{
- my $macro = shift;
- my $line = shift;
- my $args = shift;
- my $stack = shift;
- my $state = shift;
-
- my $result;
- return ($macro, $line, $result);
-}
-
-sub t2h_default_internal_links($$$)
-{
- my $fh = shift;
- my $elements_list = shift;
- my $indices = shift;
-
- foreach my $element (@$elements_list)
- {
- my $text = $element->{'no_texi'};
- #$text =~ s/^([\w.]+)\. /$1 /;
- #$text = "Annexe ".$text if ($element->{'tag'} =~ /appendix/);
- print $fh "$element->{'file'}#$element->{'id'}\ttoc\t$text\n";
- }
- foreach my $index_name (sort(keys(%$indices)))
- {
- my $entries = $indices->{$index_name};
-
- foreach my $letter_entries (@$entries)
- {
- foreach my $entry (@{$letter_entries->{'entries'}})
- {
- #print STDERR "($index_name) key $key, t $entry->{'texi'}:
$entry->{'file'}#$entry->{'target'}\n";
- print $fh
"$entry->{'file'}#$entry->{'target'}\t$index_name\t$entry->{'key'}\n" if
($entry->{'key'} =~ /\S/);
- }
- }
- }
-}
-
-1;
Index: texi2html/examples/enable_encoding.init
===================================================================
RCS file: texi2html/examples/enable_encoding.init
diff -N texi2html/examples/enable_encoding.init
--- texi2html/examples/enable_encoding.init 15 Jul 2010 12:26:59 -0000
1.13
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,89 +0,0 @@
-# -*-perl-*-
-#+##############################################################################
-#
-# enable_encoding.init: mimics --enable-encoding
-# This is now directly handled in the main program. It is, however different
-# from the main program implementation snce this init file is much more
-# intrusive (for example it wouldn't work with info, but it would work
-# better for a simple output format when entities are not used).
-#
-# Copyright (C) 2008 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-use strict;
-
-my $enable_encoding_default_init_out = $init_out;
-$init_out = \&enable_encoding_init_out;
-
-# badly interact with --enable-encoding support in info.init
-set_from_init_file('ENABLE_ENCODING', 0);
-
-sub enable_encoding_init_out()
-{
- &$enable_encoding_default_init_out();
- # like utf8.init
- if (get_conf('ENCODING_NAME') eq 'utf-8')
- {
- $normal_text = \&t2h_utf8_normal_text unless
(get_conf('ENABLE_ENCODING_USE_ENTITY'));
- foreach my $key (keys(%unicode_accents), 'dotless')
- {
- $style_map{$key}->{'function'} = \&t2h_utf8_accent;
- $style_map_texi{$key}->{'function'} = \&t2h_utf8_accent;
- $style_map_pre{$key}->{'function'} = \&t2h_utf8_accent;
- }
-
- foreach my $key (%things_map)
- {
- if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
- {
- $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
- $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
- $sorting_things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($sorting_things_map{$key}));
- $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
- }
- }
- }
- elsif (exists($makeinfo_encoding_to_map{get_conf('ENCODING_NAME')}))
- {
- my $enc_map = $makeinfo_encoding_to_map{get_conf('ENCODING_NAME')};
- foreach my $key (keys(%unicode_accents), 'dotless')
- {
- $t2h_enable_encoding_default_accent{'normal'}->{$key} =
$style_map{$key}->{'function'};
- $t2h_enable_encoding_default_accent{'texi'}->{$key} =
$style_map_texi{$key}->{'function'};
- $t2h_enable_encoding_default_accent{'pre'}->{$key} =
$style_map_pre{$key}->{'function'};
- $style_map{$key}->{'function'} = \&t2h_enable_encoding_normal_accent;
- $style_map_texi{$key}->{'function'} = \&t2h_enable_encoding_texi_accent;
- $style_map_pre{$key}->{'function'} = \&t2h_enable_encoding_pre_accent;
- }
-
- foreach my $key (%things_map)
- {
- if (exists($unicode_map{$key}) and ($unicode_map{$key} ne '') and
- exists($makeinfo_unicode_to_eight_bit{$enc_map}->{$unicode_map{$key}}))
- { # we let perl handle the conversion
- $things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($things_map{$key}));
- $texi_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($texi_map{$key}));
- $sorting_things_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($sorting_things_map{$key}));
- $pre_map{$key} = chr(hex($unicode_map{$key})) unless
(t2h_encoding_is_entity($pre_map{$key}));
- }
- }
- }
-}
-
-1;
Index: texi2html/examples/makeinfo.init
===================================================================
RCS file: texi2html/examples/makeinfo.init
diff -N texi2html/examples/makeinfo.init
--- texi2html/examples/makeinfo.init 12 Sep 2010 20:06:13 -0000 1.42
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,420 +0,0 @@
-# -*-perl-*-
-#+##############################################################################
-#
-# makeinfo.init: output html in the makeinfo style.
-#
-# This is obsoleted and irrelevant now, in 2010 (though still used in some
-# tests) since a makeinfo-like default is used when called as makeinfo or
-# texi2any.
-#
-# Copyright (C) 2003, 2005, 2008 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-#html_default_load();
-t2h_default_load_format('html');
-
-set_default('TOP_FILE', 'index.html');
-
-set_default('SHOW_MENU', 1);
-
-set_default('USE_NODES', 1);
-
-set_default('SPLIT', 'node');
-
-set_default('NODE_FILES', 1);
-
-set_default('USE_SETFILENAME', 1);
-
-set_default('HEADERS', 1);
-
-set_default('SHORT_REF', 1);
-
-set_default('NODE_NAME_IN_MENU', 1);
-
-set_default('NODE_NAME_IN_INDEX', 0);
-
-set_default('AVOID_MENU_REDUNDANCY', 0);
-
-set_default('SPLIT_INDEX', 0);
-
-$MENU_SYMBOL = '*';
-
-set_default('WORDS_IN_PAGE', 200);
-
-set_default('footnotestyle', 'end');
-
-set_default('USE_ACCESSKEY', 1);
-
-set_default('USE_REL_REV', 1);
-
-set_default('USE_LINKS', 1);
-
-set_default('INLINE_CONTENTS', 1);
-
-set_default('OVERVIEW_LINK_TO_TOC', 1);
-
-if (get_conf('HEADER_IN_TABLE'))
-{
- @SECTION_BUTTONS =
- (
- \"node: ", \$Texi2HTML::NODE{This}, [ 'NodeNext',
\$Texi2HTML::NODE{NodeNext} ] , \",", [ 'NodePrev', \$Texi2HTML::NODE{NodePrev}
], \",", [ 'NodeUp', \$Texi2HTML::NODE{NodeUp} ], 'NodeForward'
- );
-
- @TOP_BUTTONS = @SECTION_BUTTONS;
- @MISC_BUTTONS = @SECTION_BUTTONS;
-}
-
-push @command_handler_process, \&makeinfo_like_initialize_variables;
-
-my $makekinfo_like_footnote_absolute_number;
-my %makekinfo_like_paragraph_in_footnote_nr;
-
-sub makeinfo_like_initialize_variables()
-{
- $makekinfo_like_footnote_absolute_number = 0;
- %makekinfo_like_paragraph_in_footnote_nr = ();
-}
-
-my $default_init_out = $init_out;
-$init_out = \&makeinfo_like_init_out;
-
-sub makeinfo_like_init_out()
-{
- &$default_init_out();
- $NAVIGATION_TEXT{'NodeForward'} = ' > ';
-}
-
-# FIXME: images not in paragraphs are in <div class="block-image">
-
-
-$foot_line_and_ref = \&makeinfo_like_foot_line_and_ref;
-$foot_section = \&makeinfo_like_foot_lines;
-$paragraph = \&makeinfo_like_paragraph;
-$index_summary = \&makeinfo_like_index_summary;
-$summary_letter = \&makeinfo_like_summary_letter;
-$index_entry = \&makeinfo_like_index_entry;
-$index_letter = \&makeinfo_like_index_letter;
-$print_index = \&makeinfo_like_print_index;
-$listoffloats = \&makeinfo_like_listoffloats;
-$listoffloats_entry = \&makeinfo_like_listoffloats_entry;
-$menu_link = \&makeinfo_like_menu_link;
-$menu_description = \&makeinfo_like_menu_description;
-$menu_comment = \&makeinfo_like_menu_comment;
-$menu = \&makeinfo_like_menu;
-
-sub makeinfo_like_foot_line_and_ref($$$$$$$$)
-{
- my $foot_num = shift;
- my $relative_num = shift;
- my $footid = shift;
- my $docid = shift;
- my $from_file = shift;
- my $footnote_file = shift;
- my $lines = shift;
- my $state = shift;
-
- $makekinfo_like_footnote_absolute_number++;
-
- # this is a bit obscure, this allows to add an anchor only if formatted
- # as part of the document.
- $docid = '' if ($state->{'outside_document'} or $state->{'multiple_pass'});
-
- if ($from_file eq $footnote_file)
- {
- $from_file = $footnote_file = '';
- }
-
- my $foot_anchor = "<sup>" . &$anchor($docid, "$footnote_file#$footid",
$relative_num) . "</sup>";
- $foot_anchor = &$anchor($docid, "$footnote_file#$footid",
"($relative_num)") if ($state->{'preformatted'});
-
- return ($lines, $foot_anchor);
-}
-
-sub makeinfo_like_foot_lines($)
-{
- my $lines = shift;
- unshift @$lines, "<div class=\"footnote\">\n<hr>\n<h4>". gdt('Footnotes')
."</h4>\n";
- push (@$lines, "</div>\n");
- return $lines;
-}
-
-sub makeinfo_like_paragraph ($$$$$$$$$$$$$)
-{
- my $text = shift;
- my $align = shift;
- my $indent = shift;
- my $paragraph_command = shift;
- my $paragraph_command_formatted = shift;
- my $paragraph_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
- my $state = shift;
-#print STDERR "format: $format\n" if (defined($format));
-#print STDERR "paragraph @$command_stack_at_end; @$command_stack_at_begin\n";
- #$paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
- # exists($special_list_commands{$format}->{$paragraph_command}));
- return '' if ($text =~ /^\s*$/);
- if (defined($paragraph_number) and defined($$paragraph_number))
- {
- $$paragraph_number++;
- return $text if (($format eq 'itemize' or $format eq 'enumerate') and
- ($$paragraph_number == 1));
- }
- my $open = '<p';
- if ($align)
- {
- $open .= " align=\"$paragraph_style{$align}\"";
- }
-
- my $footnote_text = '';
- if (defined($command_stack_at_begin->[0]) and $command_stack_at_begin->[0]
eq 'footnote')
- {
- my $state = $Texi2HTML::THISDOC{'state'};
-
$makekinfo_like_paragraph_in_footnote_nr{$makekinfo_like_footnote_absolute_number}++;
- if
($makekinfo_like_paragraph_in_footnote_nr{$makekinfo_like_footnote_absolute_number}
<= 1)
- {
- $open.=' class="footnote"';
- my $document_file = $state->{'footnote_document_file'};
- if ($document_file eq $state->{'footnote_footnote_file'})
- {
- $document_file = '';
- }
- my $docid = $state->{'footnote_place_id'};
- my $doc_state = $state->{'footnote_document_state'};
- $docid = '' if ($doc_state->{'outside_document'} or
$doc_state->{'multiple_pass'});
- my $foot_label = &$anchor($state->{'footnote_footnote_id'},
- $document_file . "#$state->{'footnote_place_id'}",
- "$state->{'footnote_number_in_page'}");
- $footnote_text = "<small>[${foot_label}]</small> ";
- }
- }
-
- $text = $footnote_text.$text;
-
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- if ($top_stack eq 'multitable')
-# FIXME
-# paragraph_number is not by cell, so it is not possible to know if it
-# is the first paragraph in cell. Also currently there is no hook for a
-# cell beginning which means that it is not possible to reset the cell
-# paragraph count at a cell beginning
-# and (!defined($paragraph_number) or !defined($$paragraph_number) or
$$paragraph_number == 1))
- {
- return $text;
- }
-
- return $open.'>'.$text.'</p>';
-}
-
-
-sub makeinfo_like_index_summary
-{
- return '';
-}
-
-sub makeinfo_like_summary_letter
-{
- return '';
-}
-
-sub makeinfo_like_index_entry($$$$$$$$$$)
-{
- my $text_href = shift;
- my $entry = shift;
- my $element_href = shift;
- my $element_text = shift;
- my $entry_file = shift;
- my $current_element_file = shift;
- my $entry_target = shift;
- my $entry_element_target = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
- return '' if ($entry !~ /\S/);
- my $element = $index_entry_ref->{'real_element'};
- if (defined($element))
- {
- my $element_set = 0;
- if (get_conf('NODE_NAME_IN_INDEX'))
- {
- if ($element->{'node'})
- {
- $element_set = 1;
- }
- elsif ($element->{'with_node'})
- {
- $element = $element->{'with_node'};
- $element_set = 1;
- }
- }
- elsif (defined(get_conf('NODE_NAME_IN_INDEX')))
- {
- if (!$element->{'node'})
- {
- $element_set = 1;
- }
- elsif ($element->{'with_section'})
- {
- $element = $element->{'with_section'};
- $element_set = 1;
- }
- }
- if ($element_set)
- {
- $element_href = main::href($element,
$Texi2HTML::THIS_ELEMENT->{'file'},
- $Texi2HTML::THISDOC{'line_nr'});
- $element_text = $element->{'text'};
- }
- }
-
-
- return '<li>' . $entry . ': ' . &$anchor('', $element_href, $element_text)
- . "</li>\n";
-}
-
-sub makeinfo_like_index_letter($$$)
-{
- my $letter = shift;
- my $id = shift;
- my $text = shift;
- return $text;
-}
-
-sub makeinfo_like_print_index($$)
-{
- my $text = shift;
- my $name = shift;
- return '' if (!defined($text));
- return "<ul class=\"index-$name\" compact>\n" . $text . "</ul>\n";
-}
-
-sub makeinfo_like_listoffloats_entry($$$$)
-{
- my $style_texi = shift;
- my $float = shift;
- my $float_style = shift;
- my $caption = shift;
- my $href = shift;
-
- if ($caption ne '')
- {
- return '<li>' . gdt('{href}: {caption}', { 'href' => &$anchor('',
$href, $float_style), 'caption' => $caption }) . "</li>\n";
- }
- else
- {
- return '<li>' . &$anchor('', $href, $float_style) . "</li>\n";
- }
-}
-
-sub makeinfo_like_listoffloats($$$)
-{
- my $style_texi = shift;
- my $style = shift;
- my $float_entries = shift;
-
- my $result = "<ul class=\"listoffloats\">\n" ;
- foreach my $float_entry (@$float_entries)
- {
- $result .= $float_entry;
- }
- return $result . "</ul>\n";
-}
-
-# a whole menu
-#
-# argument:
-# the whole menu text (entries and menu comments)
-#
-# argument:
-# whole menu text.
-sub makeinfo_like_menu($)
-{
- my $text = shift;
- $menu_entry_index=0;
- if ($text =~ /\S/)
- {
- return "<ul>\n"
- . $text . "</ul>\n";
- }
-}
-
-# formats a menu entry link pointing to a node or section
-#
-# arguments:
-# the entry text
-# the state, a hash reference holding informations about the context, with a
-# usefull entry, 'preformatted', true if we are in a preformatted format
-# (a format keeping space between words). In that case a function
-# of the main program, main::do_preformatted($text, $state) might
-# be used to format the text with the current format style.
-# href is optionnal. It is the reference to the section or the node anchor
-# which should be used to make the link (typically it is the argument
-# of a href= attribute in a <a> element).
-sub makeinfo_like_menu_link($$$$$$$)
-{
- my $entry = shift;
- my $state = shift;
- my $href = shift;
- my $node = shift;
- my $title = shift;
- my $ending = shift;
- my $has_title = shift;
- $title = '' unless ($has_title);
- if (($entry eq '') or get_conf('NODE_NAME_IN_MENU') or
$state->{'preformatted'})
- {
-
- $title .= ':' if ($title ne '');
- $entry = "$title$node";
- }
- $menu_entry_index++;
- my $accesskey;
- $accesskey = "accesskey=\"$menu_entry_index\"" if
(get_conf('USE_ACCESSKEY') and ($menu_entry_index < 10));
- $entry = &$anchor ('', $href, $entry, $accesskey) if (defined($href));
-# if ($state->{'preformatted'})
-# {
-# return '<li>' . main::do_preformatted($entry . $ending, $state);
-# }
- return "<li> $entry";
-}
-
-# formats a menu entry description, ie the text appearing after the node
-# specification in a menu entry an spanning until there is another
-# menu entry, an empty line or some text at the very beginning of the line
-# (we consider that text at the beginning of the line begins a menu comment)
-#
-# arguments:
-# the description text
-# the state. See menu_entry.
-sub makeinfo_like_menu_description($$)
-{
- my $text = shift;
- my $state = shift;
-# if ($state->{'preformatted'})
-# {
-# return main::do_preformatted($text, $state) . '</td></tr>';
-# }
- return "$text</li>\n";
-}
-
-1;
Index: texi2html/examples/noheaders.init
===================================================================
RCS file: texi2html/examples/noheaders.init
diff -N texi2html/examples/noheaders.init
--- texi2html/examples/noheaders.init 15 Jul 2010 12:26:59 -0000 1.22
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,110 +0,0 @@
-# -*-perl-*-
-#+##############################################################################
-#
-# noheaders.init: output html without headers. Obsoleted by --no-header
-#
-# Copyright (C) 2004, 2007 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-#
-# does nothing in case of info (at least in the test suite)
-
-$print_section = \&T2H_NOHEAD_print_section;
-$end_section = \&T2H_NOHEAD_end_section;
-$one_section = \&T2H_NOHEAD_one_section;
-$print_Top_footer = \&T2H_NOHEAD_print_Top_footer;
-$print_misc_footer = \&T2H_NOHEAD_print_misc_footer;
-$print_head_navigation = \&T2H_NOHEAD_noop;
-$print_navigation = \&T2H_NOHEAD_noop;
-$about_body = \&T2H_NOHEAD_about_body;
-
-sub T2H_NOHEAD_noop
-{
- return '';
-}
-
-########################################################################
-# Layout for html for every sections
-#
-
-sub T2H_NOHEAD_print_section
-{
- my $fh = shift;
- my $first_in_page = shift;
- my $previous_is_top = shift;
- my $nw = main::print_lines($fh);
-}
-
-sub T2H_NOHEAD_one_section($$)
-{
- my $fh = shift;
- my $element = shift;
- main::print_lines($fh);
- print $fh "$DEFAULT_RULE\n" if ($DEFAULT_RULE ne '');
- &$print_page_foot($fh);
-}
-
-###################################################################
-# Layout of top-page I recommend that you use @ifnothtml, @ifhtml,
-# @html within the Top texinfo node to specify content of top-level
-# page.
-#
-# If you enclose everything in @ifnothtml, then title, subtitle,
-# author and overview is printed
-# Texi2HTML::HREF of Next, Prev, Up, Forward, Back are not defined
-# if $T2H_SPLIT then Top page is in its own html file
-sub T2H_NOHEAD_print_Top_footer($$)
-{
- my $fh = shift;
- print $fh "$DEFAULT_RULE\n" if ($DEFAULT_RULE ne '');
-}
-
-###################################################################
-# Layout of Toc, Overview, and Footnotes pages
-# By default, we use "normal" layout
-# Texi2HTML::HREF of Next, Prev, Up, Forward, Back, etc are not defined
-# use: my $buttons = [...] to redefine navigation buttons
-sub T2H_NOHEAD_print_misc_header
-{
- my $fh = shift;
- &$print_page_head($fh) if (get_conf('SPLIT'));
-}
-sub T2H_NOHEAD_print_misc_footer
-{
- my $fh = shift;
- print $fh "$DEFAULT_RULE\n" if ($DEFAULT_RULE ne '');
- if (get_conf('SPLIT'))
- {
- &$print_page_foot($fh);
- }
-
-}
-
-sub T2H_NOHEAD_end_section($)
-{
- my $fh = shift;
- print $fh "$DEFAULT_RULE\n" if ($DEFAULT_RULE ne '');
-}
-
-###################################################################
-# Layout of navigation panel
-
-sub T2H_NOHEAD_about_body
-{
-}
-
Index: texi2html/examples/roff.init
===================================================================
RCS file: texi2html/examples/roff.init
diff -N texi2html/examples/roff.init
--- texi2html/examples/roff.init 15 Jul 2010 12:26:59 -0000 1.42
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,1240 +0,0 @@
-# -*-perl-*-
-#+##############################################################################
-#
-# roff.init: convert to roff
-#
-# So much out of date that it may be considered unuseful.
-#
-# Copyright (C) 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-# FIXME obsolete
-main::load_init_file('', 'noheaders.init');
-
-set_default('SPLIT', 0);
address@hidden = ('info');
-set_default('USE_ISO', 0);
-$SMALL_RULE = '';
-$DEFAULT_RULE = '';
-$MIDDLE_RULE = '';
-$BIG_RULE = '';
-set_default('NODE_FILE_EXTENSION', 'roff');
-set_default('EXTENSION', 'roff');
-$MENU_SYMBOL = '*';
-set_default('AVOID_MENU_REDUNDANCY', 0);
-
-$print_Top = \&T2H_ROFF_print_Top;
-$print_misc = \&T2H_ROFF_print_misc;
-$print_page_head = \&T2H_ROFF_print_page_head;
-$print_page_foot = \&T2H_ROFF_print_page_foot;
-$toc_body = \&T2H_ROFF_toc_body;
-$titlepage = \&T2H_ROFF_titlepage;
-
-sub T2H_ROFF_print_page_head
-{
- my $fh = shift;
- print $fh <<EOT;
-.nr _- 0
-.tr \\(is'
-.tr \\(if`
-.tr \\(pd"
-
-$AFTER_BODY_OPEN
-
-EOT
- my $today = get_conf('today');
- print $fh $Texi2HTML::THISDOC{'copying_comment'} . "\n";
- print $fh "" . &$comment("Created by
$Texi2HTML::THISDOC{'program_version'},
$Texi2HTML::THISDOC{'program_homepage'}\n");
- # FIXME this should instead be done in print_title
- print $fh ".ds St " . protect_spaces($Texi2HTML::THISDOC{'title'}) . "\n";
- print $fh '.oh \'\\\\*(St\'\'%\'' ."\n".'.eh \'%\'\'\\\\*(St\'' . "\n";
-}
-
-sub T2H_ROFF_print_page_foot
-{
- my $fh = shift;
- my $program_string = program_string();
- print $fh <<EOT;
-.br
-.pp
-$program_string
-EOT
-}
-
-sub T2H_ROFF_print_Top($$)
-{
- my $fh = shift;
- my $has_top_heading = shift;
-
- my $buttons = address@hidden;
- &$print_head_navigation($fh, $buttons);
- # FIXME this is done in print_title now.
- # redo the titlepage with the actual state
- my ($titlepage_text, $titlepage_no_texi, $titlepage_simple_text) =
main::do_special_region_lines('titlepage',$Texi2HTML::THISDOC{'state'});
- &$titlepage([],$titlepage_text, $titlepage_no_texi,
$titlepage_simple_text);
- print $fh $Texi2HTML::TITLEPAGE;
- main::print_lines($fh, $Texi2HTML::THIS_SECTION);
-}
-
-# FIXME: use the vanilla print_misc instead, and add a
-# $heading_text
-sub T2H_ROFF_print_misc
-{
- my $fh = shift;
- &$print_misc_header($fh);
- main::print_lines($fh);
- &$print_misc_footer($fh);
-}
-
-# FIXME obsolete, main one is right now, need to do a heading_text
-sub T2H_ROFF_titlepage ($$$$)
-{
- my $titlepage_lines = shift;
- my $titlepage_text = shift;
- my $titlepage_no_texi = shift;
- my $titlepage_simple_text = shift;
-
- my $result = '';
- if (@{$Texi2HTML::THISDOC{'titles'}}
- or @{$Texi2HTML::THISDOC{'subtitles'}}
- or @{$Texi2HTML::THISDOC{'authors'}})
- {
-# FIXME obsolete, use $line_command instead
- foreach my $title (@{$Texi2HTML::THISDOC{'titles'}})
- {
- $result .= ".sz +10\n.ce\n" . protect_spaces($title) . "\n.sz
-10\n";
- }
- foreach my $subtitle (@{$Texi2HTML::THISDOC{'subtitles'}})
- {
- $result .= ".sz +4\n.ce\n" . protect_spaces($subtitle) . "\n.sz
-4\n";
- }
- $result .= ".sp 4\n" if ($result ne '');
- foreach my $author (@{$Texi2HTML::THISDOC{'authors'}})
- {
- $result .= protect_spaces($author) . "\n.br\n";
- }
- $result .= ".sp 2\n" if (@{$Texi2HTML::THISDOC{'authors'}});
- }
- if (($result ne '') or ($Texi2HTML::TITLEPAGE ne ''))
- {
- $Texi2HTML::TITLEPAGE = ".tp\n" . $result . $titlepage_text . ".++
C\n";
- }
-}
-
-########################################################################
-# Control of formatting:
-# 1.) For some changes, it is often enough to change the value of
-# some global map. It might necessitate building a little
-# function along with the change in hash, if the change is the use
-# of another function (in style_map).
-# 2.) For other changes, reimplement one of the t2h_default_<fnc>* routines,
-# give them another name, and assign them to the respective
-# $<fnc> variable (below).
-
-
-#
-# This hash should have keys corresponding with the nonletter command accent
-# whose following character is considered to be the argument
-# This hash associates an accent macro to the ISO name for the accent if any.
-# The customary use of this map is to find the ISO name appearing in html
-# entity (like é) associated with a texinfo accent macro.
-#
-# The keys of the hash are
-# ": umlaut
-# ~: tilda accent
-# ^: circumflex accent
-# `: grave accent
-# ': acute accent
-# =: macron accent
-%accent_map = (
- '"', ':',
- '~', '~',
- '^', '^',
- '`', '`',
- ',', ',',
- "'", "'",
- '=', '',
- );
-
-#
-# texinfo "simple things" (@foo) to HTML ones
-#
-%simple_map = (
-# "*", "\n.br\n",
- ' ', '\ ',
- "\t", "\\\t",
- "\n", "\\\n",
- # "­" or "­" could also be possible for @-, but it seems
- # that some browser will consider this as an always visible hyphen mark
- # which is not what we want (see http://www.cs.tut.fi/~jkorpela/shy.html)
- '-', '', # hyphenation hint
- '|', '', # used in formatting commands @evenfooting and friends
- '/', '',
- # spacing commands
- ':', '',
- '!', '!',
- '?', '?',
- '.', '\&.',
- '@', '@',
- '}', '}',
- '{', '{',
- );
-
-# this map is used in preformatted text
-%simple_map_pre = %simple_map;
-
-#
-# texinfo "things" (@foo{}) to HTML ones
-#
-%things_map = (
- 'TeX' => 'TeX',
- 'LaTeX' => 'LaTeX',
- 'bullet' => '\(bu',
- 'copyright' => '\(co',
- 'registeredsymbol' => '\(rg',
- 'dots' => '\&...',
- 'enddots' => '\&...',
- 'equiv' => '\(==',
-# i18n
- 'error' => 'error->',
- 'expansion' => '\(->',
- 'minus' => '\-',
- 'point' => '*',
- 'print' => '-|',
- 'result' => '\(rh',
- # set in code using the language
- # 'today', &pretty_date,
- 'aa' => '\(oa',
- 'AA' => '\(oA',
- 'ae' => '\(ae',
- 'oe' => '\(oe',
- 'AE' => '\(AE',
- 'OE' => '\(OE',
- 'o' => '\(/o',
- 'O' => '\(/O',
- 'ss' => '\(ss',
- 'l' => '\(/l',
- 'L' => '\(/L',
- 'exclamdown' => '\(r!',
- 'questiondown' => '\(r?',
- 'pounds' => '\(Po',
- 'ordm' => '\(Om',
- 'ordf' => '\(Of',
- 'euro' => '\(eu',
- );
-
-# This map is used in preformatted environments
-%pre_map = %things_map;
-
-#%style_map = (
-# 'acronym', '',
-# 'asis', '',
-# 'b', ['\fB', '\fR'],
-# 'cite', ['\fI', '\fR'],
-# 'code', ['\fR\&\f(CW', '\fR'],
-# 'command', ['\fR\&\f(CW', '\fR'],
-# 'ctrl', ['\fR\&\f(CW', '\fR'],
-# 'dfn', ['\fI', '\fR'],
-# 'dmn', '',
-# 'email', ['\fB', '\fR'],
-# 'emph', ['\fI', '\fR'],
-# 'env', ['\fR\&\f(CW', '\fR'],
-# 'file', ['\fR\&\f(CW', '\fR', '"'],
-# 'i', ['\fI', '\fR'],
-# 'kbd', ['\fR\&\f(CW', '\fR'],
-# 'key', ['\fR\&\f(CW', '\fR'],
-# 'math', ['\fR\&\f(CW', '\fR'],
-# 'option', ['\fR\&\f(CW', '\fR', '"'],
-# 'r', ['\fR', ''],
-# 'samp', ['\fR\&\f(CW', '\fR', '"'],
-# 'sc', '&roff_sc',
-# 'strong', ['\fB', '\fR'],
-# 't', ['\fR\&\f(CW', '\fR'],
-# 'uref', '&default_uref',
-# 'url', '&default_url',
-# 'var', ['\fI', '\fR'],
-# 'verb', ['\fR\&\f(CW', '\fR'],
-# 'titlefont', ["\n.sz +10\n.ce\n", "\n.sz -10\n"],
-# 'w', '',
-# 'H', '&roff_accent',
-# 'dotaccent', '&roff_accent',
-# 'ringaccent', '&roff_accent',
-# 'tieaccent', '&roff_accent',
-# 'u', '&roff_accent',
-# 'ubaraccent', '&roff_accent',
-# 'udotaccent', '&roff_accent',
-# 'v', '&roff_accent',
-# ',', '&roff_accent',
-# 'dotless', ''
-# );
-
-my @bold_commands = ('strong', 'b', 'email');
-my @italic_commands = ('cite', 'dfn', 'emph', 'i', 'var', 'slanted');
-my @fixed_command = ('code', 'command', 'ctrl', 'env', 'file', 'kbd', 'key',
- 'math', 'option', 'samp', 't', 'verb');
-
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents),
keys(%accent_map))
-{
- #$style_map{$accent_command} = { 'function' => \&t2h_roff_accent };
- $style_map{$accent_command} = '&roff_accent';
-}
-#foreach my $accent (keys(%accent_map))
-#{
-# $style_map{$accent} = '&roff_accent';
-#}
-
-foreach my $command (keys(%style_map))
-{
- delete $style_map{$command}->{'attribute'} if
(exists($style_map{$command}->{'attribute'}));
- if (grep {$_ eq $command} @bold_commands)
- {
- delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
- $style_map{$command}->{'begin'} = '\fB';
- $style_map{$command}->{'end'} = '\fR';
- next;
- }
- elsif (grep {$_ eq $command} @italic_commands)
- {
- delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
- $style_map{$command}->{'begin'} = '\fI';
- $style_map{$command}->{'end'} = '\fR';
- next;
- }
- elsif (grep {$_ eq $command} @fixed_commands)
- {
- delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
- $style_map{$command}->{'begin'} = '\fR\&\f(CW';
- $style_map{$command}->{'end'} = '\fR';
- next;
- }
-}
-
-delete $style_map{'titlefont'}->{'function'} if
(exists($style_map{'titlefont'}->{'function'}));
-$style_map{'titlefont'}->{'begin'} = "\n.sz +10\n.ce\n";
-$style_map{'titlefont'}->{'end'} = "\n.sz -10\n";
-
-delete $style_map{'r'}->{'function'} if
(exists($style_map{'r'}->{'function'}));
-$style_map{'r'}->{'begin'} = '\r';
-#$style_map{'r'}->{'end'} = '';
-
-$style_map{'sc'} = '&roff_sc';
-
-$style_map{'indicateurl'}->{'begin'} = '<';
-$style_map{'indicateurl'}->{'end'} = '>';
-
-foreach my $command (keys(%style_map))
-{
- if (ref($style_map{$command}) ne 'HASH')
- {
- $style_map_pre{$command} = $style_map{$command};
- next;
- }
- $style_map_pre{$command} = {};
- foreach my $key (keys(%{$style_map{$command}}))
- {
- $style_map_pre{$command}->{$key} = $style_map{$command}->{$key};
- }
-}
-
-%special_accents = (
- 'ringaccent' => 'aA',
- "'" => 'aeiouyAEIOUY',
- ',' => 'cC',
- '^' => 'aeiouAEIOU',
- '`' => 'aeiouAEIOU',
- '~' => 'nNaoAO',
- '"' => 'aeiouyAEIOUY',
- 'v' => 'sSzZ',
-);
-
-sub roff_accent($$)
-{
- my $text = shift;
- my $accent = shift;
- return $text if ($accent eq 'dotless');
- return "\\($accent_map{$accent}${text}" if (defined($accent_map{$accent})
and defined($special_accents{$accent}) and ($text =~
/^[$special_accents{$accent}]$/));
- return "\\(o${text}" if (($accent eq 'ringaccent') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
- return "\\(v${text}" if (($accent eq 'v') and
(defined($special_accents{$accent})) and ($text =~
/^[$special_accents{$accent}]$/));
-#FIXME maybe we should protect the symbols such that they look like strings and
-# not ponctuation marks ? Like it is done in texi2roff ?
- return $text . '\\&.' if ($accent eq 'dotaccent');
- return '\\&.' . $text if ($accent eq 'udotaccent');
- return ascii_accents($text, $accent);
-}
-
-sub roff_sc($$)
-{
- return "\n.sz -6\n" . uc($_[0]) . "\n.sz +6\n" ;
-}
-
-sub roff_ctrl($$)
-{
- return "\\*^$_[0]";
-}
-
-$format = \&T2H_ROFF_format;
-
-sub T2H_ROFF_format($$$)
-{
- my $tag = shift;
- my $element = shift;
- my $text = shift;
- return '' if (!defined($element) or ($text !~ /\S/));
- return $element->[0] . $text . $element->[1];
-}
-
-%format_map = (
- 'quotation' => [ ".(q\n", ".)q\n" ],
- 'smallquotation' => [ ".(q\n", ".)q\n" ],
- # lists
- 'itemize' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
- 'enumerate' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
- 'multitable' => [ ".(l M\n.nh\n", ".hy\n.)l\n" ],
- 'table' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
- 'vtable' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
- 'ftable' => [ ".(l L F\n.ba +5\n", ".ba -5\n.)l\n" ],
- );
-
-%special_list_commands = (
- 'table' => {},
- 'vtable' => {},
- 'ftable' => {},
- 'itemize' => {}
- );
-
-$complex_format_map =
-(
- 'example' =>
- {
- 'begin' => "",
- 'end' => "",
- 'begin_region' => ".(l I\n\\&\\fR\\f(CW",
- 'end_region' => "\\&\\fR\n.)l\n"
- },
- 'smallexample' =>
- {
- 'begin' => "",
- 'end' => "",
- 'begin_region' => ".(l I\n.size -2\n\\&\\fR\\f(CW",
- 'end_region' => "\\&\\fR\n.size +2\n.)l\n"
- },
- 'display' =>
- {
- 'begin' => "",
- 'end' => "",
- 'begin_region' => ".(l I\n\\&\\fR\\f(CW",
- 'end_region' => "\\&\\fR\n.)l\n"
- },
- 'smalldisplay' =>
- {
- 'begin' => "",
- 'end' => "",
- 'begin_region' => ".(l I\n.size -2\n\\&\\fR\\f(CW",
- 'end_region' => "\\&\\fR\n.size +2\n.)l\n"
- },
- 'menu-comment' =>
- {
- 'begin' => "",
- 'end' => "",
- 'begin_region' => "",
- 'end_region' => "\n"
- },
- 'menu-preformatted' =>
- {
- 'begin' => "",
- 'end' => "",
- 'begin_region' => "",
- 'end_region' => "\n"
- }
-);
-
-# format shouldn't narrow the margins
-
-$complex_format_map{'lisp'} = $complex_format_map{'example'};
-$complex_format_map{'smalllisp'} = $complex_format_map{'smallexample'};
-$complex_format_map{'format'} = $complex_format_map{'display'};
-$complex_format_map{'smallformat'} = $complex_format_map{'smalldisplay'};
-
-sub protect_spaces($)
-{
- my $text = shift;
- my $result = '';
- while($text)
- {
- if ($text =~ s/^([^\\]*)\\//o)
- {
- my $leading = $1;
- if (defined($leading))
- {
- $leading =~ s/([\t ])/\\$1/go;
- $result .= $leading . '\\';
- }
- if (($text =~ s/^(\s)//o) or ($text =~ s/^(.)//o))
- {
- $result .= $1;
- }
- }
- else
- {
- $text =~ s/([\t ])/\\$1/go;
- $result .= $text;
- $text = '';
- }
- }
- return $result;
-}
-
-# formatting functions
-
-$anchor = \&t2h_roff_anchor;
-$def_item = \&t2h_roff_def_item;
-$def = \&t2h_roff_def;
-$menu = \&t2h_roff_menu;
-$menu_link = \&t2h_roff_menu_link;
-$menu_comment = \&t2h_roff_menu_comment;
-$menu_description = \&t2h_roff_menu_description;
-$simple_menu_link = \&t2h_roff_simple_menu_link;
-$table_item = \&t2h_roff_table_item;
-$table_line = \&t2h_roff_table_line;
-$row = \&t2h_roff_row;
-$cell = \&t2h_roff_cell;
-$list_item = \&t2h_roff_list_item;
-$comment = \&t2h_roff_comment;
-$def_line = \&t2h_roff_def_line;
-$raw = \&t2h_roff_raw;
-$heading = \&t2h_roff_heading;
-$paragraph = \&t2h_roff_paragraph;
-$preformatted = \&t2h_roff_preformatted;
-$foot_line_and_ref = \&t2h_roff_foot_line_and_ref;
-$foot_section = \&t2h_roff_foot_section;
-$image = \&t2h_roff_image;
-$index_entry_label = \&t2h_roff_index_entry_label;
-$index_summary = \&t2h_roff_index_summary;
-$print_index = \&t2h_roff_print_index;
-$protect_text = \&t2h_roff_protect_text;
-$cartouche = \&t2h_roff_cartouche;
-$sp = \&t2h_roff_sp;
-$normal_text = \&t2h_roff_normal_text;
-$empty_line = \&t2h_roff_empty_line;
-$unknown = \&t2h_roff_unknown;
-$float = \&t2h_roff_float;
-$listoffloats = \&t2h_roff_listoffloats;
-$listoffloats_entry = \&t2h_roff_listoffloats_entry;
-
-# This function is used to protect characters which are special in html
-# in inline text: &, ", <, and >.
-#
-# argument:
-# text to be protected
-sub t2h_roff_protect_text($)
-{
- my $text = shift;
- $text =~ s/\\/\\e/g;
-# $text =~ s/$;---$;/\\(em/g;
-# $text =~ s/$;--$;/-/g;
-# $text =~ s/$;-$;/\\-/g;
- $text =~ s/^\./\\&./;
- $text =~ s/([\s])\./$1\\&./g;
- return $text;
-}
-
-sub t2h_roff_normal_text($$$$$$$;$)
-{
- my $text = shift;
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_code =shift;
- my $in_math = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- $text = &$protect_text($text) unless($in_raw_text);
- if (! $in_code and !$in_preformatted and !$in_raw_text)
- {
- $text =~ s/---/\\(em/g;
- $text =~ s/--/\\(en/g;
- $text =~ s/-/\\-/g;
- $text =~ s/``/\\(lq/g;
- $text =~ s/''/\\(rq/g;
- }
- #$text =~ s/---/\\(em/g;
- #$text =~ s/(--?-?)/$;$1$;/go;
- return $text;
-}
-
-sub t2h_roff_unknown($$$)
-{
- my $macro = shift;
- my $line = shift;
- my $pass = shift;
-
- if ($macro eq '*' and $pass == 2)
- {
- $line = '' if ($line =~ /^\s*$/);
- return ($line, 1, "\n.br\n", undef);
- }
- return ($line, 0, undef, undef);
-}
-
-
-# This function produces an anchor
-#
-# arguments:
-# $name : anchor name
-# $href : anchor href
-# text : text displayed
-# extra_attribs : added to anchor attributes list
-sub t2h_roff_anchor($;$$$)
-{
- my $name = shift;
- my $href = shift;
- my $text = shift;
- my $attributes = shift;
- $href = '' if (!defined($href) or ($href !~ /\S/));
- $text = '' if (!defined($text));
- return $text if ($text ne '');
- return "[$href]" if ($href ne '');
- return '';
-}
-
-# This function is used to format the text associated with a @deff/@end deff
-#
-# argument:
-# text
-sub t2h_roff_def_item($)
-{
- my $text = shift;
- if ($text =~ /\S/)
- {
- {
- #return ".ba +5\n.(l L F\n" . $text . ".)l\n.ba -5\n";
- return ".(l L F\n.ba +5\n" . $text . ".ba -5\n.)l\n";
- }
- }
- return '';
-}
-
-# format the container for the @deffn line and text
-#
-# argument
-# text of the whole @def, line and associated text.
-sub t2h_roff_def($)
-{
- my $text = shift;
- return $text;
-}
-
-# a whole menu
-#
-# argument:
-# the whole menu text (entries and menu comments)
-#
-# argument:
-# whole menu text.
-sub t2h_roff_menu($)
-{
- my $text = shift;
- chomp $text;
- return ".(l M\n\\&\\s8" . gdt('Menu:') . "\n" . $text . "\\&\\s0\n.)l\n";
-}
-
-# a simple menu entry ref in case we aren't in a standard menu context
-sub t2h_roff_simple_menu_link($$$$$$$)
-{
- my $entry = shift;
- my $preformatted = shift; # We assume this is true.
- my $href = shift;
- my $node = shift;
- my $title = shift;
- my $ending = shift;
- my $has_title = shift;
- $title = '' unless ($has_title);
- $title .= ':' if ($title ne '');
- return "$MENU_SYMBOL$title$node$ending";
-}
-
-# formats a menu entry link pointing to a node or section
-#
-# arguments:
-# the entry text
-# the state, a hash reference holding informations about the context, with a
-# usefull entry, 'preformatted', true if we are in a preformatted format
-# (a format keeping space between words). In that case a function
-# of the main program, main::do_preformatted($text, $state) might
-# be used to format the text with the current format style.
-# href is optionnal. It is the reference to the section or the node anchor
-# which should be used to make the link (typically it is the argument
-# of a href= attribute in a <a> element).
-sub t2h_roff_menu_link($$$$$$)
-{
- my $entry = shift;
- my $state = shift;
- my $href = shift;
- my $node = shift;
- my $title = shift;
- my $ending = shift;
- my $has_title = shift;
- $title = '' unless ($has_title);
- $title .= ':' if ($title ne '');
- return "$MENU_SYMBOL$title$node$ending";
-}
-
-# formats a menu entry description, ie the text appearing after the node
-# specification in a menu entry an spanning until there is another
-# menu entry, an empty line or some text at the very beginning of the line
-# (we consider that text at the beginning of the line begins a menu comment)
-#
-# arguments:
-# the description text
-# the state. See menu_entry.
-sub t2h_roff_menu_description($$)
-{
- my $text = shift;
- my $state = shift;
- return $text;
-}
-
-# a menu comment (between menu lines)
-# formats the container of a menu comment. A menu comment is any text
-# appearing between menu lines, either separated by an empty line from
-# the preceding menu entry, or a text beginning at the first character
-# of the line (text not at the very beginning of the line is considered to
-# be the continuation of a menu entry description text).
-#
-# The text itself is considered to be in a preformatted environment
-# with name 'menu-commment' and with style $MENU_PRE_STYLE.
-#
-# argument
-# text contained in the menu comment.
-sub t2h_roff_menu_comment($)
-{
- my $text = shift;
- return $text;
-}
-
-# text after @item in table, vtable and ftable
-sub t2h_roff_table_item($$$$$)
-{
- my $text = shift;
- my $index_label = shift;
- my $format = shift;
- my $command = shift;
-# my $formatted_command = shift;
- my $style_stack = shift;
-# my $text_formatted = shift;
-# my $text_formatted_leading_spaces = shift;
-# my $text_formatted_trailing_spaces = shift;
- my $item_cmd = shift;
-
-
-# if (defined($text_formatted))
-# {
-# $text = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
-# }
-# $formatted_command = '' if (!defined($formatted_command) or
-# exists($special_list_commands{$format}->{$command}));
- $text = '.ip ' . $formatted_command . protect_spaces($text) . "\n";
- $text .= $index_label if (defined($index_label));
- return $text;
-}
-
-# format text on the line following @item (in table, vtable and ftable)
-sub t2h_roff_table_line($)
-{
- my $text = shift;
- return $text;
-}
-
-# row in multitable
-sub t2h_roff_row($)
-{
- my $text = shift;
-
- if ($text =~ /\S/)
- {
- return $text ."\n" ;
- }
- return '';
-}
-
-# cell in multitable
-sub t2h_roff_cell($)
-{
- my $text = shift;
- chomp $text;
- return protect_spaces($text) . "\\\t";
-}
-
-# format an item in a list
-#
-# argument:
-# text of the item
-sub t2h_roff_list_item($$$$$$$)
-{
- my $text = shift;
- my $format = shift;
- my $command = shift;
- my $formatted_command = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- $formatted_command = '' if (!defined($formatted_command) or
- exists($special_list_commands{$format}->{$command}));
- if ($text =~ /\S/)
- {
- #return $formatted_command . $text;
- return $text . "\n";
- }
- return '';
-}
-
-# an comment
-sub t2h_roff_comment($)
-{
- my $text = shift;
- my $result = '';
- while ($text)
- {
- $text =~ s/$;---$;/--/g;
- $text =~ s/$;--$;/-/g;
- $text =~ s/$;-$;/-/g;
- $text =~ s/^(.*)//;
- $result .= ".\\\"$1";
- $result .= "\n" if ($text =~ s/^\n//);
- }
- return $result;
-}
-
-# a paragraph
-sub t2h_roff_paragraph($$$$$$$$$$)
-{
- my $text = shift;
- my $align = shift;
- my $indent = shift;
- my $paragraph_command = shift;
- my $paragraph_command_formatted = shift;
- my $paragraph_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- return '' if ($text =~ /^\s*$/);
- if (defined($paragraph_number) and defined($$paragraph_number))
- {
- $$paragraph_number++;
- $paragraph_command_formatted = undef if ($$paragraph_number > 1);
- }
-# $paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
-# exists($special_list_commands{$format}->{$paragraph_command}));
- #return $text if (defined($format) and $format eq 'multitable');
- return $text if (defined($format) and (($format eq 'multitable') or
($format eq 'quotation') or ($format eq 'smallquotation')));
- my $open = ".pp\n";
- if (defined($format) and (($format eq 'itemize') or ($format eq
'enumerate')) and
- defined($paragraph_number) and defined($$paragraph_number) and
($$paragraph_number == 1))
- {
- $open = ".lp\n";
- }
- my $close = '';
- if ($align)
- {
- if ($align eq 'flushleft')
- {
- $open .= ".ad l\n";
- $close .= ".ad b\n";
- }
- elsif ($align eq 'flushright')
- {
- $open .= ".ad r\n";
- $close .= ".ad b\n";
- }
- elsif ($align eq 'center')
- {
- $open .= ".ce\n";
- }
- }
- if (defined($format) and ($format eq 'enumerate') and
- defined($paragraph_number) and defined($$paragraph_number) and
($$paragraph_number == 1) and defined($number) and ($number ne ''))
- {
- $open .= "$number.";
- }
- chomp ($text);
- #return $open. $paragraph_command_formatted . $text . "\n" . $close;
- return $open. $text . "\n" . $close;
-}
-
-# a preformatted region
-sub t2h_roff_preformatted($$$$$$$$$$)
-{
- my $text = shift;
- my $pre_style = shift;
- my $class = shift;
- my $leading_command = shift;
- my $leading_command_formatted = shift;
- my $preformatted_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- $leading_command_formatted = '' if (!defined($leading_command_formatted) or
- exists($special_list_commands{$format}->{$leading_command}));
-
- if (defined($format) and $format eq 'multitable')
- {
- my $chomped = chomp($text);
- my $result = '\&\fR\f(CW' . $text . '\&\fR';
- $result .= "\n" if ($chomped);
- return $result;
- }
- return '' if ($text eq '');
- if (defined($preformatted_number) and defined($$preformatted_number))
- {
- $$preformatted_number++;
- $leading_command_formatted = undef if ($$preformatted_number > 1);
- }
- $leading_command_formatted = '' if (!defined($leading_command_formatted));
- chomp $text;
- my $open = '';
- if (defined($format) and ($format eq 'enumerate') and
- defined($paragraph_number) and defined($$paragraph_number) and
($$paragraph_number == 1) and defined($number) and ($number ne ''))
- {
- $open = "$number. ";
- }
- return $complex_format_map{$class}->{'begin_region'} .
$leading_command_formatted . $open . $text .
$complex_format_map{$class}->{'end_region'};
-}
-
-# This function formats a heading for an element
-#
-# argument:
-# an element. It is a hash reference for a node or a sectioning command.
-# The interesting keys are:
-# 'text': the heading text
-# 'name': the heading text without section number
-# 'node': true if it is a node
-# 'level': level of the element. 0 for @top, 1 for chapter, heading,
-# appendix..., 2 for section and so on...
-# 'tag_level': the sectioning element name, raisesections and lowersections
-# taken into account
-sub t2h_roff_heading($$$$$;$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
- my $one_section = shift;
- my $element_heading = shift;
-
- my $name = $element->{'text'};
- if (!$element->{'node'})
- {
- $name = $element->{'name'};
- }
- return '' if ($element->{'name'} !~ /\S/);
- my $class = $element->{'tag_level'};
- $class = 'unnumbered' if ($class eq 'top');
- $level = $element->{'level'};
- $level = 3 if (!defined($level));
- $level = 1 if ($level == 0);
- my $heading = '';
- $heading = ".bp\n" if ($level == 1);
- $heading .= '.if !\n(_- \{\\' . "\n.nr _- 1\n.nr \$1 0 1\n" . '.af $1 A\}'
. "\n"
- if ($class =~ /^appendix/);
- $name = protect_spaces($name);
- my $toc_entry = '\&';
- if ($class =~ /^unnumbered/ or ($class eq 'node'))
- {
- $heading .= ".uh $name\n";
- $toc_entry .= ' ';
- }
- elsif (($class =~ /section$/) or ($class eq 'chapter') or ($class =~
/^appendix/))
- {
- $heading .= ".sh $level $name\n";
- my $number = 1;
- while ($number < $level)
- {
- $toc_entry .= "\\n(\$$number.";
- $number++;
- }
- $toc_entry .= "\\n(\$$number ";
- }
- $toc_entry .= $name;
- return $heading . "\n" if ($class eq 'node');
- return $heading . ".(x\n" . $toc_entry . "\n.)x\n\\&\\fR\n";
-}
-
-sub T2H_ROFF_toc_body($$$)
-{
- my $elements_list = shift;
- my $do_contents = shift;
- my $do_scontents = shift;
- if ($do_contents or $do_scontents)
- {
- my $lines = ".pp\n.nr % 0 1\n.af % i\n.bp \\n%+1\n.ce\n\\&\\fB" .
gdt('Table of Contents') . "\\fR\n.sp 2\n.xp\n";
- if (!$do_contents)
- {
- push @{$Texi2HTML::OVERVIEW}, $lines;
- }
- else
- {
- push @{$Texi2HTML::TOC_LINES}, $lines;
- }
- }
-}
-
-# formatting of raw regions
-# ih L2H is true another mechanism is used for tex
-sub t2h_roff_raw($$)
-{
- my $style = shift;
- my $text = shift;
- my $expanded = 1 if (grep {$style eq $_} @EXPAND);
- if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($expanded and
($style eq 'tex' or $style eq 'html')))
- {
- chomp ($text);
- return ".(l M\n\\fR\\&\\f(CW" . &$protect_text($text) . "\\fR\n.)l\n" ;
- }
- elsif ($expanded)
- {
- main::msg_debug ("(bug) unknown style $style");
- return &$protect_text($text);
- }
- return '';
-}
-
-# This function formats a footnote reference and the footnote text associated
-# with a given footnote.
-# The footnote reference is the text appearing in the main document pointing
-# to the footnote text.
-#
-# arguments:
-# absolute number of the footnote (in the document)
-# relative number of the footnote (in the page)
-# identifier for the footnote
-# identifier for the footnote reference in the main document
-# main document file
-# footnote text file
-# array with the footnote text lines
-# the state. See menu entry.
-#
-# returns:
-# reference on an array containing the footnote text lines which should
-# have been updated
-# the text for the reference pointing on the footnote text
-sub t2h_roff_foot_line_and_ref($$$$$$$)
-{
- my $number_in_doc = shift;
- my $number_in_page = shift;
- my $footnote_id = shift;
- my $place_id = shift;
- my $document_file = shift;
- my $footnote_file = shift;
- my $lines = shift;
- my $state = shift;
-
- my $text = '';
- my $line;
- while (@$lines)
- {
- $line = shift @$lines;
- $text .= $line;
- }
- chomp $text;
- return ([], "\n.(f\n" . $text . "\n.)f\n" );
-}
-
-# formats a group of footnotes.
-#
-# argument:
-# array reference on the footnotes texts lines
-#
-# returns an array reference on the group of footnotes lines
-sub t2h_roff_foot_section($)
-{
- my $lines = shift;
- @$lines = ();
-}
-
-# format an image
-#
-# arguments:
-# image file name
-# image basename
-# a boolean true if we are in a preformatted format
-sub t2h_roff_image($$$$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- my $file_name = shift;
- return "[$base src=$file_name]" if ($base ne $file_name);
- return "[$base]";
-}
-
-# format a target in the main document for an index entry.
-#
-# arguments:
-# target identifier
-# boolean true if in preformatted format
-sub t2h_roff_index_entry_label($$$$$$$$$)
-{
- my $identifier = shift;
- my $preformatted = shift;
- my $entry = shift;
- my $index_name = shift;
- my $index_command = shift;
- my $texi_entry = shift;
- my $formatted_entry = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
- return ".(x $index_name\n" . protect_spaces($entry) . "\n.)x\n";
-}
-
-# process definition commands line @deffn for example
-sub t2h_roff_def_line($$$$$)
-{
- my $category = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- my $index_label = shift;
- $index_label = '' if (!defined($index_label));
- $name = '' if (!defined($name) or ($name =~ /^\s*$/));
- $type = '' if (!defined($type) or $type =~ /^\s*$/);
- if (!defined($arguments) or $arguments =~ /^\s*$/)
- {
- $arguments = '';
- }
- else
- {
- $arguments = '\fI' . protect_spaces($arguments) . '\fR';
- }
- my $type_name = ' ';
- $type_name = " $type" if ($type ne '');
-
- $type_name .= '\fB' . protect_spaces($name) . '\fR' if ($name ne '');
- $type_name .= $arguments . "\n";
- return '\fI' . protect_spaces($category) . ':\fR' . $type_name .
$index_label;
-}
-
-# a cartouche
-sub t2h_roff_cartouche($$)
-{
- my $text = shift;
- return $text;
-}
-
-sub t2h_roff_sp($$)
-{
- my $number = shift;
- my $preformatted = shift;
- return "\n.sp $number\n";
-}
-
-# format a whole index
-#
-# argument:
-# index text
-# index name
-sub t2h_roff_print_index($$)
-{
- my $text = shift;
- my $name = shift;
- return ".xp $name\n";
-}
-
-# format an index summary. This is a list of letters linking to the letter
-# entries.
-#
-# arguments:
-# array reference containing the formatted alphabetical letters
-# array reference containing the formatted non lphabetical letters
-sub t2h_roff_index_summary($$)
-{
- my $alpha = shift;
- my $nonalpha = shift;
- my $join = '';
- my $nonalpha_text = '';
- my $alpha_text = '';
- return '';
-}
-
-# FIXME the following construct leads to something wrong ?
-# something @c a comment
-#
-# other thing
-sub t2h_roff_empty_line($)
-{
- my $text = shift;
- return '';
-}
-
-sub t2h_roff_listoffloats_entry($$$$)
-{
- my $style_texi = shift;
- my $float = shift;
- my $float_style = shift;
- my $caption = shift;
- my $href = shift;
- chomp ($caption);
-
- return '.ip ' . protect_spaces($float_style) . "\n" . $caption . "\n";
-}
-
-sub t2h_roff_listoffloats($$$)
-{
- my $style_texi = shift;
- my $style = shift;
- my $float_entries = shift;
-
- my $result = ".(l L F\n.ba +5\n";
- foreach my $float_entry (@$float_entries)
- {
- $result .= $float_entry;
- }
- return $result . ".ba -5\n.)l\n";
-}
-
-sub t2h_roff_float($$$$$)
-{
- my $text = shift;
- my $float = shift;
- my $caption = shift;
- my $shortcaption = shift;
-
- my $caption_text = '';
-
- if (defined($float->{'caption_texi'}))
- {
- $caption_text = $caption;
- }
- elsif (defined($float->{'shortcaption_texi'}))
- {
- $caption_text = $shortcaption;
- }
- elsif (defined($caption))
- {
- $caption_text = $caption;
- }
- chomp ($caption_text);
- return ".(b L F\n" . $text . $caption_text . "\n.b)\n";
-}
-
-1;
Index: texi2html/examples/utf8.init
===================================================================
RCS file: texi2html/examples/utf8.init
diff -N texi2html/examples/utf8.init
--- texi2html/examples/utf8.init 15 Jul 2010 12:27:00 -0000 1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,52 +0,0 @@
-# -*-perl-*-
-#+##############################################################################
-#
-# utf8.init: convert accented letters to utf8
-#
-# This style doesn't work when outputting info.
-#
-# Copyright (C) 2004, 2006 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-set_default('USE_ISO', 0);
-set_from_init_file('ENCODING_NAME', 'utf-8');
-
-use Encode;
-use Unicode::Normalize;
-
-foreach my $key (keys(%unicode_accents), 'dotless')
-{
- $style_map{$key}->{'function'} = \&t2h_utf8_accent;
- $style_map_texi{$key}->{'function'} = \&t2h_utf8_accent;
- $style_map_pre{$key}->{'function'} = \&t2h_utf8_accent;
-}
-
-foreach my $key (%things_map)
-{
- if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
- {
- $things_map{$key} = chr(hex($unicode_map{$key}));
- $texi_map{$key} = chr(hex($unicode_map{$key}));
- $sorting_things_map{$key} = chr(hex($unicode_map{$key}));
- $pre_map{$key} = chr(hex($unicode_map{$key}));
- }
-}
-
-$normal_text = \&t2h_utf8_normal_text;
-
-1;
Index: texi2html/examples/xhtml.init
===================================================================
RCS file: texi2html/examples/xhtml.init
diff -N texi2html/examples/xhtml.init
--- texi2html/examples/xhtml.init 15 Jul 2010 12:27:00 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,218 +0,0 @@
-# -*-perl-*-
-#+##############################################################################
-#
-# xhtml.init: convert to well-formed xhtml transitional
-# !!!!!!! This is very out of date!!!!
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-# FIXME this is out of date. There are still the T2H_ prefixes!
-
-# APA: Add SystemLiteral to identify the canonical DTD.
-# [Definition:] The SystemLiteral is called the entity's system
-# identifier. It is a URI, which may be used to retrieve the entity.
-# See http://www.xml.com/axml/target.html#NT-ExternalID
-set_default('DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Transitional//EN" "http://www.w3.org/TR/xhtml1/xhtml1-transitional.dtd";>');
-
-set_default('FRAMESET_DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0
Frameset//EN" "http://www.w3.org/TR/xhtml1/xhtml1-frameset.dtd";>');
-
-# -iso
-# if set, ISO8859 characters are used for special symbols (like copyright, etc)
-# FIXME certainly obsoleted by t2h_default_set_iso_symbols which should
-# certainly ba called indirectly through html_default_load
-set_default('USE_ISO', 1);
-
-# horizontal rules
-$SMALL_RULE = '<hr size="1"/>';
-$DEFAULT_RULE = '<hr/>';
-$MIDDLE_RULE = '<hr size="2"/>';
-$BIG_RULE = '<hr size="6"/>';
-
-# this is added inside <head></head> after <title> and some <meta name>
-# stuff, it can be used for eg. <style>, <script>, <meta> etc. tags.
-$EXTRA_HEAD = '';
-
-$print_page_head = \&T2H_XHTML_print_page_head;
-$print_page_foot = \&T2H_XHTML_print_page_foot;
-$print_frame = \&T2H_XHTML_print_frame;
-$button_icon_img = \&T2H_XHTML_button_icon_img;
-
-#FIXME update once it is more stabilized in texi2html.init
-sub T2H_XHTML_print_page_head
-{
- my $fh = shift;
- my $longtitle = "$Texi2HTML::THISDOC{'title_no_texi'}";
- $longtitle .= ": $Texi2HTML::NO_TEXI{'This'}" if exists
$T2H_NO_TEXI{'This'};
- my $doctype = get_conf('doctype');
- my $bodytext = get_conf('BODYTEXT');
- print $fh <<EOT;
-<?xml version="1.0" encoding="iso-8859-1"?>
-$doctype
-<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="$T2H_LANG"
lang="$T2H_LANG">
-$T2H_THISDOC{'copying'}<!-- Created on $Texi2HTML::THISDOC{today} by
$Texi2HTML::THISDOC{program} -->
-<!--
-$Texi2HTML::THISDOC{program_authors}
--->
-<head>
-<title>$longtitle</title>
-
-<meta name="description" content="$longtitle"/>
-<meta name="keywords" content="$longtitle"/>
-<meta name="resource-type" content="document"/>
-<meta name="distribution" content="global"/>
-<meta name="Generator" content="$T2H_THISDOC{program}"/>
-$EXTRA_HEAD
-</head>
-
-<body $bodytext>
-$AFTER_BODY_OPEN
-EOT
-}
-
-# <span> instead of <font>
-sub T2H_XHTML_print_page_foot
-{
- my $fh = shift;
- print $fh <<EOT;
-<p>
- <span style="font-size: smaller">
- This document was generated $ADDRESS
- using <a
href="$T2H_THISDOC{program_homepage}"><i>$Texi2HTML::THISDOC{program}</i></a>.
- </span>
- <br/>
-$PRE_BODY_CLOSE
-</p>
-</body>
-</html>
-EOT
-}
-
-sub T2H_XHTML_print_frame
-{
- my $fh = shift;
- my $toc_file = shift;
- my $main_file = shift;
- my $doctype = get_conf('FRAMESET_DOCTYPE');
- print $fh <<EOT;
-$doctype
-<html>
-<head><title>$Texi2HTML::THISDOC{title}</title></head>
-<frameset cols="140,*">
- <frame name="toc" src="$toc_file"/>
- <frame name="main" src="$main_file"/>
-</frameset>
-</html>
-EOT
-}
-
-# / in <img>
-sub T2H_XHTML_button_icon_img
-{
- my $button = shift;
- my $icon = shift;
- my $name = shift;
- return '' if (!defined($icon));
- if (defined($name) && $name)
- {
- $name = ": $name";
- }
- else
- {
- $name = '';
- }
- $button = "" if (!defined ($button));
- return qq{<img src="$icon" border="0" alt="$button$name" align="middle"/>};
-}
-
-$simple_map{'*'} = '<br/>';
-
-# formatting functions
-
-$def_line = \&t2h_xhtml_def_line;
-$index_summary = \&t2h_xhtml_index_summary;
-$image = \&t2h_xhtml_image;
-
-# need / in <img>
-sub t2h_xhtml_image($$$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- return "[ $base ]" if ($preformatted);
- return "<img src=\"$file\" alt=\"$base\"/>";
-}
-
-# process definition commands line @deffn for example
-# <u> replaced by <span>
-sub t2h_xhtml_def_line($$$$$)
-{
- my $category = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- my $index_label = shift;
- $index_label = '' if (!defined($index_label));
- $name = '' if (!defined($name) or ($name =~ /^\s*$/));
- $type = '' if (!defined($type) or $type =~ /^\s*$/);
- if (!defined($arguments) or $arguments =~ /^\s*$/)
- {
- $arguments = '';
- }
- else
- {
- $arguments = '<i>' . $arguments . '</i>';
- }
- my $type_name = '';
- $type_name = " $type" if ($type ne '');
- $type_name .= ' <b>' . $name . '</b>' if ($name ne '');
- $type_name .= $arguments . "\n";
- if (! get_conf('DEF_TABLE'))
- {
- return '<dt>'. '<span style="text-decoration: underline">' . $category
. ':</span>' . $type_name . $index_label . "</dt>\n";
- }
- else
- {
-
- return "<tr>\n<td align=\"left\">" . $type_name .
- "</td>\n<td align=\"right\">" . $category . $index_label . "</td>\n" .
"</tr>\n";
- }
-}
-
-# There is a br which needs /
-sub t2h_xhtml_index_summary($$)
-{
- my $alpha = shift;
- my $nonalpha = shift;
- my $join = '';
- my $nonalpha_text = '';
- my $alpha_text = '';
- $join = " \n<br/>\n" if (@$nonalpha and @$alpha);
- if (@$nonalpha)
- {
- $nonalpha_text = join("\n \n", @$nonalpha) . "\n";
- }
- if (@$alpha)
- {
- $alpha_text = join("\n \n", @$alpha) . "\n \n";
- }
- #I18n
- return "<table><tr><th valign=\"top\">Jump to: </th><td>" .
- $nonalpha_text . $join . $alpha_text . '</td></tr></table>';
-}
Index: texi2html/formats/docbook.init
===================================================================
RCS file: texi2html/formats/docbook.init
diff -N texi2html/formats/docbook.init
--- texi2html/formats/docbook.init 11 Aug 2010 12:46:07 -0000 1.38
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,1573 +0,0 @@
-#+##############################################################################
-#
-# docbook.init: convert to docbook
-#
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-
-# regarding sections and nodes, in docbook we don't care at all about the
-# splitting done in the main program. When there is a node, it is recorded as
-# being pending. When there is a section it is opened, and closed when
-# there is the next section or end of file.
-
-use strict;
-
-my %docbook_complex_format;
-my $kept_footnote_function;
-my $docbook_in_footnote;
-my %docbook_sections;
-my %def_format_docbook;
-my %def_argument_types_docbook;
-
-my $docbook_pending_node_id;
-my $docbook_current_section;
-my @docbook_multitable_stack = ();
-my @docbook_table_stack = ();
-my @docbook_special_quotation;
-
-
-sub docbook_default_load(;$)
-{
-my $from_command_line = shift;
-
-t2h_default_set_variables_xml();
-set_default('DOCTYPE', '<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML
V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"; [
- <!ENTITY tex "TeX">
- <!ENTITY latex "LaTeX">
-]>');
address@hidden = ('docbook');
address@hidden = ('eps', 'gif', 'jpg', 'jpeg', 'pdf', 'png', 'svg', 'txt');
-set_default('INLINE_INSERTCOPYING', 1);
-# this should lead to end_section being only called at the end of sectioning
-set_default('USE_NODES', 0);
-set_default('USE_SECTIONS', 1);
-
-set_default('SHOW_MENU', 0);
-set_default('SHOW_TITLE', 0);
-set_default('HEADERS', 0);
-set_default('SPLIT', '');
-# certainly irrelevant
-set_default('SIMPLE_MENU', 0);
-
-t2h_default_push_handler(\&docbook_initialize_variables, address@hidden);
-
-%style_map = ();
-t2h_default_copy_style_map (\%default_style_map, \%style_map);
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
-{
- $style_map{$accent_command} = { 'function' => \&xml_default_accent };
-}
-
-delete $style_map{'sc'}->{'inline_attribute'};
-# FIXME there is a code element in v4.3
-$style_map{'code'}->{'inline_attribute'} = 'literal';
-$style_map{'strong'}->{'inline_attribute'} = 'emphasis role="bold"';
-$style_map{'kbd'}->{'inline_attribute'} = 'userinput';
-$style_map{'w'}->{'end'} = '<!-- /@w -->';
-$style_map{'='}->{'function'} = \&docbook_macron;
-$style_map{'b'}->{'inline_attribute'} = 'emphasis role="bold"';
-$style_map{'cite'}->{'inline_attribute'} = 'citetitle';
-$style_map{'command'}->{'inline_attribute'} = 'command';
-$style_map{'dfn'}->{'inline_attribute'} = 'firstterm';
-$style_map{'emph'}->{'inline_attribute'} = 'emphasis';
-$style_map{'env'}->{'inline_attribute'} = 'envar';
-$style_map{'file'}->{'inline_attribute'} = 'filename';
-$style_map{'i'}->{'inline_attribute'} = 'wordasword';
-$style_map{'key'}->{'inline_attribute'} = 'keycap';
-delete $style_map{'key'}->{'begin'};
-delete $style_map{'key'}->{'end'};
-$style_map{'option'}->{'inline_attribute'} = 'option';
-$style_map{'t'}->{'inline_attribute'} = 'literal';
-delete $style_map{'sansserif'}->{'inline_attribute'};
-delete $style_map{'r'}->{'inline_attribute'};
-$style_map{'indicateurl'}->{'inline_attribute'} = 'wordasword';
-delete $style_map{'indicateurl'}->{'begin'};
-delete $style_map{'indicateurl'}->{'end'};
-$style_map{'var'}->{'inline_attribute'} = 'replaceable';
-delete $style_map{'verb'}->{'inline_attribute'};
-$style_map{'email'}->{'function'} = \&docbook_email;
-$style_map{'math'}->{'function'} = \&docbook_math;
-$style_map{'uref'}->{'function'} = \&docbook_uref;
-$style_map{'url'}->{'function'} = \&docbook_uref;
-$style_map{'titlefont'}->{'function'} = \&docbook_titlefont;
-#$style_map{'samp'}->{'function'} = \&docbook_samp;
-#delete $style_map{'samp'}->{'inline_attribute'};
-$style_map{'samp'}->{'inline_attribute'} = 'literal';
-$style_map{'samp'}->{'begin'} = '‘';
-$style_map{'samp'}->{'end'} = '’';
-
-$kept_footnote_function = $style_map{'footnote'}->{'function'};
-$style_map{'footnote'}->{'function'} = \&docbook_footnote;
-
-foreach my $style (keys(%style_map))
-{
- delete ($style_map{$style}->{'quote'});
-}
-
-#use Data::Dumper;
-%style_map_pre = ();
-t2h_default_copy_style_map (\%style_map, \%style_map_pre);
-
-$style_map_pre{'r'}->{'inline_attribute'} = 'lineannotation';
-
-$colon_command_punctuation_characters{'.'} = '.';
-$colon_command_punctuation_characters{':'} = ':';
-$colon_command_punctuation_characters{'?'} = '?';
-$colon_command_punctuation_characters{'!'} = '!';
-
-$stop_paragraph_command{'titlefont'} = 0;
-
-# FIXME
-#$no_paragraph_commands{'anchor'} = 0;
-
-# FIXME
-delete $special_accents{'ringaccent'};
-$special_accents{'ogonek'} = 'aeiuAEIU';
-
-%simple_map = %default_simple_map;
-%simple_map_pre = %simple_map;
-
-# FIXME right? ł Ł
-$things_map{'l'} = '/l';
-$things_map{'L'} = '/L';
-$things_map{'TeX'} = '&tex;';
-$things_map{'LaTeX'} = '&latex;';
-$things_map{'enddots'} = '….';
-$things_map{'minus'} = '−';
-# FIXME ∗
-$things_map{'point'} = '-!-';
-# FIXME ≡
-$things_map{'equiv'} = '==';
-# FIXME no ‹ nor ›
-$things_map{'guilsinglright'} = '>';
-$things_map{'guilsinglleft'} = '<';
-# The following is unneeded because normal_text is redefined.
-# FIXME it should certainly be better to leave those substitutions,
-# or even hardcodes them in normal_text.
-# t2h_remove_text_substitutions("'", 1, 0, 0, 1);
-# t2h_remove_text_substitutions('`', 1, 0, 0, 1);
-
-$things_map{'quotedblbase'} = '„';
-$things_map{'quotesinglbase'} = '‚';
-
-%pre_map = %things_map;
-
-#delete $inter_item_commands{'cindex'};
-
-#$no_paragraph_commands{'cindex'} = 0;
-$no_paragraph_commands{'float'} = 0;
-
-%docbook_complex_format = (
- 'example' => 'screen',
- 'smallexample' => 'screen',
- 'display' => 'literallayout',
- 'smalldisplay' => 'literallayout',
- 'lisp' => 'programlisting',
- 'smalllisp' => 'programlisting',
- 'format' => 'abstract',
- 'smallformat' => 'screen'
-);
-
-%docbook_sections = (
- 'top' => 'chapter',
- 'part' => 'part',
- 'chapter' => 'chapter',
- 'unnumbered' => 'chapter',
- 'centerchap' => 'chapter',
- 'appendix' => 'appendix',
- 'majorheading' => 'other',
- 'chapheading' => 'other',
- 'heading' => 'sect1',
- 'subheading' => 'sect2',
- 'subsubheading' => 'sect3',
- 2 => 'sect1',
- 3 => 'sect2',
- 4 => 'sect3'
-);
-
-%def_format_docbook = (
- 'deffn' => [ ['function', 'name'] ],
- 'defvr' => [ ['varname', 'name'] ],
- 'deftypefn' => [ [ 'returnvalue', 'type' ], ['function', 'name'] ],
- 'deftypeop' => [ ['returnvalue', 'type'], ['methodname', 'name'] ],
- 'deftypevr' => [ ['returnvalue', 'type'], ['varname', 'name'] ],
- 'defcv' => [ ['classname', 'class'], ['property', 'name'] ],
- 'deftypecv' => [ ['returnvalue', 'type'], ['property', 'name'] ],
- 'defop' => [ ['classname', 'class'], ['methodname', 'name'] ],
- 'deftp' => [ ['structname', 'name'] ]
-);
-
-%def_argument_types_docbook = (
- 'param' => 'replaceable',
- 'paramtype' => 'type',
- 'delimiter' => ''
-);
-
address@hidden = ('note', 'caution', 'important', 'tip', 'warning');
-
-$region_formats_kept{'copying'} = 1;
-
-%format_map = (
- 'group' => '',
- 'raggedright' => '',
- 'copying' => 'copying',
- );
-
-$print_Top = \&docbook_print_Top;
-$print_Top_footer = \&docbook_print_Top_footer;
-$print_page_head = \&docbook_print_page_head;
-$print_foot_navigation = \&docbook_noop;
-$contents = \&docbook_noop;
-$shortcontents = \&docbook_noop;
-$about_body = \&docbook_noop;
-$print_page_foot = \&docbook_print_page_foot;
-$end_section = \&docbook_end_section;
-$one_section = \&docbook_one_section;
-
-$acronym_like = \&docbook_acronym_like;
-$anchor_label = \&docbook_anchor_label;
-$begin_format_texi = \&docbook_begin_format_texi;
-$cartouche = \&docbook_cartouche;
-$cell = \&docbook_cell;
-$complex_format = \&docbook_complex_format;
-$def = \&docbook_def;
-$def_line = \&docbook_def_line;
-$def_item = \&docbook_def_item;
-$element_label = \&docbook_element_label;
-$external_ref = \&docbook_external_ref;
-$float = \&docbook_float;
-$foot_line_and_ref = \&docbook_foot_line_and_ref;
-$format = \&docbook_format;
-$format_list_item_texi = \&docbook_format_list_item_texi;
-$heading = \&docbook_heading;
-$image = \&docbook_image;
-$image_files = \&docbook_image_files;
-$index_entry_command = \&docbook_index_entry_command;
-$index_entry_label = \&docbook_index_entry_label;
-$index_summary = \&docbook_index_summary;
-$internal_ref = \&docbook_internal_ref;
-$insertcopying = \&docbook_insertcopying;
-$list_item = \&docbook_list_item;
-$misc_element_label = \&docbook_noop;
-$normal_text = \&docbook_normal_text;
-$paragraph = \&docbook_paragraph;
-$preformatted = \&docbook_preformatted;
-$printindex = \&docbook_printindex;
-$protect_text = \&xml_default_protect_text;
-$quotation = \&docbook_quotation;
-$quotation_prepend_text = \&docbook_quotation_prepend_text;
-$listoffloats = \&docbook_noop;
-$raw = \&docbook_raw;
-$row = \&docbook_row;
-$sp = \&docbook_sp;
-$style = \&docbook_style;
-$table_item = \&docbook_table_item;
-$table_line = \&docbook_table_line;
-$table_list = \&docbook_table_list;
-$misc_command_line = \&docbook_misc_commands;
-
-
-}
-
-sub docbook_footnote
-{
- $docbook_in_footnote = 1;
- my $result = &$kept_footnote_function(@_);
- $docbook_in_footnote = 0;
- return $result;
-}
-
-sub docbook_macron($$)
-{
- my $accent = shift;
- my $args = shift;
- return $args->[0] . "¯";
-}
-
-sub docbook_samp($$)
-{
- shift;
- my $args = shift;
- return "‘<literal>$args->[0]</literal>’";
-}
-
-sub docbook_email($$)
-{
- my $command = shift;
- my $args = shift;
- my $mail = shift @$args;
- my $text = shift @$args;
- $mail = main::normalise_space($mail);
- if (defined($text) and $text =~ /\S/)
- {
- # FIXME normalise_space would be more legible.
- #return docbook_add_id('ulink').'
url="mailto:'.$mail.'">'.main::normalise_space($text).'</ulink>';
- return docbook_add_id('ulink').'
url="mailto:'.$mail.'">'.$text.'</ulink>';
- }
- return docbook_add_id('email').">$mail</email>";
-}
-
-sub docbook_uref($$)
-{
- shift;
- my $args = shift;
- my $url = shift @$args;
- my $text = shift @$args;
- my $replacement = shift @$args;
- $url = main::normalise_space($url);
- $text = '' if (!defined($text));
- $replacement = '' if (!defined($replacement));
- $replacement = $text if ($replacement eq '');
- $replacement = $url if ($replacement eq '');
- $replacement = main::normalise_space($replacement);
-
- return docbook_add_id('ulink')." url=\"$url\">$replacement</ulink>";
-}
-
-# FIXME
-sub docbook_titlefont($$)
-{
- shift;
- my $args = shift;
- return "$args->[0]";
-}
-
-# FIXME there ought to be something better... Like use tex4ht mathml
-# output or something like that
-sub docbook_math($$)
-{
- shift;
- my $args = shift;
- my $text = shift @$args;
- return $text;
-}
-
-
-sub docbook_print_page_head($)
-{
- my $fh = shift;
- my $language = get_conf('documentlanguage');
- my $doctype = get_conf('DOCTYPE');
- my $extension = get_conf('EXTENSION');
- print $fh <<EOT;
-<?xml version="1.0"?>
-$doctype
-<book id="$Texi2HTML::THISDOC{'file_base_name'}.$extension" lang="$language">
-EOT
-}
-
-sub docbook_print_page_foot($)
-{
- my $fh = shift;
- print $fh "". docbook_close_section();
- print $fh <<EOT;
-</book>
-EOT
-}
-
-sub docbook_print_Top($$$)
-{
- my $fh = shift;
- my $has_top_heading = shift;
- my $element = shift;
- main::print_lines($fh, $Texi2HTML::THIS_SECTION);
-}
-
-sub docbook_element_tag($)
-{
- my $element = shift;
-#print STDERR "$element->{'texi'}, $element->{'tag_level'},
$element->{'level'}\n";
- return $docbook_sections{$element->{'tag_level'}} if
(exists($docbook_sections{$element->{'tag_level'}}));
- return $docbook_sections{$element->{'level'}} if
(exists($docbook_sections{$element->{'level'}}));
-}
-
-sub docbook_node_id($)
-{
- my $node_texi = shift;
- my $node = main::substitute_line($node_texi, 'docbook node id',
{'code_style' => 1, 'remove_texi' => 1});
- $node =~ s/[\s\"]/-/g;
- return &$protect_text($node);
-}
-
-sub docbook_initialize_variables()
-{
- $docbook_pending_node_id = undef;
- $docbook_current_section = undef;
- @docbook_multitable_stack = ();
- @docbook_table_stack = ();
-}
-
-sub docbook_add_id($)
-{
- my $element = shift;
- my $result = "<$element";
- if (defined($docbook_pending_node_id) and (!$docbook_in_footnote or
$element eq 'footnote'))
- {
- $result .= " id=\"$docbook_pending_node_id\"";
- $docbook_pending_node_id = undef;
- }
- return $result;
-}
-
-sub docbook_heading($$$$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
-
- if (defined($command) and $command =~ /heading/)
- {
- my $text = '';
- if (defined($line))
- {
- $text = $line;
- # this isn't done in main program in that case...
- chomp ($text);
- $text =~ s/^\s*//;
- }
- return docbook_add_id('bridgehead')."
renderas=\"$docbook_sections{$command}\">$text</bridgehead>\n";
- }
-
- my $result = '';
-
-# FIXME verify xreflabel
- if ($command ne 'node')
- {
- # close previous section
- $result .= docbook_close_section();
- my $title = $element->{'text_nonumber'};
- my $label = '';
- my $xreflabel = '';
- if ($element->{'number'})
- {
- my $label_nr = $element->{'number'};
- #$label_nr =~ s/\.$//;
- $label = $label_nr;
- }
- else
- {
- my $xreftitle = $title;
- $xreflabel = " xreflabel=\"$xreftitle\"";
- }
- $result .= docbook_add_id(docbook_element_tag($element) . "
label=\"${label}\"${xreflabel}");
- $result .= ">\n<title>$title</title>\n";
- $docbook_current_section = $element;
- }
- return $result;
-}
-
-sub docbook_element_label($$$$)
-{
- my $id = shift;
- my $element = shift;
- my $command = shift;
- my $line = shift;
-
- if ($command eq 'node')
- {
- $docbook_pending_node_id = docbook_node_id($element->{'texi'});
- }
- return '';
-}
-
-sub docbook_paragraph($$$$$$$$$$$$)
-{
- my $text = shift;
- my $align = shift;
- my $indent = shift;
- my $paragraph_command = shift;
- my $paragraph_command_formatted = shift;
- my $paragraph_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
- if (defined($paragraph_number) and defined($$paragraph_number))
- {
- $$paragraph_number++;
- }
-
- # no para in multitables, caption and shortcaptions.
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- return $text if ($top_stack eq 'multitable' or $top_stack eq
'shortcaption' or $top_stack eq 'caption' or $top_stack eq
'documentdescription');
-
- if ($text =~ /\S/)
- {
- #return docbook_add_id('para').">$text</para>";
- return "<para>$text</para>";
- }
- return $text;
-}
-
-
-sub docbook_def_line($$$$$$$$$$$$$$$)
-{
- my $category_prepared = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- my $index_label = shift;
- my $arguments_array = shift;
- my $arguments_type_array = shift;
- my $unformatted_arguments_array = shift;
- my $command = shift;
- my $class_name = shift;
- my $category = shift;
- my $class = shift;
- my $style = shift;
- my $original_command = shift;
-
- my %unformatted_arguments = ();
-
- my @unformatted_args = @$unformatted_arguments_array;
- foreach my $type (@$arguments_type_array)
- {
- my $unformatted_arg = shift @unformatted_args;
- $unformatted_arguments{$type} = $unformatted_arg;
- }
- # FIXME unformatted!
- my $result = "<synopsis
role=\"$unformatted_arguments{'category'}\"><indexterm role=\""
-
.$main::index_prefix_to_name{$style}."\"><primary>$class_name</primary></indexterm>";
-
- my %arguments = ( 'prepared_category' => $category_prepared,
- 'category' => $category,
- 'name' => $name,
- 'type' => $type,
- 'class' => $class
- );
- foreach my $type (keys(%arguments))
- {
- $arguments{$type} = '' if (!defined($arguments{$type}));
- }
-
- foreach my $mandatory_arg (@{$def_format_docbook{$command}})
- {
- my $elem = $mandatory_arg->[0];
- #if ($elem eq 'returnvalue' and
$unformatted_arguments{$mandatory_arg->[1]} =~ /address@hidden/)
- if ($elem eq 'returnvalue' and
$unformatted_arguments{$mandatory_arg->[1]} =~ /address@hidden/)
- {
- # FIXME unformatted
- my $arg_without_at_command =
$unformatted_arguments{$mandatory_arg->[1]};
- #$arg_without_at_command =~ s/address@hidden//;
- #$arg_without_at_command =~ s/\}\s*$//;
- while ($arg_without_at_command =~ /address@hidden([^\{\}]*)\}/)
- {
- $arg_without_at_command =~ s/address@hidden([^\{\}]*)\}/$1/;
- }
- $result .= "<$elem>$arg_without_at_command</$elem>";
- }
- else
- {
- $result .= "<$elem>$arguments{$mandatory_arg->[1]}</$elem>";
- }
- }
-
- my @types = @$arguments_type_array;
- @unformatted_args = @$unformatted_arguments_array;
- foreach my $arg (@$arguments_array)
- {
- my $type = shift @types;
- my $unformatted = shift @unformatted_args;
- if (exists ($def_argument_types_docbook{$type}))
- {
- if ($def_argument_types_docbook{$type} and
- ($type eq 'paramtype' or ($unformatted !~ /address@hidden/)))
- {
- $result .=
"<$def_argument_types_docbook{$type}>$arg</$def_argument_types_docbook{$type}>";
- }
- else
- {
- $result .= $arg;
- }
- }
- }
-
- $result .= "</synopsis>\n";
- return $result;
-}
-
-# FIXME
-# @deffn
-# @c comment
-# @end deffn
-# leads to the creation of a <definitionitem> with a comment within,
-# while there should be no definitionitem
-sub docbook_def_item($)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
-
- if ($text =~ /\S/)
- {
- return '<blockquote>' . $text . '</blockquote>' unless
$only_inter_item_commands;
- return $text;
- }
- return '';
-}
-
-sub docbook_def($)
-{
- my $text = shift;
- return docbook_add_id('informalfigure').'>'.$text.'</informalfigure>';
-}
-
-sub docbook_preformatted($$$$$$$$$$$$)
-{
- my $text = shift;
- my $pre_style = shift;
- my $class = shift;
- my $leading_command = shift;
- my $leading_command_formatted = shift;
- my $preformatted_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
- return $text;
-}
-
-sub docbook_misc_commands($$$$$)
-{
- my $macro = shift;
- my $line = shift;
- my $args = shift;
- my $stack = shift;
- my $state = shift;
-#print STDERR "$macro $line";
-#print STDERR "ARGS @$args\n" if defined ($args);
- #my $result_text = undef;
- my $result_text = undef;
- if ($macro eq 'c' or $macro eq 'comment' and scalar(@$args))
- {
- my $comment_line = $args->[0];
- chomp ($comment_line);
- # makeinfo remove all the leading spaces
- $comment_line =~ s/^\s//;
- $result_text = &$comment ($comment_line);
- }
- elsif ($macro eq 'settitle')
- {
- # FIXME to be formatted? Also maybe in line_command. And in html, it
- # is handled by heading _text
- my $arg = $args->[0];
- $arg =~ s/^\s*//;
- chomp($arg);
- $result_text = "<title>$arg</title>\n";
- }
- return ($macro, $line, $result_text);
-}
-
-sub docbook_foot_line_and_ref($$$$$$$)
-{
- my $number_in_doc = shift;
- my $number_in_page = shift;
- my $footnote_id = shift;
- my $place_id = shift;
- my $document_file = shift;
- my $footnote_file = shift;
- my $lines = shift;
- my $state = shift;
-
- my $result = docbook_add_id('footnote').'>';
- foreach my $line (@$lines)
- {
- $result .= $line;
- }
- return ([], $result . '</footnote>');
-}
-
-sub docbook_any_ref($$$)
-{
- my $type = shift;
- my $args = shift;
- my $unformatted_args = shift;
-
- # FIXME?
- if ($type eq 'inforef')
- {
- my $node_file = "($args->[2])$args->[0]";
- if ($args->[1] ne '')
- {
- return "*note $args->[1]: $node_file";
- }
- else
- {
- return "*note ${node_file}::";
- }
- }
- else
- {
- if (($args->[3] ne '') or ($args->[4] ne ''))
- {
- return '' if ($args->[4] eq '');
- my $section_name = $args->[2];
- $section_name = $args->[0] if ($section_name eq '');
- if ($type eq 'ref')
- {
- return gdt('section address@hidden'@asis{}\' in
@cite{{book}}', { 'section_name' => $section_name, 'book' => $args->[4]
},{'duplicate'=>1});
- }
- elsif ($type eq 'xref')
- {
- return gdt('See section address@hidden'@asis{}\' in
@cite{{book}}', { 'section_name' => $section_name, 'book' => $args->[4]
},{'duplicate'=>1});
- }
- elsif ($type eq 'pxref')
- {
- return gdt('see section address@hidden'@asis{}\' in
@cite{{book}}', { 'section_name' => $section_name, 'book' => $args->[4]
},{'duplicate'=>1});
- }
- }
- my $link = docbook_node_id($unformatted_args->[0]);
- my $title = $args->[2];
- $title = $args->[1] if ($title eq '');
- if ($title eq '')
- {
- if ($type eq 'ref')
- {
- return gdt('{ref}', {'ref' => docbook_add_id('xref')."
linkend=\"$link\"></xref>"});
- }
- elsif ($type eq 'pxref')
- {
- return gdt('see {ref}', {'ref' => docbook_add_id('xref')."
linkend=\"$link\"></xref>"});
- }
- elsif ($type eq 'xref')
- {
- return gdt('See {ref}', {'ref' => docbook_add_id('xref')."
linkend=\"$link\"></xref>"});
- }
- }
- else
- {
- if ($type eq 'ref')
- {
- return gdt('{title_ref}', {'title_ref' =>
docbook_add_id('link')." linkend=\"$link\">$title</link>"});
- }
- elsif ($type eq 'pxref')
- {
- return gdt('see {title_ref}', {'title_ref' =>
docbook_add_id('link')." linkend=\"$link\">$title</link>"},{'duplicate'=>1});
- }
- elsif ($type eq 'xref')
- {
- return gdt('See {title_ref}', {'title_ref' =>
docbook_add_id('link')." linkend=\"$link\">$title</link>"},{'duplicate'=>1});
- }
- }
- }
-}
-
-sub docbook_external_ref($$$$$$$$$)
-{
- my $type = shift;
- my $section = shift;
- my $book = shift;
- my $file = shift;
- my $href = shift;
- my $cross_ref = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
- my $node = shift;
-
- return docbook_any_ref ($type, $formatted_args, $args_texi);
-}
-
-sub docbook_internal_ref($$$$$)
-{
- my $type = shift;
- my $href = shift;
- my $short_name = shift;
- my $name = shift;
- my $is_section = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
-
- return docbook_any_ref ($type, $formatted_args, $args_texi );
-}
-
-sub docbook_index_entry_command($$$$$)
-{
- my $command = shift;
- my $index_name = shift;
- my $label = shift;
- my $entry_texi = shift;
- my $entry_formatted = shift;
-
- return $label if (defined($label) and $label ne '');
- return
docbook_index_entry_label('','','',$main::index_prefix_to_name{$index_name},
'', '', $entry_formatted, {});
-}
-
-sub docbook_index_entry_label($$$$$$$$$)
-{
- my $identifier = shift;
- my $preformatted = shift;
- my $entry = shift;
- my $index_name = shift;
- my $index_command = shift;
- my $texi_entry = shift;
- my $formatted_entry = shift;
- my $in_region_not_in_output = shift;
- my $index_entry = shift;
-
- return "<indexterm
role=\"${index_name}\"><primary>${formatted_entry}</primary></indexterm>";
-}
-
-sub docbook_close_section()
-{
- my $element = $docbook_current_section;
-
- if (!defined($element))
- {
- return '';
- }
-
- my $result = '';
-
- # there is a special case for a @chapter that is a child of @top
- # but should not be considered as is, since it is also toplevel.
- # @part, however may have other toplevel elements as children.
- return '' if ($element->{'child'} and (!$element->{'child'}->{'toplevel'}
or $element->{'tag'} ne 'top'));
- $result .= '</'.docbook_element_tag($element).">\n";
-
- my $current = $element;
- # the second condition is such that top is closed only if it has
- # sub-elements below chapter.
- # the third condition is such that elements with a next element are
- # only closed for the last element, except when the next element is
- # toplevel and below top, such that @top is closed before the first
- # @chapter if there are @section or the like below @top
- while ($current->{'sectionup'} and !($current->{'sectionup'}->{'tag'} eq
'top' and $current->{'toplevel'}) and (!$current->{'childnext'} or
($current->{'childnext'}->{'toplevel'} and $current->{'sectionup'}->{'tag'} eq
'top')))
- {
- $current = $current->{'sectionup'};
- $result .= '</'.docbook_element_tag($current).">\n";
- }
- return $result;
-}
-
-sub docbook_end_section($$$)
-{
- my $fh = shift;
- my $end_foot_navigation = shift;
- my $element = shift;
-}
-
-sub docbook_print_Top_footer($$)
-{
- my $fh = shift;
- my $end_page = shift;
- my $element = shift;
-}
-
-sub docbook_one_section($$)
-{
- my $fh = shift;
- my $element = shift;
- main::print_lines($fh);
- &$print_page_foot($fh);
-}
-
-sub docbook_insertcopying($)
-{
- my $text = shift;
- my $comment = shift;
- my $simple_text = shift;
-
- return $text;
-}
-
-sub docbook_acronym_like($$$$$$)
-{
- my $command = shift;
- my $acronym_texi = shift;
- my $acronym_text = shift;
- my $with_explanation = shift;
- my $explanation_lines = shift;
- my $explanation_text = shift;
- my $explanation_simply_formatted = shift;
-
- $command = 'abbrev' if ($command eq 'abbr');
- my $result = docbook_add_id($command).">$acronym_text</${command}>";
- if ($with_explanation)
- {
- $result .= " ($explanation_text)";
- }
- return $result;
-}
-
-
-sub docbook_image_files($$$$)
-{
- my $base = shift;
- my $extension = shift;
- my $texi_base = shift;
- my $texi_extension = shift;
- my @files = ();
- return @files if (!defined($base) or ($base eq ''));
-# FIXME should look at extension argument? makeinfo doesn't
-# push @files,"$base.$extension" if (defined($extension) and ($extension ne
''));
- foreach my $ext (@IMAGE_EXTENSIONS)
- {
- push @files, ["$base.$ext", "$texi_base.$ext"];
- }
- return @files;
-}
-
-
-sub docbook_image($$$$$$$$$$$$$$$$;$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- my $file_name = shift;
- my $alt = shift;
- my $width = shift;
- my $height = shift;
- my $raw_alt = shift;
- my $extension = shift;
- my $working_dir = shift;
- my $file_path = shift;
- my $in_paragraph = shift;
- my $file_locations = shift;
- my $base_simple_format = shift;
- my $extension_simple_format = shift;
- my $file_name_simple_format = shift;
- my $line_nr = shift;
-
-# if (!defined($file_path) or $file_path eq '' or $file_path =~ /\.txt$/)
-# {
-# if (defined($extension) and $extension ne '')
-# {
-# $file = "$base.$extension";
-# }
-# else
-# {
-# $file = "$base.jpg";
-# $extension = 'jpg';
-# }
-# main::line_warn ("no image file for $base, (using $file)");
-# }
- my $txt_path;
- my @files = ();
- my @extensions = @IMAGE_EXTENSIONS;
- foreach my $file_location (@$file_locations)
- {
- my ($file_located, $path, $file_simple_format) = @$file_location;
- my $extension = shift @extensions;
- if (defined($path))
- {
- if ($extension eq 'txt' and !defined($txt_path))
- {
- $txt_path = $path;
- }
- else
- {
- push @files, [$file_located, uc($extension),
$file_simple_format];
- }
- }
- }
- push @files, ["$base.jpg", 'JPG', "$base_simple_format.jpg" ] unless
(@files);
-
- my $begin = docbook_add_id('inlinemediaobject').'>';
- my $end = '</inlinemediaobject>';
- if ($preformatted or !$in_paragraph)
- {
- $begin = docbook_add_id('informalfigure').'><mediaobject>';
- $end = '</mediaobject></informalfigure>';
- }
- my $result = $begin;
- foreach my $file_spec (@files)
- {
- $result .= "<imageobject><imagedata fileref=\"$file_spec->[2]\"
format=\"$file_spec->[1]\"></imagedata></imageobject>";
- }
- if (defined($txt_path))
- {
- if (open(TXT, "<$txt_path"))
- {
- my $in_encoding = get_conf('IN_ENCODING');
- if (defined($in_encoding) and get_conf('USE_UNICODE'))
- {
- binmode(TXT, ":encoding($in_encoding)");
- }
- $result.="<textobject><literallayout>";
- while (my $img_txt = <TXT>)
- {
- $result .= $img_txt;
- }
- $result .= '</literallayout></textobject>';
- close(TXT);
- }
- else
- {
- main::line_warn (sprintf(__("address@hidden file `%s' unreadable:
%s"), $txt_path, $!), $line_nr);
- }
- }
- else
- {
- main::line_warn (sprintf(__("Cannot find address@hidden file
`%s.txt'"), $base), $line_nr);
- }
-
- return "$result$end";
-}
-
-sub docbook_format_list_item_texi($$$$)
-{
- my $format = shift;
- my $line = shift;
- my $prepended = shift;
- my $command = shift;
-
- my $result_line = undef;
-
- if (defined($command) and $command ne '' and !exists
$special_list_commands{$format}->{$command} and $format ne 'itemize')
- {
- address@hidden
- $line =~ s/^\s*//;
- $line =~ s/\s*$//;
- if (exists ($style_map{$command}))
- {
- $result_line = "address@hidden";
- }
- elsif (exists ($things_map{$command}))
- {
- $result_line = "address@hidden $line\n";
- }
- else
- {
- $result_line = "address@hidden $line\n";
- }
- }
-
- return ($result_line, 0);
-}
-
-
-# row in multitable
-sub docbook_row($$;$$)
-{
- my $text = shift;
- my $macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
-
- my $result = '';
- if ($macro eq 'headitem')
- {
- if ($docbook_multitable_stack[-1] != 0)
- {
- $result .= "<thead>";
- $result = "</tbody>" . $result if ($docbook_multitable_stack[-1]
== 1);
- $docbook_multitable_stack[-1] = 0;
- }
- }
- elsif ($docbook_multitable_stack[-1] != 1)
- {
- $result .= "<tbody>";
- $result = "</thead>" . $result if ($docbook_multitable_stack[-1] ==
0);
- $docbook_multitable_stack[-1] = 1;
- }
- $result .= "<row>$text</row>";
-
- return $result;
-}
-
-# cell in multitable
-sub docbook_cell($$;$$)
-{
- my $text = shift;
- my $row_macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
-
- return "<entry>" . $text . '</entry>';
-}
-
-# if varlistentry_state is > 0 it means that a varlistentry is opened.
-# if varlistentry_state is == 2 it means that we are in a succession
-# of term
-# if varlistentry_state is == 1 it means that we are in the line
-# Having a listitem in a varlistentry is a must, so an empty
-# listitem is added if a varlistentry is closed and varlistentry_state == 2
-#
-# varlistentry acceps only term and listitem, so inter_item_commands
-# are put in the next term, or, if at the end of the table in a last
-# listitem
-sub docbook_table_item($$$$$$)
-{
- my $text = shift;
- my $index_label = shift;
- my $format = shift;
- my $command = shift;
-# my $formatted_command = shift;
- my $style_stack = shift;
-# my $text_formatted = shift;
-# my $text_formatted_leading_spaces = shift;
-# my $text_formatted_trailing_spaces = shift;
- my $item_cmd = shift;
-
-# $formatted_command = '' if (!defined($formatted_command));
-
-# if (defined($text_formatted))
-# {
-# $text_item = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
-# }
-# else
-# {
-# $text_item = $text;
-# }
-
- my $result = '';
- my $prepended = '';
- if (defined($docbook_table_stack[-1]->{'inter_item'}))
- {
- #$formatted_command = $docbook_table_stack[-1]->{'inter_item'} .
$formatted_command;
- $prepended = $docbook_table_stack[-1]->{'inter_item'};
- delete $docbook_table_stack[-1]->{'inter_item'};
- }
- if ($item_cmd eq 'item')
- {
- if ($docbook_table_stack[-1]->{'varlistentry_state'} == 2)
- {
- $result .= "<listitem><para><!-- empty table line
--></para></listitem>";
- }
- if ($docbook_table_stack[-1]->{'varlistentry_state'} >= 1)
- {
- $result .= '</varlistentry>';
- }
- $docbook_table_stack[-1]->{'varlistentry_state'} = 2;
- $result .= '<varlistentry>';
- }
- $result .= '<term>';
- $result .= $prepended . $text ."</term>\n";
- return $result;
-}
-
-sub docbook_table_line($$$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
-#print STDERR
-
- if ($text =~ /\S/)
- {
- if ($before_items)
- {
- return $text;
- }
-
- if ($only_inter_item_commands)
- {
- $docbook_table_stack[-1]->{'inter_item'} = $text;
- return '';
- }
- else
- {
- $docbook_table_stack[-1]->{'varlistentry_state'} = 1;
- return "<listitem>$text</listitem>";
- }
- #return $text;
- }
- else
- {
- return '';
- }
-}
-
-sub docbook_list_item($$$$$$$$$)
-{
- my $text = shift;
- my $format = shift;
- my $command = shift;
- my $formatted_command = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $prepended = shift;
- my $prepended_formatted = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
-#my $prep_t = 'UNDEF'; $prep_t = $prepended if (defined($prepended));
-#$item_nr = 0 if (!defined($item_nr));
-#print STDERR " $item_nr --> $prep_t|${text}!!!!!\n";
- #return $text if ($only_inter_item_commands and $before_items);
- return $text if ($before_items);
- return '<listitem>' . $text . "</listitem>\n";
-}
-
-sub docbook_table_list($$$$$$$$$)
-{
- my $format_command = shift;
- my $text = shift;
- my $command = shift;
- my $formatted_command = shift;
-# enumerate
- my $item_nr = shift;
- my $enumerate_style = shift;
-# itemize
- my $prepended = shift;
- my $prepended_formatted = shift;
-# multitable
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $number = shift;
-
- my $result = "<$format_command>";
- if ($format_command eq 'itemize')
- {
- my $itemfunction;
- #$prepended_formatted =~ s/^\s*// if (defined($prepended_formatted));
- $prepended =~ s/^\s*// if (defined($prepended));
- #if (defined($formatted_command) and $formatted_command ne '')
- if (defined($command) and $command ne '')
- {
- #$itemfunction = $formatted_command;
- $itemfunction = $command;
- #$itemfunction .= " $prepended_formatted" if
(defined($prepended_formatted) and $prepended_formatted ne '');
- $itemfunction .= " $prepended" if (defined($prepended) and
$prepended ne '');
- }
- #elsif (defined($prepended_formatted))
- elsif (defined($prepended))
- {
- #$itemfunction = $prepended_formatted;
- $itemfunction = $prepended;
- }
- my $mark = '';
- $mark = " mark=\"$itemfunction\"" if (defined($itemfunction) and
$itemfunction ne '');
- return docbook_add_id('itemizedlist')."${mark}>$text</itemizedlist>";
- }
- elsif ($format_command eq 'enumerate')
- {
- my $numeration='arabic';
- if (defined($enumerate_style) and $enumerate_style ne '')
- {
- if ($enumerate_style =~ /^[A-Z]/)
- {
- $numeration = 'upperalpha';
- }
- elsif ($enumerate_style =~ /^[a-z]/)
- {
- $numeration = 'loweralpha';
- }
- }
- return docbook_add_id('orderedlist') ."
numeration=\"$numeration\">$text</orderedlist>";
- }
- elsif ($format_command eq 'multitable')
- {
- my $result = docbook_add_id('informaltable').'><tgroup
cols="'.$number.'">';
- my $fractions;
- my $multiply = 1;
- if (defined($columnfractions) and (ref($columnfractions) eq 'ARRAY')
- and scalar(@$columnfractions))
- {
- $fractions = [ @$columnfractions ];
- $multiply = 100;
- }
- elsif (defined($prototype_lengths) and (ref($prototype_lengths) eq
'ARRAY')
- and scalar(@$prototype_lengths))
- {
- $fractions = [ @$prototype_lengths ];
- }
-
- if (defined ($fractions))
- {
- foreach my $fraction (@$fractions)
- {
- $result .= '<colspec
colwidth="'.($fraction*$multiply).'*"></colspec>';
- }
- }
- $text .= "</tbody>" if ($docbook_multitable_stack[-1] == 1);
- $text .= "</thead>" if ($docbook_multitable_stack[-1] == 0);
- pop @docbook_multitable_stack;
- return $result . "$text</tgroup></informaltable>";
- }
- elsif ($format_command =~ /^(v|f)?table$/)
- {
- $result = docbook_add_id('variablelist').'>';
- if (defined($docbook_table_stack[-1]->{'inter_item'}))
- { # there is a para in case there is only a comment, to avoid
- # an empty listitem
- $text .=
"<listitem><para>$docbook_table_stack[-1]->{'inter_item'}</para></listitem>";
- }
- elsif ($docbook_table_stack[-1]->{'varlistentry_state'} == 2)
- {
- $text .= "<listitem><para><!-- empty table line
--></para></listitem>";
- }
- $text .= '</varlistentry>' if
($docbook_table_stack[-1]->{'varlistentry_state'} >= 1);
- pop @docbook_table_stack;
- return $result . "$text</variablelist>\n";
- }
-}
-
-sub docbook_begin_format_texi($$$)
-{
- my $command = shift;
- my $line = shift;
- my $state = shift;
-
- push (@docbook_multitable_stack, -1) if ($command eq 'multitable');
- push (@docbook_table_stack, {'varlistentry_state' => 0}) if ($command =~
/^(v|f)?table/);
- return $line;
-}
-
-# FIXME
-sub docbook_sp($$)
-{
- my $number = shift;
- my $preformatted = shift;
- return "";
-}
-
-sub docbook_index_summary($$)
-{
- my $alpha = shift;
- my $nonalpha = shift;
- return '';
-}
-
-sub docbook_printindex($$)
-{
- my $name = shift;
- my $printindex = shift;
- return docbook_add_id('index')."></index>\n";
-}
-
-sub docbook_complex_format($$)
-{
- my $name = shift;
- my $text = shift;
- return '' if ($text eq '');
- my $result = docbook_add_id($docbook_complex_format{$name}).'>'
.$text."</$docbook_complex_format{$name}>";
- return $result;
-}
-
-sub docbook_format($$)
-{
- my $name = shift;
- my $element = shift;
- my $text = shift;
- return '' if ($text eq '');
- return $text if ($format_map{$name} eq '');
- if ($name eq 'copying')
- {
- # FIXME is info in docbook 5.0
- return "<bookinfo>\n<legalnotice>\n$text</legalnotice>\n</bookinfo>\n";
- }
- return docbook_add_id($format_map{$name}).'>'
.$text."</$format_map{$name}>";
-}
-
-sub docbook_quotation_prepend_text($$)
-{
- my $command = shift;
- my $argument_text = shift;
-
- return undef if (!defined($argument_text) or $argument_text =~ /^$/);
-
- chomp($argument_text);
-
- return undef if (grep {lc($argument_text) eq $_}
@docbook_special_quotation);
- return gdt('@b{{quotation_arg}:} ', {'quotation_arg' => $argument_text},
{'keep_texi' => 1});
-}
-
-
-sub docbook_quotation($$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $argument_text = shift;
- my $argument_text_texi = shift;
- my $authors = shift;
-
- $argument_text_texi = '' if (!defined($argument_text_texi));
- chomp($argument_text_texi);
- my $docbook_command = 'blockquote';
- if (grep {lc($argument_text_texi) eq $_} @docbook_special_quotation)
- {
- $docbook_command = lc($argument_text_texi);
- }
- my $attribution = '';
- if ($authors)
- {
- foreach my $author (@$authors)
- {
- $attribution .= $author->{'author_text'};
- }
- $attribution = '<attribution>' .$attribution. '</attribution>' . "\n";
- }
- return docbook_add_id($docbook_command).'>' .$attribution . $text .
"</$docbook_command>\n";
-}
-
-sub docbook_style($$$$$$$$$)
-{
- my $style = shift;
- my $command = shift;
- my $text = shift;
- my $args = shift;
- my $no_close =shift;
- my $no_open = shift;
- my $line_nr = shift;
- my $state = shift;
- my $command_stack = shift;
- my $kept_line_nrs = shift;
-
- my $result = $text;
- if (exists($style->{'function'}))
- {
- my $function = $style->{'function'};
- $result = &$function($command, $args, $command_stack, $state,
$line_nr, $kept_line_nrs);
- }
- elsif (exists($style->{'inline_attribute'}))
- {
- my $element = $style->{'inline_attribute'};
- my $attribute_text = '';
- if ($element =~ /^(\w+)(\s+.*)/)
- {
- $element = $1;
- $attribute_text = $2;
- }
-
- if ($no_open)
- {
- $result = "<$element";
- }
- else
- {
- $result = docbook_add_id($element);
- }
- $result .= "$attribute_text>$text</$element>";
- }
- if (exists($style->{'begin'}) and !$no_open)
- {
- $result = $style->{'begin'} . $result;
- }
- if (exists($style->{'end'}) and !$no_close)
- {
- $result .= $style->{'end'};
- }
- return $result;
-}
-
-sub docbook_raw($$$)
-{
- my $style = shift;
- my $text = shift;
- my $line_nr = shift;
-
- if ($style eq 'verbatim' or $style eq 'verbatiminclude')
- {
- return docbook_add_id('screen').'>' . &$protect_text($text) .
'</screen>';
- }
- return '' unless (grep {$style eq $_} @EXPAND);
- if ($style eq 'docbook')
- {
- chomp ($text);
- return $text;
- }
- else
- {
- main::line_warn (sprintf(__("Raw format %s is not converted"),
$style), $line_nr);
- return &$protect_text($text);
- }
-}
-
-sub docbook_cartouche($$)
-{
- my $text = shift;
-
- return $text;
-}
-
-sub docbook_anchor_label($$)
-{
- my $id = shift;
- my $anchor_text = shift;
- # FIXME use docbook_node_id
- return '<anchor id="'. &$protect_text($anchor_text) . '"></anchor>';
-}
-
-sub docbook_float($$$$$)
-{
- my $text = shift;
- my $float = shift;
- my $caption = shift;
- my $shortcaption = shift;
-
- my $label_texi = $float->{'texi'};
- return $text if (!defined($label_texi) or $label_texi eq '');
-
- return docbook_anchor_label('',$label_texi) . $text;
-}
-
-sub docbook_normal_text($$$$$$$;$)
-{
- my $text = shift;
- my $in_raw_text = shift; # remove_texi
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
-#print STDERR "Bug: in_raw_text in_simple $text\n" if ($in_raw_text and
$in_simple);
- my $style_stack = shift;
- my $state = shift;
-
- #$text = uc($text) if (in_cmd($style_stack, 'sc'));
- $text = &$protect_text($text) unless($in_raw_text);
- if (! $in_code and !$in_preformatted)
- {
- if (!$in_raw_text)
- {
- $text =~ s/---/\&mdash\;/g;
- $text =~ s/--/\&ndash\;/g;
- $text =~ s/``/\&ldquo\;/g;
- $text =~ s/''/\&rdquo\;/g;
- }
- else
- {
- #FIXME really do that ? It is done by makeinfo in html
- $text =~ s/``/"/g;
- $text =~ s/''/"/g;
- # FIXME really do that in raw text?
- $text =~ s/---/\x{1F}/g;
- $text =~ s/--/-/g;
- $text =~ s/\x{1F}/--/g;
- }
- }
- return $text;
-}
-
-sub docbook_noop
-{
- return '';
-}
-
-1;
Index: texi2html/formats/html.init
===================================================================
RCS file: texi2html/formats/html.init
diff -N texi2html/formats/html.init
--- texi2html/formats/html.init 12 Sep 2010 20:06:13 -0000 1.60
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,2843 +0,0 @@
-# -*-perl-*-
-# vim: set filetype=perl:
-######################################################################
-# File: html.init
-# html output formatting
-#
-# A copy of this file is pasted into the beginning of texi2html by
-# running './configure'.
-#
-# This file is in the public domain. Thus it may easily be used as an
-# example for further customizations.
-#
-# Taken from texi2html.init in 2009.
-# Originally written by Olaf Bachmann.
-#
-# $Id: html.init,v 1.60 2010/09/12 20:06:13 pertusus Exp $
-
-use strict;
-
-use vars qw(@html_default_multitable_stack);
-# used in mediawiki.init
-#my @html_default_multitable_stack;
-# tracks menu entry index
-my $html_menu_entry_index;
-# the simple_formatted document title
-my $html_default_title;
-
-# initialise the html output
-sub html_default_load(;$)
-{
-my $from_command_line = shift;
-
-t2h_default_set_variables_xml();
-
-###############################################################
-# defaults
-
-set_default('HEADERS', 1);
-
address@hidden = ('html');
-
-# The value is the 'SystemLiteral' which identifies the canonical DTD
-# for the document.
-# Definition: The SystemLiteral is called the entity's system
-# identifier. It is a URI, which may be used to retrieve the entity.
-# See http://www.xml.com/axml/target.html#NT-ExternalID
-set_default('DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01
Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>');
-
-# When frames are used, this SystemLiteral identifies the DTD used for
-# the file containing the frame description.
-set_default('FRAMESET_DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01
Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd";>');
-
-# if the value is true the Texinfo menus are shown.
-set_default('SHOW_MENU', 1);
-
-set_default('SHOW_TITLE', 1);
-
-# default is to use nodes only as elements.
-set_default('USE_SECTIONS', undef);
-
-set_default('TOP_FILE', 'index.html');
-
-# file name used for Top node when NODE_FILES is true
-set_default('TOP_NODE_FILE', 'index');
-
-##############################################################################
-#
-# The following can only be set in the init file
-#
-##############################################################################
-
-set_default('INLINE_INSERTCOPYING', 0);
-
-# if this variable is true, numeric entities are used when there is no
-# corresponding textual entity.
-set_default('USE_NUMERIC_ENTITY', 1);
-
-# if true, use the original command if the result is an entity
-set_default('ENABLE_ENCODING_USE_ENTITY', 1);
-
-# if set, do redirection files for renamed nodes
-set_default('RENAMED_NODES_REDIRECTIONS', 1);
-
-# used as identation for block enclosing command @example, etc
-# If not empty, must be enclosed in <td></td>
-$EXAMPLE_INDENT_CELL = '<td> </td>';
-
-# same as above, only for @small
-$SMALL_EXAMPLE_INDENT_CELL = '<td> </td>';
-
-# font size for @small
-$SMALL_FONT_SIZE = '-1';
-
-# horizontal rules
-# Not used
-$SMALL_RULE = '<hr size="1">';
-$MIDDLE_RULE = '<hr size="2">';
-# used almost everywhere
-$DEFAULT_RULE = '<hr>';
-# used for top element and before misc elements
-$BIG_RULE = '<hr size="6">';
-
-# symbol put at the beginning of nodes entry in menu (and optionnaly of
-# unnumbered in menus, see next variable)
-$MENU_SYMBOL = '•';
-#$MENU_SYMBOL = '*';
-
-set_default('SIMPLE_MENU', 0);
-
-# extension for nodes files when NODE_FILES is true
-set_default('NODE_FILE_EXTENSION', 'html');
-
-# extension
-set_default('EXTENSION', 'html');
-
-# default is to split the html output
-set_default('SPLIT', 'node');
-
-# this resets all the variables to the texi2html specific values if
-# called as texi2html
-
-t2h_default_set_variables_texi2html() if ($COMMAND_NAME eq 'texi2html');
-
-# this controls the pre style for menus
-$MENU_PRE_STYLE = 'font-family: serif';
-
-# on bug-texinfo is has been said the the style is not code_style
-# for menus (except for the node name).
-# this controls the menu preformatted format
-# FIXME this is not dynamic, so change in MENU_PRE_STYLE is not taken
-# into account.
-# This is used if the menu appears within a preformatted format (which
-# is certainly an invalid construct), and SIMPLE_MENU is not set.
-$MENU_PRE_COMPLEX_FORMAT = {
- 'pre_style' => $MENU_PRE_STYLE,
- 'class' => 'menu-preformatted',
-# 'style' => 'code'
- };
-
-# This controls the ul style for toc
-$NO_BULLET_LIST_STYLE = 'list-style: none';
-$NO_BULLET_LIST_CLASS = 'no-bullet';
-$NO_BULLET_LIST_ATTRIBUTE = ' class="'.$NO_BULLET_LIST_CLASS.'"';
-
-# These lines are inserted before and after the shortcontents
-$BEFORE_OVERVIEW = "<div class=\"shortcontents\">\n";
-$AFTER_OVERVIEW = "</div>\n";
-
-# These lines are inserted before and after the contents
-$BEFORE_TOC_LINES = "<div class=\"contents\">\n";
-$AFTER_TOC_LINES = "</div>\n";
-
-# text inserted after <body ...>
-$AFTER_BODY_OPEN = '';
-
-# text inserted before </body>, this will be automatically inside <p></p>
-$PRE_BODY_CLOSE = '';
-
-# this is added inside <head></head> after <title> and some <meta name>
-# stuff, it can be used for eg. <style>, <script>, <meta> etc. tags.
-$EXTRA_HEAD = '';
-
-# Specifies the minimum page length required before a navigation panel
-# is placed at the bottom of a page
-set_default('WORDS_IN_PAGE', 300);
-
-# html version for latex2html
-set_default('L2H_HTML_VERSION', '4.0');
-
-# this is not set dynamically
-if (!get_conf('HEADER_IN_TABLE'))
-{
- @SECTION_BUTTONS = ([ 'NodeNext', \&html_default_node_direction ],
- [ 'NodePrev', \&html_default_node_direction ],
- [ 'NodeUp', \&html_default_node_direction ], ' ',
- 'Contents', 'Index');
- @CHAPTER_BUTTONS = @SECTION_FOOTER_BUTTONS = @NODE_FOOTER_BUTTONS =
- @MISC_BUTTONS = @TOP_BUTTONS = @SECTION_BUTTONS;
- $BIG_RULE = $DEFAULT_RULE;
-}
-
-set_default('ICONS', 0);
-
-%BUTTONS_ACCESSKEY =
-(
- 'Top', '',
- 'Contents', '',
- 'Overview', '',
- 'Index', '',
- 'This', '',
- 'Back', 'p',
- 'FastBack', '',
- 'Prev', 'p',
- 'Up', 'u',
- 'Next', 'n',
- 'NodeUp', 'u',
- 'NodeNext', 'n',
- 'NodePrev', 'p',
- 'NodeForward', '',
- 'NodeBack', '',
- 'Forward', 'n',
- 'FastForward', '',
- 'About' , '',
- 'First', '',
- 'Last', '',
- 'NextFile', '',
- 'PrevFile', '',
-);
-
-# see http://www.w3.org/TR/REC-html40/types.html#type-links
-%BUTTONS_REL =
-(
- 'Top', 'start',
- 'Contents', 'contents',
- 'Overview', '',
- 'Index', 'index',
- 'This', '',
- 'Back', 'previous',
- 'FastBack', '',
- 'Prev', 'previous',
- 'Up', 'up',
- 'Next', 'next',
- 'NodeUp', 'up',
- 'NodeNext', 'next',
- 'NodePrev', 'previous',
- 'NodeForward', '',
- 'NodeBack', '',
- 'Forward', 'next',
- 'FastForward', '',
- 'About' , 'help',
- 'First', '',
- 'Last', '',
- 'NextFile', 'next',
- 'PrevFile', 'previous',
-);
-
-
-
-# PRE_ABOUT can be a function reference or a scalar.
-# Note that if it is a scalar, T2H_InitGlobals has not been called,
-# and all global variables like $ADDRESS are not available.
-$PRE_ABOUT = sub
-{
- return ' ' . &$program_string() . "\n";
-};
-
-# If customizing $AFTER_ABOUT, be sure to put the content inside <p></p>.
-$AFTER_ABOUT = '';
-
-%BUTTONS_EXAMPLE =
- (
- 'Top', ' ',
- 'Contents', ' ',
- 'Overview', ' ',
- 'Index', ' ',
- 'This', '1.2.3',
- 'Back', '1.2.2',
- 'FastBack', '1',
- 'Prev', '1.2.2',
- 'Up', '1.2',
- 'Next', '1.2.4',
- 'NodeUp', '1.2',
- 'NodeNext', '1.2.4',
- 'NodePrev', '1.2.2',
- 'NodeForward', '1.2.4',
- 'NodeBack', '1.2.2',
- 'Forward', '1.2.4',
- 'FastForward', '2',
- 'About', ' ',
- 'First', '1.',
- 'Last', '1.2.4',
- 'NextFile', ' ',
- 'PrevFile', ' ',
- );
-
address@hidden = ('png','jpg','jpeg','gif');
-#, 'txt');
-
-#######################################################################
-#
-# Values guessed if not set here. The value used is in
-# $Texi2HTML::THISDOC{'VARNAME'}
-#
-#######################################################################
-
-set_default('BODYTEXT', undef);
-
-$translate_names = \&html_default_translate_names;
-
-t2h_default_push_handler(\&html_default_initialize, address@hidden);
-# This must be done after language has been set
-t2h_default_push_handler(\&html_default_bodytext, address@hidden);
-# This must be done after the fulltitle has been set
-t2h_default_push_handler(\&html_default_do_title, address@hidden);
-
-########################################################################
-# Control of Page layout:
-# There are the following subs which control the layout:
-#
-$print_section = \&HTML_DEFAULT_print_section;
-$end_section = \&HTML_DEFAULT_end_section;
-$one_section = \&HTML_DEFAULT_one_section;
-$print_Top_footer = \&HTML_DEFAULT_print_Top_footer;
-$print_Top = \&HTML_DEFAULT_print_Top;
-# changed in info format, but irrelevant for non-split formats
-$print_Footnotes = \&T2H_DEFAULT_print_Footnotes;
-$print_misc_header = \&HTML_DEFAULT_print_misc_header;
-$print_misc_footer = \&HTML_DEFAULT_print_misc_footer;
-$print_section_footer = \&HTML_DEFAULT_print_section_footer;
-$print_chapter_header = \&HTML_DEFAULT_print_chapter_header;
-$print_section_header = \&HTML_DEFAULT_print_section_header;
-$print_chapter_footer = \&HTML_DEFAULT_print_chapter_footer;
-$print_page_head = \&HTML_DEFAULT_print_page_head;
-$print_page_foot = \&HTML_DEFAULT_print_page_foot;
-$print_head_navigation = \&HTML_DEFAULT_print_head_navigation;
-$print_foot_navigation = \&HTML_DEFAULT_print_foot_navigation;
-$button_icon_img = \&HTML_DEFAULT_button_icon_img;
-$button_formatting = \&HTML_DEFAULT_button_formatting;
-
-$print_navigation = \&HTML_DEFAULT_print_navigation;
-$about_body = \&HTML_DEFAULT_about_body;
-
-$print_frame = \&HTML_DEFAULT_print_frame;
-$print_toc_frame = \&HTML_DEFAULT_print_toc_frame;
-$contents = \&HTML_DEFAULT_contents;
-$shortcontents = \&HTML_DEFAULT_shortcontents;
-$print_redirection_page = \&HTML_DEFAULT_print_redirection_page;
-
-########################################################################
-# Control of formatting:
-# 1.) For some changes, it is often enough to change the value of
-# some global map. It might necessitate building a little
-# function along with the change in hash, if the change is the use
-# of another function (in style_map).
-# 2.) For other changes, reimplement one of the t2h_default_<fnc>* routines,
-# give them another name, and assign them to the respective
-# $<fnc> variable (below).
-
-
-#
-# texinfo "simple things" (@foo) to HTML ones
-#
-%simple_map = %default_simple_map;
-$simple_map{'*'} = '<br>'; # HTML+
-$simple_map{' '} = ' ';
-$simple_map{"\t"} = ' ';
-$simple_map{"\n"} = ' ';
- # "­" or "­" could also be possible for @-, but it seems
- # that some browser will consider this as an always visible hyphen mark
- # which is not what we want (see http://www.cs.tut.fi/~jkorpela/shy.html)
-#$simple_map{'-'} = ''; # hyphenation hint
-
-# this map is used in preformatted text
-%simple_map_pre = %simple_map;
-$simple_map_pre{'*'} = "\n";
-
-# use entities in the default case
-#$things_map{'dots'} = '<small class="dots">...</small>';
-$things_map{'enddots'} = '<small class="enddots">...</small>';
-
-%style_map = ();
-%style_map_pre = ();
-t2h_default_copy_style_map (\%default_style_map, \%style_map);
-t2h_default_copy_style_map (\%default_style_map_pre, \%style_map_pre);
-# default is {'args' => ['normal'], 'attribute' => ''},
-my %style_map_html = (
- 'b', {'inline_attribute' => 'b'},
- 'cite', {'inline_attribute' => 'cite'},
- 'code', {'inline_attribute' => 'code'},
- 'command', {'inline_attribute' => 'code'},
- 'dfn', {'inline_attribute' => 'em'},
- 'email', {'function' => \&html_default_email},
- 'emph', {'inline_attribute' => 'em'},
- 'env', {'inline_attribute' => 'code'},
- 'file', {'inline_attribute' => 'tt', 'quote' => '"'},
- 'headitemfont', {'inline_attribute' => 'b'}, # not really that, in fact
it is
- # in <th> rather than <td>
- 'i', {'inline_attribute' => 'i'},
- 'slanted', {'inline_attribute' => 'i'},
- 'sansserif', {'inline_attribute' => 'span class="sansserif"'},
- 'kbd', {'inline_attribute' => 'kbd'},
- 'key', {'begin' => '<', 'end' => '>'},
- 'math', {'function' => \&html_default_math},
- 'option', {'inline_attribute' => 'samp', 'quote' => '"'},
- 'r', {'inline_attribute' => 'span class="roman"'},
- 'samp', {'inline_attribute' => 'samp', 'quote' => '"'},
- 'sc', {'inline_attribute' => 'small'},
- 'strong', {'inline_attribute' => 'strong'},
- 't', {'inline_attribute' => 'tt'},
- 'uref', {'function' => \&html_default_uref},
- 'url', {'function' => \&html_default_uref},
- 'indicateurl', {'begin' => '<<code>', 'end' => '</code>>'},
- 'var', {'inline_attribute' => 'var'},
- 'verb', {'inline_attribute' => 'tt'},
- );
-
-foreach my $style_command (keys(%style_map_html))
-{
- foreach my $key (keys(%{$style_map_html{$style_command}}))
- {
- $style_map_pre{$style_command}->{$key} =
$style_map_html{$style_command}->{$key};
- $style_map{$style_command}->{$key} =
$style_map_html{$style_command}->{$key};
- }
-}
-
-%line_command_map = (
- 'title' => 'h1',
- 'subtitle' => 'h3 align="right"',
- 'author' => 'strong',
-);
-
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents))
-{
- $style_map{$accent_command} = { 'function' => \&xml_default_accent };
- $style_map_pre{$accent_command} = { 'function' => \&xml_default_accent };
-}
-
-$style_map_pre{'sc'} = {};
-$style_map_pre{'titlefont'} = {};
-$style_map_pre{'click'}->{'function'} = \&t2h_default_click_pre;
-
-# uncomment to use the old interface
-#%style_map = %old_style_map;
-#%style_map_pre = %old_style_map_pre;
-
-%simple_format_simple_map_texi = %simple_map_pre;
-
-%format_map = (
-# 'quotation' => 'blockquote',
- # lists
-# 'itemize' => 'ul',
- 'enumerate' => 'ol',
-# 'multitable' => 'table',
- 'table' => 'dl compact="compact"',
- 'vtable' => 'dl compact="compact"',
- 'ftable' => 'dl compact="compact"',
- 'group' => '',
- 'raggedright' => '',
-# 'detailmenu' => '',
- );
-
-#%special_list_commands = (
-# 'table' => {},
-# 'vtable' => {},
-# 'ftable' => {},
-# 'itemize' => { 'bullet' => '' }
-# );
-
-$special_list_commands{'itemize'}->{ 'bullet'} = '';
-
-#
-# texinfo format to align attribute of paragraphs
-#
-
-%paragraph_style = (
- 'center' => 'center',
- 'flushleft' => 'left',
- 'flushright' => 'right',
- );
-
-# preformatted formats formatting
-if (get_conf('COMPLEX_FORMAT_IN_TABLE'))
-{
- foreach my $indented_format ('example', 'display', 'lisp')
- {
- $complex_format_map{"small$indented_format"}->{'begin'} =
"<table><tr>$SMALL_EXAMPLE_INDENT_CELL<td>";
- $complex_format_map{$indented_format}->{'begin'} =
"<table><tr>$EXAMPLE_INDENT_CELL<td>";
- $complex_format_map{$indented_format}->{'end'} = "</td></tr></table>\n";
- $complex_format_map{"small$indented_format"}->{'end'} =
"</td></tr></table>\n";
- }
-
- foreach my $non_indented_formats ('format', 'smallformat')
- {
- $complex_format_map{$non_indented_formats}->{'begin'} = '';
- $complex_format_map{$non_indented_formats}->{'end'} = "\n";
- }
-}
-else
-{
- foreach my $format ('example', 'display', 'lisp', 'format')
- {
- $complex_format_map{$format}->{'begin'} =
html_default_attribute_class('div', $format).">\n";
- $complex_format_map{"small$format"}->{'begin'} =
html_default_attribute_class('div', "small$format").">\n";
- $complex_format_map{$format}->{'end'} = '</div>'."\n";
- $complex_format_map{"small$format"}->{'end'} = '</div>'."\n";
- }
-}
-
-foreach my $format ('menu', 'detailmenu', 'direntry')
-{
- $complex_format_map{$format} = { 'begin' => '' , 'end' => '',
- 'class' => 'menu-preformatted',
- };
-}
-
-$complex_format_map{'menu_comment'} = {
- 'begin' => "<tr><th colspan=\"3\" align=\"left\" valign=\"top\">",
- 'end' => "</th></tr>", 'class' => 'menu-comment',
-};
-
-
-%format_in_paragraph = (
- 'html' => 1,
-);
-# map mapping css specification to style
-
-%css_map =
- (
- "ul.$NO_BULLET_LIST_CLASS" => "$NO_BULLET_LIST_STYLE",
- 'pre.menu-comment' => "$MENU_PRE_STYLE",
- 'pre.menu-preformatted' => "$MENU_PRE_STYLE",
- 'a.summary-letter' => 'text-decoration: none',
- 'blockquote.smallquotation' => 'font-size: smaller',
-# 'pre.display' => 'font-family: inherit',
-# 'pre.smalldisplay' => 'font-family: inherit; font-size:
smaller',
- 'pre.display' => 'font-family: serif',
- 'pre.smalldisplay' => 'font-family: serif; font-size: smaller',
- 'pre.smallexample' => 'font-size: smaller',
- 'span.sansserif' => 'font-family:sans-serif;
font-weight:normal',
- 'span.roman' => 'font-family:serif; font-weight:normal',
- 'span.nocodebreak' => 'white-space:pre',
- 'span.nolinebreak' => 'white-space:pre'
- );
-
-$css_map{'pre.format'} = $css_map{'pre.display'};
-$css_map{'pre.smallformat'} = $css_map{'pre.smalldisplay'};
-$css_map{'pre.smalllisp'} = $css_map{'pre.smallexample'};
-
-foreach my $indented_format ('example', 'display', 'lisp')
-{
- $css_map{"div.$indented_format"} = 'margin-left: 3.2em';
- $css_map{"div.small$indented_format"} = 'margin-left: 3.2em';
-}
-
-# formatting functions
-
-$acronym_like = \&html_default_acronym_like;
-$anchor = \&html_default_anchor;
-$anchor_label = \&html_default_anchor_label;
-$begin_format_texi = \&html_default_begin_format_texi;
-$caption_shortcaption = \&html_default_caption_shortcaption;
-$caption_shortcaption_command = \&html_default_caption_shortcaption_command;
-$cartouche = \&html_default_cartouche;
-$cell = \&html_default_cell;
-$def = \&html_default_def;
-$def_item = \&html_default_def_item;
-$def_line = \&html_default_def_line;
-$element_label = \&html_default_element_label;
-$float = \&html_default_float;
-$foot_line_and_ref = \&html_default_foot_line_and_ref;
-$foot_section = \&html_default_foot_section;
-$format_list_item_texi = \&html_default_format_list_item_texi;
-$heading = \&t2h_default_heading;
-$heading_text = \&html_default_heading_text;
-$heading_text_preformatted = \&html_default_heading_text_preformatted;
-$image = \&html_default_image;
-$image_files = \&html_default_image_files;
-$index_entry = \&html_default_index_entry;
-$index_entry_command = \&html_default_index_entry_command;
-$index_entry_label = \&html_default_index_entry_label;
-$index_letter = \&html_default_index_letter;
-$index_summary = \&html_default_index_summary;
-$insertcopying = \&html_default_insertcopying;
-$line_command = \&html_default_line_command;
-$list_item = \&html_default_list_item;
-$listoffloats = \&html_default_listoffloats;
-$listoffloats_entry = \&html_default_listoffloats_entry;
-$listoffloats_caption = \&html_default_listoffloats_caption;
-$listoffloats_float_style = \&html_default_listoffloats_float_style;
-$menu_command = \&html_default_menu_command;
-$menu_link = \&html_default_menu_link;
-$menu_description = \&html_default_menu_description;
-$misc_element_label = \&html_default_misc_element_label;
-$normal_text = \&html_default_normal_text;
-$paragraph = \&html_default_paragraph;
-$preformatted = \&html_default_preformatted;
-$print_index = \&html_default_print_index;
-$protect_text = \&xml_default_protect_text;
-$quotation = \&html_default_quotation;
-$sp = \&html_default_sp;
-$summary_letter = \&html_default_summary_letter;
-$tab_item_texi = \&html_default_tab_item_texi;
-$table_item = \&html_default_table_item;
-$table_line = \&html_default_table_line;
-$table_list = \&html_default_table_list;
-$raw = \&html_default_raw;
-$row = \&html_default_row;
-
-}
-
-
-
-# The functions
-
-sub html_default_initialize()
-{
- @html_default_multitable_stack = ();
- $html_default_title = undef;
-}
-
-# We have to do this dynamically because of internationalization and because
-# in body ENCODING_NAME could be used.
-sub html_default_bodytext()
-{
- # Set the default body text, inserted between <body ... >
- set_from_document('BODYTEXT', 'lang="' . get_conf('documentlanguage') .
'" bgcolor="#FFFFFF" text="#000000" link="#0000FF" vlink="#800080"
alink="#FF0000"');
-}
-
-sub html_default_translate_names()
-{
- t2h_default_translate_names();
-
- %NAVIGATION_TEXT =
- (
- 'Top', gdt('Top'),
- 'Contents', gdt('Contents'),
- 'Overview', gdt('Overview'),
- 'Index', gdt('Index'),
- ' ', ' ',
- 'This', gdt('current'),
- 'Back', ' < ',
- 'FastBack', ' << ',
- 'Prev', gdt('Prev'),
- 'Up', gdt(' Up '),
- 'Next', gdt('Next'),
- 'NodeUp', gdt('Node up'),
- 'NodeNext', gdt('Next node'),
- 'NodePrev', gdt('Previous node'),
- 'NodeForward', gdt('Forward node'),
- 'NodeBack', gdt('Back node'),
- 'Forward', ' > ',
- 'FastForward', ' >> ',
- 'About', ' ? ',
- 'First', ' |< ',
- 'Last', ' >| ',
- 'NextFile', gdt('Next file'),
- 'PrevFile', gdt('Previous file'),
- );
-
-}
-
-sub html_default_do_title()
-{
- $html_default_title = "$Texi2HTML::THISDOC{'fulltitle_simple_format'}";
- if ($html_default_title !~ /\S/)
- {
- $html_default_title = gdt('Untitled Document',{},{'simple_format' =>
1});
- main::document_warn("Must specify a title with a title command or
address@hidden");
- }
-}
-
-########################################################################
-# Page formatting functions
-#
-
-########################################################################
-# Layout for html for every sections
-#
-
-sub HTML_DEFAULT_print_section
-{
- my $fh = shift;
- my $first_in_page = shift;
- my $previous_is_top = shift;
- my $element = shift;
- my $buttons = address@hidden;
-
- my $nw = main::print_lines($fh);
- if ((get_conf('SPLIT') eq 'node') && get_conf('HEADERS'))
- {
- my $buttons = address@hidden;
- &$print_foot_navigation($fh, $buttons, $DEFAULT_RULE,
- (!get_conf('WORDS_IN_PAGE') or (defined ($nw) and $nw >=
get_conf('WORDS_IN_PAGE'))),
- $element);
- }
-}
-
-sub HTML_DEFAULT_one_section($$)
-{
- my $fh = shift;
- my $element = shift;
- main::print_lines($fh);
- print $fh "$DEFAULT_RULE\n";
- &$print_page_foot($fh);
-}
-
-###################################################################
-# Layout of top-page I recommend that you use @ifnothtml, @ifhtml,
-# @html within the Top texinfo node to specify content of top-level
-# page.
-#
-sub HTML_DEFAULT_print_Top_footer($$$)
-{
- my $fh = shift;
- my $end_page = shift;
- my $element = shift;
- my $buttons = address@hidden;
- my $rule = $DEFAULT_RULE;
- $rule = $BIG_RULE if (!$end_page);
- #print STDERR "end_page: $end_page\n";
- &$print_foot_navigation($fh, $buttons, $rule,
- ($end_page and (get_conf('HEADERS') or (get_conf('SPLIT') and
get_conf('SPLIT') ne 'node'))), $element);
- if ($end_page)
- {
- &$print_page_foot($fh);
- }
-}
-
-sub HTML_DEFAULT_print_Top($$$)
-{
- my $fh = shift;
- my $has_top_heading = shift;
- my $element = shift;
-
- main::print_lines($fh, $Texi2HTML::THIS_SECTION);
-}
-
-###################################################################
-# Layout of Toc, Overview, and Footnotes pages
-# By default, we use "normal" layout
-# Texi2HTML::HREF of Next, Prev, Up, Forward, Back, etc are not defined
-# use: my $buttons = [...] to redefine navigation buttons
-sub HTML_DEFAULT_print_Footnotes
-{
- return &$print_misc(@_);
-}
-
-sub HTML_DEFAULT_print_misc_header
-{
- my $fh = shift;
- my $buttons = shift;
- my $new_file = shift;
- my $misc_page = shift;
- &$print_page_head($fh) if ($new_file);
- print $fh "".&$misc_element_label($misc_pages_targets{$misc_page},
$misc_page);
- &$print_head_navigation($fh, $buttons) if ($new_file or
get_conf('HEADERS'));
-}
-
-sub HTML_DEFAULT_print_misc_footer
-{
- my $fh = shift;
- my $buttons = shift;
- my $new_file = shift;
- &$print_foot_navigation($fh, $buttons, $DEFAULT_RULE,
- ($new_file and (get_conf('HEADERS') or (get_conf('SPLIT') and
get_conf('SPLIT') ne 'node'))), undef);
- if ($new_file)
- {
- &$print_page_foot($fh);
- }
-}
-
-##################################################################
-# section_footer is only called if SPLIT eq 'section'
-# section_footer: after print_section of last section, before print_page_foot
-#
-
-sub HTML_DEFAULT_print_section_footer
-{
- my $fh = shift;
- my $element = shift;
- my $buttons = address@hidden;
- &$print_foot_navigation($fh, $buttons, $DEFAULT_RULE, 1, $element);
-}
-
-###################################################################
-# chapter_header and chapter_footer are only called if
-# SPLIT eq 'chapter'
-# chapter_header: after print_page_head, before print_section
-# chapter_footer: after print_section of last section, before print_page_foot
-#
-# If you want to get rid of navigation stuff after each section,
-# redefine print_section such that it does not call print_navigation,
-# and put print_navigation into print_chapter_header
-sub HTML_DEFAULT_print_chapter_header($$)
-{
- my $fh = shift;
- my $element = shift;
- # nothing to do there, by default, the navigation panel
- # is the element navigation panel
- if (! get_conf('HEADERS'))
- { # in this case print_navigation is called here.
- my $buttons = address@hidden;
- &$print_head_navigation($fh, $buttons);
- print $fh "\n$DEFAULT_RULE\n" unless
(get_conf('VERTICAL_HEAD_NAVIGATION'));
- }
-}
-
-sub HTML_DEFAULT_print_chapter_footer($$)
-{
- my $fh = shift;
- my $element = shift;
- my $buttons = address@hidden;
- &$print_foot_navigation($fh, $buttons, $DEFAULT_RULE, 1, $element);
-}
-
-sub HTML_DEFAULT_print_section_header($$)
-{
- my $fh = shift;
- my $element = shift;
- # nothing to do there, by default
- if (! get_conf('HEADERS'))
- { # in this case print_navigation is called here.
- my $buttons = address@hidden;
- &$print_head_navigation($fh, $buttons);
- }
-}
-
-
-###################################################################
-# Layout of standard header and footer
-#
-
-sub HTML_DEFAULT_print_page_head($)
-{
- my $fh = shift;
- my $longtitle = $html_default_title;
- $longtitle .= ": $Texi2HTML::SIMPLE_TEXT{'This'}" if (defined
($Texi2HTML::SIMPLE_TEXT{'This'}) and ($Texi2HTML::SIMPLE_TEXT{'This'} !~
/^\s*$/) and get_conf('SPLIT') and ($html_default_title ne
$Texi2HTML::SIMPLE_TEXT{'This'}));
- my $description = get_conf('documentdescription');
- $description = $longtitle if (!defined($description));
- $description = "<meta name=\"description\" content=\"$description\">" if
- ($description ne '');
- my $encoding = '';
- $encoding = "<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=".get_conf('ENCODING_NAME')."\">" if
(defined(get_conf('ENCODING_NAME')) and (get_conf('ENCODING_NAME') ne ''));
- my $date = '';
- my $today = get_conf('today');
- $today = '' if (!defined($today));
- $date = "\n<meta name=\"date\" content=\"$today\">" if
(get_conf('DATE_IN_HEADER') and $today ne '');
- my $links = '';
- if (get_conf('USE_LINKS'))
- {
- foreach my $link (@LINKS_BUTTONS)
- {
-#print STDERR "$link!!$Texi2HTML::HREF{$link}\n";
- if (defined($Texi2HTML::HREF{$link}) and $Texi2HTML::HREF{$link}
ne '')
- {
- my $title = '';
- $title = " title=\"$Texi2HTML::SIMPLE_TEXT{$link}\"" if
(defined($Texi2HTML::SIMPLE_TEXT{$link}));
- my $rel = '';
- $rel = " rel=\"$BUTTONS_REL{$link}\"" if
(defined($BUTTONS_REL{$link}));
- $links .= "<link
href=\"$Texi2HTML::HREF{$link}\"${rel}${title}>\n";
- }
- }
- }
-
- my $css_text = '';
- $css_text = get_conf('CSS_LINES') if (defined(get_conf('CSS_LINES')));
- my $doctype = get_conf('DOCTYPE');
- my $bodytext = get_conf('BODYTEXT');
- print $fh <<EOT;
-$doctype
-<html>
-$Texi2HTML::THISDOC{'copying_comment'}<!-- Created by
$Texi2HTML::THISDOC{'program_and_version'},
$Texi2HTML::THISDOC{'program_homepage'} -->
-<head>
-<title>$longtitle</title>
-
-$description
-<meta name="keywords" content="$longtitle">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="$Texi2HTML::THISDOC{'program'}">$date
-$encoding
-${links}$css_text
-$EXTRA_HEAD
-</head>
-
-<body $bodytext>
-$AFTER_BODY_OPEN
-EOT
-}
-
-sub HTML_DEFAULT_end_section($$$)
-{
- my $fh = shift;
- my $misc_or_top_and_section_separation = shift;
- my $element = shift;
- if ($misc_or_top_and_section_separation)
- {
- my $rule = $BIG_RULE;
- # in that case we are almost surely at the end of the document
- $rule = $DEFAULT_RULE if (! get_conf('MONOLITHIC'));
- &$print_foot_navigation($fh, undef, $rule, 0, $element, 1);
- }
- else
- {
- print $fh "$DEFAULT_RULE\n";
- }
-}
-
-sub HTML_DEFAULT_print_page_foot($)
-{
- my $fh = shift;
- my $program_text = '';
- if (get_conf('PROGRAM_NAME_IN_FOOTER'))
- {
- my $program_string = &$program_string();
- $program_text = " <font size=\"-1\">
- $program_string
- </font>
- <br>";
- }
- print $fh <<EOT;
-<p>
-$program_text
-$PRE_BODY_CLOSE
-</p>
-</body>
-</html>
-EOT
-}
-
-###################################################################
-# Layout of navigation panel
-
-sub HTML_DEFAULT_print_head_navigation($$$$$)
-{
- my $fh = shift;
- my $buttons = shift;
- my $first_in_page = shift;
- my $previous_is_top = shift;
- my $element = shift;
-
- my $result = '';
- if (get_conf('VERTICAL_HEAD_NAVIGATION'))
- {
- $result .= <<EOT;
-<table border="0" cellpadding="0" cellspacing="0">
-<tr valign="top">
-<td align="left">
-EOT
- }
- $result .= &$print_navigation($buttons,
get_conf('VERTICAL_HEAD_NAVIGATION'));
- if (get_conf('VERTICAL_HEAD_NAVIGATION'))
- {
- $result .= <<EOT;
-</td>
-<td align="left">
-EOT
- }
- elsif (get_conf('SPLIT') eq 'node')
- {
- $result .= "$DEFAULT_RULE\n";
- }
-
- print $fh $result if (defined($fh));
- return $result;
-}
-
-sub HTML_DEFAULT_print_foot_navigation($$$$$;$)
-{
- my $fh = shift;
- my $buttons = shift;
- my $rule = shift;
- my $print_navigation_panel = shift;
- my $element = shift;
- # set if called between sections and top or between sections and misc.
- # could also be the last element
- my $maybe_in_page = shift;
-
- $rule = '' if (!defined($rule));
- $print_navigation_panel = 1 if (!defined($print_navigation_panel)
- and defined($buttons));
-
- # avoid the rule if at the end of a page and there is nothing below
- $rule = '' if (!get_conf('PROGRAM_NAME_IN_FOOTER') and
!$print_navigation_panel and !$maybe_in_page);
-
- if (get_conf('VERTICAL_HEAD_NAVIGATION'))
- {
- print $fh <<EOT;
-</td>
-</tr>
-</table>
-EOT
- }
- print $fh "$rule\n" if ($rule ne '');
- print $fh "".&$print_navigation($buttons) if ($print_navigation_panel);
-}
-
-######################################################################
-# navigation panel
-#
-# how to create IMG tag
-sub HTML_DEFAULT_button_icon_img
-{
- my $button = shift;
- my $icon = shift;
- my $name = shift;
- return '' if (!defined($icon));
- $button = "" if (!defined ($button));
- $name = '' if (!defined($name));
- my $alt = '';
- if ($name ne '')
- {
- if ($button ne '')
- {
- $alt = "$button: $name";
- }
- else
- {
- $alt = $name;
- }
- }
- else
- {
- $alt = $button;
- }
- return qq{<img src="$icon" border="0" alt="$alt" align="middle">};
-}
-
-sub HTML_DEFAULT_button_formatting($$)
-{
- my $button = shift;
- my $vertical = shift;
-
- my ($active, $passive);
- if (ref($button) eq 'CODE')
- {
- $active = &$button($vertical);
- }
- elsif (ref($button) eq 'SCALAR')
- {
- $active = "$$button" if defined($$button);
- }
- elsif (ref($button) eq 'ARRAY')
- {
- my $text = $button->[1];
- my $button_href = $button->[0];
- # verify that $button_href is simple text and text is a reference
- if (defined($button_href) and !ref($button_href)
- and defined($text) and (ref($text) eq 'SCALAR') and defined($$text))
- { # use given text
- if ($Texi2HTML::HREF{$button_href})
- {
- my $anchor_attributes = '';
- if (get_conf('USE_ACCESSKEY') and
(defined($BUTTONS_ACCESSKEY{$button_href})) and
($BUTTONS_ACCESSKEY{$button_href} ne ''))
- {
- $anchor_attributes =
"accesskey=\"$BUTTONS_ACCESSKEY{$button_href}\"";
- }
- if (get_conf('USE_REL_REV') and
(defined($BUTTONS_REL{$button_href})) and ($BUTTONS_REL{$button_href} ne ''))
- {
- $anchor_attributes .= "
rel=\"$BUTTONS_REL{$button_href}\"";
- }
- $active = "" .
- &$anchor('',
- $Texi2HTML::HREF{$button_href},
- $$text,
- $anchor_attributes
- );
- }
- else
- {
- $passive = $$text;
- }
- }
- elsif (defined($button_href) and !ref($button_href)
- and defined($text) and (ref($text) eq 'CODE'))
- {
- $active = &$text($button_href);
- }
- }
- elsif ($button eq ' ')
- { # handle space button
- $active =
- (get_conf('ICONS') && $ACTIVE_ICONS{' '}) ?
- &$button_icon_img($BUTTONS_NAME{$button}, $ACTIVE_ICONS{' '}) :
- $NAVIGATION_TEXT{' '};
- #next;
- }
- elsif ($Texi2HTML::HREF{$button})
- { # button is active
- my $btitle = $BUTTONS_GOTO{$button} ?
- 'title="' . $BUTTONS_GOTO{$button} . '"' : '';
- if (get_conf('USE_ACCESSKEY') and
(defined($BUTTONS_ACCESSKEY{$button})) and ($BUTTONS_ACCESSKEY{$button} ne ''))
- {
- $btitle .= " accesskey=\"$BUTTONS_ACCESSKEY{$button}\"";
- }
- if (get_conf('USE_REL_REV') and (defined($BUTTONS_REL{$button})) and
($BUTTONS_REL{$button} ne ''))
- {
- $btitle .= " rel=\"$BUTTONS_REL{$button}\"";
- }
- if (get_conf('ICONS') && $ACTIVE_ICONS{$button})
- { # use icon
- $active = '' .
- &$anchor('',
- $Texi2HTML::HREF{$button},
- &$button_icon_img($BUTTONS_NAME{$button},
- $ACTIVE_ICONS{$button},
- $Texi2HTML::SIMPLE_TEXT{$button}),
- $btitle
- );
- }
- else
- { # use text
- $active =
- '[' .
- &$anchor('',
- $Texi2HTML::HREF{$button},
- $NAVIGATION_TEXT{$button},
- $btitle
- ) .
- ']';
- }
- }
- else
- { # button is passive
- $passive =
- get_conf('ICONS') && $PASSIVE_ICONS{$button} ?
- &$button_icon_img($BUTTONS_NAME{$button},
- $PASSIVE_ICONS{$button},
- $Texi2HTML::SIMPLE_TEXT{$button}) :
- "[" . $NAVIGATION_TEXT{$button} . "]";
- }
- return ($active, $passive);
-}
-
-my %html_default_node_directions;
-foreach my $node_directions ('NodeNext', 'NodePrev', 'NodeUp')
-{
- $html_default_node_directions{$node_directions} = 1;
-}
-
-sub HTML_DEFAULT_print_navigation($;$)
-{
- my $buttons = shift;
- my $vertical = shift;
-
- my $first_button = 1;
- my $result = '';
- if (get_conf('HEADER_IN_TABLE'))
- {
- $result .= html_default_attribute_class('table', 'header').'
cellpadding="1" cellspacing="1" border="0">'."\n";
- $result .= "<tr>" unless $vertical;
- }
- else
- {
- $result .= html_default_attribute_class('div', 'header').">\n<p>\n";
- }
- for my $button (@$buttons)
- {
- if (get_conf('HEADER_IN_TABLE'))
- {
- $result .= qq{<tr valign="top" align="left">\n} if $vertical;
- $result .= qq{<td valign="middle" align="left">};
- }
- my $direction;
- if (ref($button) eq 'ARRAY' and defined($button->[0]) and
!ref($button->[0]))
- {
- $direction = $button->[0];
- }
- elsif (defined($button) and !ref($button))
- {
- $direction = $button;
- }
-
- my ($active, $passive) = &$button_formatting($button, $vertical);
- if (get_conf('HEADER_IN_TABLE'))
- {
- if (defined($active))
- {
- $first_button = 0 if ($first_button);
- $result .= $active;
- }
- elsif (defined($passive))
- {
- $first_button = 0 if ($first_button);
- $result .= $passive;
- }
- $result .= "</td>\n";
- $result .= "</tr>\n" if $vertical;
- }
- elsif (defined($active))
- { # only active buttons are print out when not in table
- if (defined($direction) and
$html_default_node_directions{$direction} and !$first_button)
- {
- $active = ', ' .$active;
- }
- $result .= $active;
- $first_button = 0 if ($first_button);
- }
- }
- if (get_conf('HEADER_IN_TABLE'))
- {
- $result .= "</tr>" unless $vertical;
- $result .= "</table>\n";
- }
- else
- {
- $result .= "</p>\n</div>\n";
- }
- return $result;
-}
-
-sub html_default_node_direction($)
-{
- my $direction = shift;
- my $result = undef;
- if ($Texi2HTML::HREF{$direction} and $Texi2HTML::NODE{$direction})
- {
- my $anchor_attributes = '';
- if (get_conf('USE_ACCESSKEY') and
(defined($BUTTONS_ACCESSKEY{$direction})) and ($BUTTONS_ACCESSKEY{$direction}
ne ''))
- {
- $anchor_attributes =
"accesskey=\"$BUTTONS_ACCESSKEY{$direction}\"";
- }
- if (get_conf('USE_REL_REV') and (defined($BUTTONS_REL{$direction}))
and ($BUTTONS_REL{$direction} ne ''))
- {
- $anchor_attributes .= " rel=\"$BUTTONS_REL{$direction}\"";
- }
- my $anchor = &$anchor('',
- $Texi2HTML::HREF{$direction},
- $Texi2HTML::NODE{$direction},
- $anchor_attributes
- )
- ;
- # i18n
- $result = "$BUTTONS_TEXT{$direction}: $anchor";
- }
- return $result;
-}
-
-######################################################################
-# Frames: this is from "Richard Y. Kim" <address@hidden>
-# Should be improved to be more conforming to other _print* functions
-# toc_file and main_file passed as args are relative to the texinfo manual
-# location, and therefore are not used.
-
-sub HTML_DEFAULT_print_frame
-{
- my $fh = shift;
- my $toc_file = shift;
- my $main_file = shift;
- $main_file = $Texi2HTML::THISDOC{'filename'}->{'top'};
- $toc_file = $Texi2HTML::THISDOC{'filename'}->{'toc_frame'};
- my $doctype = get_conf('FRAMESET_DOCTYPE');
- print $fh <<EOT;
-$doctype
-<html>
-<head><title>$Texi2HTML::THISDOC{'fulltitle'}</title></head>
-<frameset cols="140,*">
- <frame name="toc" src="$toc_file">
- <frame name="main" src="$main_file">
-</frameset>
-</html>
-EOT
-}
-
-sub HTML_DEFAULT_print_toc_frame
-{
- my $fh = shift;
- my $stoc_lines = shift;
- &$print_page_head($fh);
- print $fh <<EOT;
-<h2>Content</h2>
-EOT
- print $fh map {s/\bhref=/target="main" href=/; $_;} @$stoc_lines;
- print $fh "</body></html>\n";
-}
-
-######################################################################
-# About page
-#
-
-sub HTML_DEFAULT_about_body
-{
- return undef if (!get_conf('HEADER_IN_TABLE'));
- my $about = "<p>\n";
- if (ref($PRE_ABOUT) eq 'CODE')
- {
- $about .= &$PRE_ABOUT();
- }
- else
- {
- $about .= $PRE_ABOUT;
- }
- $about .= <<EOT;
-</p>
-<p>
-EOT
- $about .= gdt(' The buttons in the navigation panels have the following
meaning:') . "\n";
- $about .= <<EOT;
-</p>
-<table border="1">
- <tr>
-EOT
- $about .= ' <th> ' . gdt('Button') . " </th>\n" .
-' <th> ' . gdt('Name') . " </th>\n" .
-' <th> ' . gdt('Go to') . " </th>\n" .
-' <th> ' . gdt('From 1.2.3 go to') . "</th>\n" . " </tr>\n";
-
- for my $button (@SECTION_BUTTONS)
- {
- next if $button eq ' ' || ref($button) eq 'CODE' || ref($button) eq
'SCALAR' || ref($button) eq 'ARRAY';
- $about .= " <tr>\n <td align=\"center\">";
- $about .=
- (get_conf('ICONS') && $ACTIVE_ICONS{$button} ?
- &$button_icon_img($BUTTONS_NAME{$button}, $ACTIVE_ICONS{$button})
:
- ' [' . $NAVIGATION_TEXT{$button} . '] ');
- $about .= "</td>\n";
- $about .= <<EOT;
- <td align="center">$BUTTONS_NAME{$button}</td>
- <td>$BUTTONS_GOTO{$button}</td>
- <td>$BUTTONS_EXAMPLE{$button}</td>
- </tr>
-EOT
- }
-
- $about .= <<EOT;
-</table>
-
-<p>
-EOT
- $about .= gdt(' where the @strong{ Example } assumes that the current
position is at @strong{ Subsubsection One-Two-Three } of a document of the
following structure:') . "\n";
-
-# where the <strong> Example </strong> assumes that the current position
-# is at <strong> Subsubsection One-Two-Three </strong> of a document of
-# the following structure:
- $about .= <<EOT;
-</p>
-
-<ul>
-EOT
- $about .= ' <li> 1. ' . gdt('Section One') . "\n" .
-" <ul>\n" .
-' <li>1.1 ' . gdt('Subsection One-One') . "\n";
- $about .= <<EOT;
- <ul>
- <li>...</li>
- </ul>
- </li>
-EOT
- $about .= ' <li>1.2 ' . gdt('Subsection One-Two') . "\n" .
-" <ul>\n" .
-' <li>1.2.1 ' . gdt('Subsubsection One-Two-One') . "</li>\n" .
-' <li>1.2.2 ' . gdt('Subsubsection One-Two-Two') . "</li>\n" .
-' <li>1.2.3 ' . gdt('Subsubsection One-Two-Three') . "
\n"
-.
-' <strong><== ' . gdt('Current Position') . " </strong></li>\n" .
-' <li>1.2.4 ' . gdt('Subsubsection One-Two-Four') . "</li>\n" .
-" </ul>\n" .
-" </li>\n" .
-' <li>1.3 ' . gdt('Subsection One-Three') . "\n";
- $about .= <<EOT;
- <ul>
- <li>...</li>
- </ul>
- </li>
-EOT
- $about .= ' <li>1.4 ' . gdt('Subsection One-Four') . "</li>\n";
- $about .= <<EOT;
- </ul>
- </li>
-</ul>
-$AFTER_ABOUT
-EOT
- return $about;
-}
-
-sub HTML_DEFAULT_print_redirection_page()
-{
- #my $fh = shift;
- my $longtitle = $html_default_title;
- $longtitle .= ": $Texi2HTML::SIMPLE_TEXT{'This'}" if (defined
($Texi2HTML::SIMPLE_TEXT{'This'}) and ($Texi2HTML::SIMPLE_TEXT{'This'} !~
/^\s*$/) and ($html_default_title ne $Texi2HTML::SIMPLE_TEXT{'This'}));
- my $description = get_conf('documentdescription');
- $description = $longtitle if (!defined($description));
- my $encoding = '';
- $encoding = "<meta http-equiv=\"Content-Type\" content=\"text/html;
charset=".get_conf('ENCODING_NAME')."\">" if
(defined(get_conf('ENCODING_NAME')) and (get_conf('ENCODING_NAME') ne ''));
- my $href = &$anchor('', $Texi2HTML::HREF{'This'},
$Texi2HTML::NAME{'This'});
- my $string = gdt('The node you are looking for is at {href}.',
- { 'href' => $href });
- my $doctype = get_conf('DOCTYPE');
- my $css_text = '';
- $css_text = get_conf('CSS_LINES') if (defined(get_conf('CSS_LINES')));
- my $today = get_conf('today');
- my $bodytext = get_conf('BODYTEXT');
- my $result = <<EOT;
-$doctype
-<html>
-<!-- Created by $Texi2HTML::THISDOC{'program_and_version'},
$Texi2HTML::THISDOC{'program_homepage'} -->
-<!-- This file redirects to the location of a node or anchor -->
-<head>
-<title>$longtitle</title>
-
-<meta name="description" content="$description">
-<meta name="keywords" content="$longtitle">
-<meta name="resource-type" content="document">
-<meta name="distribution" content="global">
-<meta name="Generator" content="$Texi2HTML::THISDOC{'program'}">
-$encoding
-$css_text
-<meta http-equiv="Refresh" content="2; url=$Texi2HTML::HREF{'This'}">
-$EXTRA_HEAD
-</head>
-
-<body $bodytext>
-$AFTER_BODY_OPEN
-<p>$string</p>
-</body>
-EOT
- return $result;
-}
-
-sub html_default_uref($$)
-{
- shift;
- my $args = shift;
- my $url = shift @$args;
- my $text = shift @$args;
- my $replacement = shift @$args;
- $url = main::normalise_space($url);
- $replacement = '' if (!defined($replacement));
- $replacement = main::normalise_space($replacement);
- $text = '' if (!defined($text));
- $text = main::normalise_space($text);
- $text = $replacement if ($replacement ne '');
- $text = $url unless ($text ne '');
- return $text if ($url eq '');
- return &$anchor('', $url, $text);
-}
-
-sub html_default_math($$)
-{
- shift;
- my $args = shift;
- my $text = shift @$args;
- return "<em>$text</em>";
-}
-
-sub html_default_email($$)
-{
- my $command = shift;
- my $args = shift;
- my $mail = shift @$args;
- my $text = shift @$args;
- $mail = main::normalise_space($mail);
- $text = $mail unless (defined($text) and ($text ne ''));
- $text = main::normalise_space($text);
- return $text if ($mail eq '');
- return &$anchor('', "mailto:$mail";, $text);
-}
-
-sub html_default_attribute_class($$)
-{
- my $element = shift;
- my $class = shift;
- return "<$element" if (!defined($class) or $class eq '' or
get_conf('NO_CSS'));
- my $style = '';
- if (get_conf('INLINE_CSS_STYLE') and defined($css_map{"$element.$class"}))
- {
- $style = ' style="'.$css_map{"$element.$class"}.'"';
- }
- return "<$element class=\"$class\"$style";
-}
-
-# this is called each time a format begins. Here it is used to keep a
-# record of the multitables to have a faithful count of the cell nr.
-sub html_default_begin_format_texi($$$)
-{
- my $command = shift;
- my $line = shift;
- my $state = shift;
-
- # first array element is the number of cell in a row
- # second is the number of paragraphs in a cell
- push (@html_default_multitable_stack, [-1,-1]) if ($command eq
'multitable');
-
- return $line;
-}
-
-sub html_default_caption_shortcaption($)
-{
- my $float = shift;
- my $caption_lines;
- my $shortcaption_lines;
- my $style = $float->{'style_texi'};
- if (defined($float->{'nr'}))
- {
- my $nr = $float->{'nr'};
- if ($style ne '')
- {
- $style = gdt('{style} {number}', { 'style' => $style, 'number' =>
$nr});
- }
- else
- {
- $style = $nr;
- }
- }
-
- if (defined($float->{'caption_texi'}))
- {
- @$caption_lines = @{$float->{'caption_texi'}};
- $caption_lines->[0] =~ s/^\s*//;
- if (defined($style))
- {
- $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' . gdt('{style}:
{caption_first_line}', { 'style' => $style, 'caption_first_line' =>
$caption_lines->[0] });
- }
- else
- {
- $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
$caption_lines->[0];
- }
- push @$caption_lines, "}\n";
- }
- elsif (defined($style))
- {
- $caption_lines->[0] = '@'.$CAPTION_STYLE.'{' . $style . '}' . "\n";
- }
- if (defined($float->{'shortcaption_texi'}))
- {
- @$shortcaption_lines = @{$float->{'shortcaption_texi'}};
- if (defined($style))
- {
- $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
gdt('{style}: {shortcaption_first_line}', { 'style' => $style,
'shortcaption_first_line' => $shortcaption_lines->[0] });
- }
- else
- {
- $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' .
$shortcaption_lines->[0];
- }
- push @$shortcaption_lines, "}\n";
- }
- elsif (defined($style))
- {
- $shortcaption_lines->[0] = '@'.$CAPTION_STYLE.'{' . $style . '}' .
"\n";
- }
- return ($caption_lines, $shortcaption_lines);
-}
-
-# everything is done in &$float
-sub html_default_caption_shortcaption_command($$$$)
-{
- my $command = shift;
- my $text = shift;
- my $texi_lines = shift;
- my $float_element = shift;
- return '';
-}
-
-sub html_default_float($$$$$)
-{
- my $text = shift;
- my $float = shift;
- my $caption = shift;
- my $shortcaption = shift;
-
- my $label = '';
- if (exists($float->{'id'}))
- {
- $label = &$anchor($float->{'id'});
- }
- my $caption_text = '';
-
- if (defined($float->{'caption_texi'}))
- {
- $caption_text = $caption;
- }
- elsif (defined($float->{'shortcaption_texi'}))
- {
- $caption_text = $shortcaption;
- }
- elsif (defined($caption))
- {
- $caption_text = $caption;
- }
-
- return html_default_attribute_class('div','float'). '>' . "$label\n" .
$text . '</div>' . $caption_text;
-}
-
-sub html_default_listoffloats_float_style($$)
-{
- my $style_texi = shift;
- my $float = shift;
-
- my $style = $float->{'style_texi'};
- #print STDERR "listoffloat/float style mismatch $style_texi $style\n" if
($style_texi ne $style);
- if (defined($float->{'nr'}))
- {
- my $nr = $float->{'nr'};
- if ($style ne '')
- {
- $style = gdt('{style} {number}', { 'style' => $style, 'number'
=> $nr});
- }
- else
- {
- $style = $nr;
- }
- }
- return $style;
-}
-
-sub html_default_listoffloats_caption($)
-{
- my $float = shift;
- if (defined($float->{'shortcaption_texi'}))
- {
- return ([ @{$float->{'shortcaption_texi'}} ], 'shortcaption');
- }
- elsif (defined($float->{'caption_texi'}))
- {
- return ([ @{$float->{'caption_texi'}} ], 'caption');
- }
- return ([ ], undef);
-}
-
-sub html_default_listoffloats_entry($$$$)
-{
- my $style_texi = shift;
- my $float = shift;
- my $float_style = shift;
- my $caption = shift;
- my $href = shift;
-
- return '<dt>' . &$anchor('', $href, $float_style) . '</dt><dd>' . $caption
-. '</dd>' . "\n";
-}
-
-sub html_default_listoffloats($$$)
-{
- my $style_texi = shift;
- my $style = shift;
- my $float_entries = shift;
-
- my $result = html_default_attribute_class('dl', 'listoffloats').">\n" ;
- foreach my $float_entry (@$float_entries)
- {
- $result .= $float_entry;
- }
- return $result . "</dl>\n";
-}
-
-sub html_default_insertcopying($$$)
-{
- my $text = shift;
- my $comment = shift;
- my $simple_text = shift;
- return $text;
-}
-
-sub html_default_protect_space_codebreak($$$$$)
-{
- my $text = shift;
- my $in_raw_text = shift; # remove_texi
- my $in_preformatted = shift;
- my $in_code = shift;
- my $style_stack = shift;
-
- return $text if ($in_preformatted or $in_raw_text);
-
- my $in_w = 1 if (in_cmd($style_stack, 'w'));
-
- if ($in_w or ($in_code and get_conf('allowcodebreaks') eq 'false'))
- {
- my $class = 'nolinebreak';
- $class = 'nocodebreak' if ($in_code and get_conf('allowcodebreaks') eq
'false');
- my $open = html_default_attribute_class('span', $class).'>';
- # protect spaces in the html leading attribute in case we are in 'w'
- $open =~ s/ /\x{1F}/g if ($in_w);
- $text =~ s/(\S*[_-]\S*)/${open}$1<\/span>/g;
- }
-
- if ($in_w)
- {
- $text .= ' ' if (chomp($text));
- # protect spaces within text
- $text =~ s/ / /g;
- # revert protected spaces in leading html attribute
- $text =~ s/\x{1F}/ /g;
- }
- return $text;
-}
-
-sub html_default_normal_text($$$$$$$;$)
-{
- my @initial_args = @_;
- my $text = shift;
- my $in_raw_text = shift; # remove_texi
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- # like utf8.init
- if (get_conf('ENABLE_ENCODING') and !get_conf('ENABLE_ENCODING_USE_ENTITY')
and defined(get_conf('ENCODING_NAME')) and get_conf('ENCODING_NAME') eq 'utf-8')
- {
- my $result = &t2h_utf8_normal_text(@initial_args);
- $result = html_default_protect_space_codebreak($result, $in_raw_text,
$in_preformatted, $in_code, $style_stack);
- return $result;
- }
-
- $text = uc($text) if (in_cmd($style_stack, 'sc'));
- $text = &$protect_text($text) unless($in_raw_text);
- #$text =~ s/ / /g
- # if (!$in_raw_text and !$in_preformatted and in_cmd($style_stack, 'w'));
- if (! $in_code and !$in_preformatted)
- {
- if (get_conf('USE_ISO') and !$in_raw_text)
- {
- $text =~ s/---/\&mdash\;/g;
- $text =~ s/--/\&ndash\;/g;
- $text =~ s/``/\&ldquo\;/g;
- $text =~ s/''/\&rdquo\;/g;
- }
- else
- {
- if ($in_raw_text) #FIXME really do that ? It is done by makeinfo
- {
- $text =~ s/``/"/g;
- $text =~ s/''/"/g;
- }
- else
- {
- $text =~ s/``/"/g;
- $text =~ s/''/"/g;
- # to be like texinfo
- #$text =~ s/'/\&rsquo\;/g;
- #$text =~ s/`/\&lsquo\;/g;
- }
- # FIXME really do that in raw text?
- $text =~ s/---/\x{1F}/g;
- $text =~ s/--/-/g;
- $text =~ s/\x{1F}/--/g;
- }
- }
- $text = html_default_protect_space_codebreak($text, $in_raw_text,
$in_preformatted, $in_code, $style_stack);
- $text = t2h_text_substitutions($text, $in_raw_text, ($in_preformatted or
$in_code), $in_simple);
- return $text;
-}
-
-# This function produces an anchor
-#
-# arguments:
-# $name : anchor name
-# $href : anchor href
-# text : text displayed
-# extra_attribs : added to anchor attributes list
-sub html_default_anchor($;$$$)
-{
- my $name = shift;
- my $href = shift;
- my $text = shift;
- my $attributes = shift;
- my $class = '';
-#print STDERR "!$name!$href!$text!$attributes!\n";
- if (!defined($attributes) or ($attributes !~ /\S/))
- {
- $attributes = '';
- }
- else
- {
- if ($attributes =~ s/^class=\"([^\"]+)\"//)
- {
- $class = $1;
- }
-
- $attributes = ' ' . $attributes if ($attributes ne '');
- }
- $name = '' if (!defined($name) or ($name !~ /\S/));
- $href = '' if (!defined($href) or ($href !~ /\S/));
- $text = '' if (!defined($text));
- return $text if (($name eq '') and ($href eq ''));
- $name = "name=\"$name\"" if ($name ne '');
- $href = "href=\"$href\"" if ($href ne '');
- $href = ' ' . $href if (($name ne '') and ($href ne ''));
-#print STDERR "!!!$name!$href!$text!$attributes!\n";
- return html_default_attribute_class('a', $class). "
${name}${href}${attributes}>$text</a>";
-}
-
-# This function is used to format the text associated with a @deff/@end deff
-#
-# argument:
-# text
-#
-# DEF_TABLE should be used to distinguish between @def formatted as table
-# and as definition lists.
-sub html_default_def_item($$$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $command = shift;
- if ($text =~ /\S/)
- {
- if (! get_conf('DEF_TABLE'))
- {
- return '<dd>' . $text . '</dd>';# unless $only_inter_item_commands;
- #return $text; # invalid without dd in ul
- }
- else
- {
- return '<tr><td colspan="2">' . $text . '</td></tr>';
- }
- }
- return '';
-}
-
-# format the container for the @deffn line and text
-#
-# argument
-# text of the whole @def, line and associated text.
-#
-# DEF_TABLE should be used.
-sub html_default_def($$)
-{
- my $text = shift;
- my $command = shift;
- if ($text =~ /\S/)
- {
- if (! get_conf('DEF_TABLE'))
- {
- return "<dl>\n" . $text . "</dl>\n";
- }
- else
- {
- return "<table width=\"100%\">\n" . $text . "</table>\n";
- }
- }
- return '';
-
-}
-
-# a whole menu
-#
-# argument:
-# the whole menu text (entries and menu comments)
-#
-# argument:
-# whole menu text.
-sub html_default_menu_command($$$)
-{
- my $format = shift;
- my $text = shift;
- my $in_preformatted = shift;
-
- $html_menu_entry_index=0;
-
- my $begin_row = '';
- my $end_row = '';
- if ($in_preformatted)
- {
- $begin_row = '<tr><td>';
- $end_row = '</td></tr>';
- }
- if ($text =~ /\S/)
- {
- return '' if ($format eq 'direntry');
- return $text if ($format eq 'detailmenu');
- return html_default_attribute_class('table', 'menu')." border=\"0\"
cellspacing=\"0\">${begin_row}\n"
- . $text . "${end_row}</table>\n";
- }
-}
-
-# formats a menu entry link pointing to a node or section
-#
-# arguments:
-# the entry text
-# the state, a hash reference holding informations about the context, with a
-# usefull entry, 'preformatted', true if we are in a preformatted format
-# (a format keeping space between words). In that case a function
-# of the main program, main::do_preformatted($text, $state) might
-# be used to format the text with the current format style.
-# href is optionnal. It is the reference to the section or the node anchor
-# which should be used to make the link (typically it is the argument
-# of a href= attribute in a <a> element).
-sub html_default_menu_link($$$$$$$$)
-{
- my $element_name = shift;
- my $state = shift;
- my $href = shift;
- my $node = shift;
- my $title = shift;
- my $ending = shift;
- my $has_title = shift;
- my $command_stack = shift;
- my $preformatted = shift;
-
- my $in_commands = 0;
- $in_commands = 1 if ($command_stack->[-1] and $command_stack->[-1] ne
'menu' and $command_stack->[-1] ne 'detailmenu' and $command_stack->[-1] ne
'direntry');
-
- $title = '' unless ($has_title);
-#print STDERR "MENU_LINK($in_commands)($state->{'preformatted'})\n";
- my $entry;
- my $symbol = '';
- if ($preformatted)
- {
- $title .= ':' if ($title ne '');
- $entry = "$MENU_SYMBOL$title$node";
- }
- elsif ($element_name eq '' or get_conf('NODE_NAME_IN_MENU'))
- {
- if ($has_title)
- {
- $entry = "$title";
- }
- else
- {
- $entry = "$node";
- }
- $entry =~ s/^\s*//;
- $symbol = "$MENU_SYMBOL ";
- }
- else
- {
- $entry = $element_name;
- }
- $html_menu_entry_index++;
- my $accesskey;
- $accesskey = "accesskey=\"$html_menu_entry_index\"" if
(get_conf('USE_ACCESSKEY') and ($html_menu_entry_index < 10));
- $entry = &$anchor ('', $href, $entry, $accesskey) if (defined($href));
-
- return $entry.$ending if ($preformatted);
- # FIXME conditionalise to not having a description
- return "$symbol$entry$MENU_ENTRY_COLON" .' ' if ($in_commands);
- return "<tr><td align=\"left\"
valign=\"top\">$symbol$entry$MENU_ENTRY_COLON</td><td> </td>";
-}
-
-sub html_simplify_text($)
-{
- my $text = shift;
- $text =~ s/[^\w]//og;
- return $text;
-}
-
-# formats a menu entry description, ie the text appearing after the node
-# specification in a menu entry an spanning until there is another
-# menu entry, or empty line
-#
-# arguments:
-# the description text
-# the state. See menu_entry.
-# the heading of the element associated with the node.
-sub html_default_menu_description($$$$)
-{
- my $text = shift;
- my $state = shift;
- my $element_text = shift;
- my $command_stack = shift;
- my $preformatted = shift;
-
- my $in_commands = 0;
- $in_commands = 1 if ($command_stack->[-1] and $command_stack->[-1] ne
'menu' and $command_stack->[-1] ne 'detailmenu' and $command_stack->[-1] ne
'direntry');
- return $text if ($preformatted);
- return $text."<br>" if ($in_commands);
- if (get_conf('AVOID_MENU_REDUNDANCY'))
- {
- $text = '' if (html_simplify_text($element_text) eq
html_simplify_text($text));
- }
- return "<td align=\"left\" valign=\"top\">$text</td></tr>\n";
-}
-
-sub html_teletyped_in_stack($)
-{
- my $stack = shift;
- foreach my $element(reverse(@$stack))
- {
- return 1 if ($complex_format_map{$element} and
- $complex_format_map{$element}->{'style'} and
- $complex_format_map{$element}->{'style'} eq 'code');
- }
- return 0;
-}
-
-# text after @item in table, vtable and ftable
-sub html_default_table_item($$$$$$$)
-{
- my $text = shift;
- my $index_label = shift;
- my $format = shift;
- my $command = shift;
-# my $formatted_command = shift;
- my $style_stack = shift;
-# my $text_formatted = shift;
-# my $text_formatted_leading_spaces = shift;
-# my $text_formatted_trailing_spaces = shift;
- my $item_cmd = shift;
- my $formatted_index_entry = shift;
-
-# if (defined($text_formatted) and !exists
$special_list_commands{$format}->{$command})
-# {
-# $text = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
-# }
-# $formatted_command = '' if (!defined($formatted_command) or
-# exists($special_list_commands{$format}->{$command}));
- if (html_teletyped_in_stack($style_stack))
- {
-# $text .= '</tt>';
-# $formatted_command = '<tt>' . $formatted_command;
- $text = '<tt>' . $text . '</tt>';
- }
- $text .= "\n" . $index_label if (defined($index_label));
-# return '<dt>' . $formatted_command . $text . '</dt>' . "\n";
- return '<dt>' . $text . '</dt>' . "\n";
-}
-
-# format text on the line following the @item line (in table, vtable and
ftable)
-sub html_default_table_line($$$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- if ($text =~ /\S/)
- {
- return '<dd>' . $text . '</dd>' . "\n";# unless
($only_inter_item_commands);
- #return $text; # invalid without dd in ul
- }
- return '';
-}
-
-#my $cell_nr = -1;
-
-# row in multitable
-sub html_default_row($$$$$$$$)
-{
- my $text = shift;
- my $macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- # this is used to keep the cell number
- $html_default_multitable_stack[-1]->[0] = -1;
-
- if ($text =~ /\S/)
- {
- if ($macro eq 'headitem')
- {
- return '<thead><tr>' . $text . '</tr></thead>' . "\n";
- }
- return '<tr>' . $text . '</tr>' . "\n";
- }
- return '';
-}
-
-# cell in multitable
-sub html_default_cell($$$$$$$$)
-{
- my $text = shift;
- my $row_macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- $html_default_multitable_stack[-1]->[0]++;
- my $cell_nr = $html_default_multitable_stack[-1]->[0];
- my $fractions = '';
-
- if (defined($columnfractions) and (ref($columnfractions) eq 'ARRAY')
- and exists($columnfractions->[$cell_nr]))
- {
- my $fraction = sprintf('%d', 100*$columnfractions->[$cell_nr]);
- $fractions = " width=\"$fraction%\"";
- }
-
- # in constructs like
- # @strong{
- # @multitable ....
- # }
- # the space won't be removed since the <strong> is put before the space.
- $text =~ s/^\s*//;
- $text =~ s/\s*$//;
-
- if ($row_macro eq 'headitem')
- {
- return "<th${fractions}>" . $text . '</th>';
- }
- return "<td${fractions}>" . $text . '</td>';
-}
-
-sub html_default_format_list_item_texi($$$$$)
-{
- my $format = shift;
- my $line = shift;
- my $prepended = shift;
- my $command = shift;
- my $number = shift;
-
- my $result_line;
- my $open_command = 0;
- if (defined($command) and $command ne '' and !exists
$special_list_commands{$format}->{$command} and $format ne 'itemize')
- {
- address@hidden
- $open_command = 1;
- $line =~ s/^\s*//;
- $line =~ s/\s*$//;
- if (exists ($style_map{$command}))
- {
- $result_line = "address@hidden";
- }
- elsif (exists ($things_map{$command}))
- {
- $result_line = "address@hidden $line\n";
- }
- else
- {
- $result_line = "address@hidden $line\n";
- }
- }
- elsif (defined($prepended) and $prepended ne '')
- {
- $prepended =~ s/^\s*//;
- $prepended =~ s/\s*$//;
- $line =~ s/^\s*//;
- $result_line = $prepended . ' ' . $line;
- }
- return ($result_line, $open_command);
-}
-
-
-# format an item in a list
-#
-# argument:
-# text of the item
-# format of the list (itemize or enumerate)
-# command passed as argument to the format
-# formatted_command leading command formatted, if it is a thing command
-sub html_default_list_item($$$$$$$$$$$)
-{
- my $text = shift;
- my $format = shift;
- my $command = shift;
- my $formatted_command = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $prepended = shift;
- my $prepended_formatted = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- $formatted_command = '' if (!defined($formatted_command) or
- exists($special_list_commands{$format}->{$command}));
- my $prepend = '';
-# if (defined($prepended) and $prepended ne '')
-# {
-# $prepend = $prepended;
-# }
-# elsif ($formatted_command ne '')
- if ($formatted_command ne '')
- {
- $prepend = $formatted_command;
- }
- if ($text =~ /\S/)
- {
- return '<li>' . $prepend . $text . '</li>';
- }
- return '';
-}
-
-sub html_default_table_list($$$$$$$$$)
-{
- my $format_command = shift;
- my $text = shift;
- my $command = shift;
- my $formatted_command = shift;
-# enumerate
- my $item_nr = shift;
- my $enumerate_style = shift;
-# itemize
- my $prepended = shift;
- my $prepended_formatted = shift;
-# multitable
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
-# my $number = shift;
- $formatted_command = '' if (!defined($formatted_command) or
- exists($special_list_commands{$format}->{$command}));
- if ($format_command eq 'itemize')
- {
- return "<ul>\n" . $text . "</ul>\n" if (($command eq 'bullet') or
(($command eq '') and ($prepended eq '')));
- return html_default_attribute_class('ul',$NO_BULLET_LIST_CLASS).">\n"
. $text . "</ul>\n";
- }
- elsif ($format_command eq 'multitable')
- {
- pop @html_default_multitable_stack;
- return &$format('multitable', 'table', $text);
- }
-}
-
-# a paragraph
-# arguments:
-# $text of the paragraph
-# $align for the alignement
-# $indent for the indent style (indent or noindent)
-# The following is usefull if the paragraph is in an itemize.
-# $paragraph_command is the leading formatting command (like @minus)
-# $paragraph_command_formatted is the leading formatting command formatted
-# $paragraph_number is a reference on the number of paragraphs appearing
-# in the format. The value should be increased if a paragraph is done
-# $format is the format name (@itemize)
-sub html_default_paragraph($$$$$$$$$$$$)
-{
- my $text = shift;
- my $align = shift;
- my $indent = shift;
- my $paragraph_command = shift;
- my $paragraph_command_formatted = shift;
- my $paragraph_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-#print STDERR "format: $format\n" if (defined($format));
-#print STDERR "paragraph @$command_stack_at_end; @$command_stack_at_begin\n";
-# $paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
-# exists($special_list_commands{$format}->{$paragraph_command}));
- return '' if ($text =~ /^\s*$/);
-
- if (defined($paragraph_number) and defined($$paragraph_number))
- {
- $$paragraph_number++;
- return $text if (($format eq 'itemize' or $format eq 'enumerate') and
- ($$paragraph_number == 1));
- }
-
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- if ($top_stack eq 'multitable')
- {
- $html_default_multitable_stack[-1]->[1]++;
- if ($html_default_multitable_stack[-1]->[1] == 0)
- {
- return $text;
- }
- }
-
- my $open = '<p>';
- if ($align)
- {
- $open = "<p align=\"$paragraph_style{$align}\">";
- }
- return $open.$text.'</p>';
-}
-
-# a preformatted region
-# arguments:
-# $text of the preformatted region
-# $pre_style css style
-# $class identifier for the preformatted region (example, menu-comment)
-# The following is usefull if the preformatted is in an itemize.
-# $leading_command is the leading formatting command (like @minus)
-# $leading_command_formatted is the leading formatting command formatted
-# $preformatted_number is a reference on the number of preformatteds appearing
-# in the format. The value should be increased if a preformatted is done
-sub html_default_preformatted($$$$$$$$$$$$)
-{
- my $text = shift;
- my $pre_style = shift;
- my $class = shift;
- my $leading_command = shift;
- my $leading_command_formatted = shift;
- my $preformatted_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
-#print STDERR "preformatted @$command_stack_at_end;
@$command_stack_at_begin\n";
- return '' if ($text eq '');
- $leading_command_formatted = '' if (!defined($leading_command_formatted)
or
- exists($special_list_commands{$format}->{$leading_command}));
- if (defined($preformatted_number) and defined($$preformatted_number))
- {
- $$preformatted_number++;
- }
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- if ($top_stack eq 'multitable')
- {
- $text =~ s/^\s*//;
- $text =~ s/\s*$//;
- }
-
- return html_default_attribute_class('pre', $class).">".$text."</pre>";
-}
-
-sub html_default_heading_text($$$)
-{
- my $command = shift;
- my $text = shift;
- my $level = shift;
-
- return '' if ($text !~ /\S/);
- # FIXME use a class=*contents?
- my $class = '';
- if ($command =~ /^@/ and $command !~ /address@hidden/)
- {
- $class = $command;
- $class =~ s/^@//;
- $class = 'node-heading' if ($command eq '@node');
- }
- my $align = '';
- $align = ' align="center"' if ($command eq '@centerchap' or $command eq
'@settitle');
- $level = 1 if ($level == 0);
- my $result = html_default_attribute_class ("h$level", $class)
."$align>$text</h$level>";
- # FIXME titlefont appears inline in text, so no end of line is
- # added. The end of line should be added by the user if needed.
- $result .= "\n" unless ($command eq '@titlefont');
- $result .= $DEFAULT_RULE . "\n" if ($command eq '@part' and
defined($DEFAULT_RULE) and $DEFAULT_RULE ne '');
- return $result;
-}
-
-sub html_default_heading_text_preformatted($$$)
-{
- my $command = shift;
- my $text = shift;
- my $level = shift;
-
- return '' if ($text !~ /\S/);
- return '<strong>'.$text.'</strong>'."\n";
-}
-
-# formatting of raw regions
-# if L2H is true another mechanism is used for tex
-sub html_default_raw($$;$)
-{
- my $style = shift;
- my $text = shift;
- my $line_nr = shift;
- my $expanded = 1 if (grep {$style eq $_} @EXPAND);
- if ($style eq 'verbatim' or $style eq 'verbatiminclude' or ($style eq
'tex' and $expanded))
- {
- $style = 'verbatim' if ($style eq 'verbatiminclude');
- return html_default_attribute_class('pre', $style).">" .
&$protect_text($text) . '</pre>';
- }
- elsif ($style eq 'html' and $expanded)
- {
- chomp ($text);
- return $text;
- }
- elsif ($expanded)
- {
- main::line_warn (sprintf(__("Raw format %s is not converted"),
$style), $line_nr);
- return &$protect_text($text);
- }
- else
- {
- return '';
- }
-}
-
-# This function formats a footnote reference and the footnote text associated
-# with a given footnote.
-# The footnote reference is the text appearing in the main document pointing
-# to the footnote text.
-#
-# arguments:
-# absolute number of the footnote (in the document)
-# relative number of the footnote (in the page)
-# identifier for the footnote
-# identifier for the footnote reference in the main document
-# main document file
-# footnote text file
-# array with the footnote text lines
-# the state. See menu entry.
-#
-# returns:
-# reference on an array containing the footnote text lines which should
-# have been updated
-# the text for the reference pointing on the footnote text
-sub html_default_foot_line_and_ref($$$$$$$$$)
-{
- my $number_in_doc = shift;
- my $number_in_page = shift;
- my $footnote_id = shift;
- my $place_id = shift;
- my $document_file = shift;
- my $footnote_file = shift;
- my $lines = shift;
- my $document_state = shift;
-
- if ($document_file eq $footnote_file)
- {
- $document_file = $footnote_file = '';
- }
-
- $number_in_doc = $NO_NUMBER_FOOTNOTE_SYMBOL if
(!get_conf('NUMBER_FOOTNOTES'));
-
- unshift (@$lines, '<h3>' .
- &$anchor($footnote_id, $document_file . "#$place_id",
- "($number_in_doc)")
- . "</h3>\n");
- # this is a bit obscure, this allows to add an anchor only if formatted
- # as part of the document.
- #$place_id = '' if ($document_state->{'outside_document'} or
$document_state->{'multiple_pass'} or $document_state->{'expansion'});
- $place_id = '' if ($document_state->{'outside_document'} or
(defined($document_state->{'multiple_pass'}) and
$document_state->{'multiple_pass'} > 0));
- return ($lines, &$anchor($place_id, $footnote_file . "#$footnote_id",
- "($number_in_doc)"));
-}
-
-# formats a group of footnotes.
-#
-# argument:
-# array reference on the footnotes texts lines
-#
-# returns an array reference on the group of footnotes lines
-sub html_default_foot_section($)
-{
- my $lines = shift;
- unshift (@$lines, html_default_attribute_class('div', 'footnote').">\n"
,"$DEFAULT_RULE\n",
- &$heading_text('footnotes', gdt('Footnotes'), 3)
- );
- push (@$lines, "</div>\n");
- return $lines;
-}
-
-sub html_default_image_files($$$$)
-{
- my $base = shift;
- my $extension = shift;
- my $texi_base = shift;
- my $texi_extension = shift;
- my @files = ();
- return @files if (!defined($base) or ($base eq ''));
- if (defined($extension) and ($extension ne ''))
- {
- push @files,["$base.$extension", "$texi_base.$texi_extension"];
- }
- foreach my $ext (@IMAGE_EXTENSIONS)
- {
- push @files,["$base.$ext", "$texi_base.$ext"];
- }
- return @files;
-}
-
-# format an image
-#
-# arguments:
-# image file name with path
-# image basename
-# a boolean true if we are in a preformatted format
-# image file name without path
-# alt text
-# width
-# height
-# raw alt
-# extension
-# path to working dir
-# path to file relative from working dir
-sub html_default_image($$$$$$$$$$$$$$$$$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- my $file_name = shift;
- my $alt = shift;
- my $width = shift;
- my $height = shift;
- my $raw_alt = shift;
- my $extension = shift;
- my $working_dir = shift;
- my $file_path = shift;
- my $in_paragraph = shift;
- my $file_locations = shift;
- my $base_simple_format = shift;
- my $extension_simple_format = shift;
- my $file_name_simple_format = shift;
- my $line_nr = shift;
-
- if (!defined($file_path) or $file_path eq '')
- {
- if (defined($extension) and $extension ne '')
- {
- $file = "$base.$extension";
- }
- else
- {
- $file = "$base.jpg";
- }
- main::line_warn (sprintf(__("address@hidden file `%s' (for HTML) not
found, using `%s'"), $base, $file), $line_nr);
- }
- elsif (! get_conf('COMPLETE_IMAGE_PATHS'))
- {
- $file = $file_name;
- }
- $alt = &$protect_text($base) if (!defined($alt) or ($alt eq ''));
- return "[ $alt ]" if ($preformatted);
- # it is possible that $file_name is more correct as it allows the user
- # to chose the relative path.
- $file = &$protect_text($file);
- return "<img src=\"$file\" alt=\"$alt\">";
-}
-
-# format a target in the main document for an index entry.
-#
-# arguments:
-# target identifier
-# boolean true if in preformatted format
-# FIXME document the remaining
-sub html_default_index_entry_label($$$$$$$$$)
-{
- my $identifier = shift;
- my $preformatted = shift;
- my $entry = shift;
- my $index_name = shift;
- my $index_command = shift;
- my $texi_entry = shift;
- my $formatted_entry = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
- return '' if (!defined($identifier) or ($identifier !~ /\S/));
- my $label = &$anchor($identifier);
- return $label . "\n" if (!$preformatted);
- return $label;
-}
-
-sub html_default_index_entry_command($$$$$$)
-{
- my $command = shift;
- my $index_name = shift;
- my $label = shift;
- my $entry_texi = shift;
- my $entry_formatted = shift;
- my $index_entry_ref = shift;
-
- return $label;
-}
-
-# process definition commands line @deffn for example
-sub html_default_def_line($$$$$$$$$$$$$$$$)
-{
- my $category_prepared = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- my $index_label = shift;
- my $arguments_array = shift;
- my $arguments_type_array = shift;
- my $unformatted_arguments_array = shift;
- my $command = shift;
- my $class_name = shift;
- my $category = shift;
- my $class = shift;
- my $style = shift;
- my $original_command = shift;
-
- $index_label = '' if (!defined($index_label));
- chomp($index_label);
- $category_prepared = '' if (!defined($category_prepared) or
($category_prepared =~ /^\s*$/));
- $name = '' if (!defined($name) or ($name =~ /^\s*$/));
- $type = '' if (!defined($type) or $type =~ /^\s*$/);
- if (!defined($arguments) or $arguments =~ /^\s*$/)
- {
- $arguments = '';
- }
- else
- {
- chomp ($arguments);
- $arguments = '<em>' . $arguments . '</em>';
- }
- my $type_name = '';
- $type_name = " <em>$type</em>" if ($type ne '');
- $type_name .= ' <strong>' . $name . '</strong>' if ($name ne '');
- $type_name .= $arguments;
- if (! get_conf('DEF_TABLE'))
- {
- return '<dt>'. $index_label. $category_prepared . ':' . $type_name .
"</dt>\n";
- }
- else
- {
- return "<tr><td align=\"left\">" . $type_name .
- "</td><td align=\"right\">" . $category_prepared . $index_label .
"</td></tr>\n";
- }
-}
-
-# a cartouche
-sub html_default_cartouche($$)
-{
- my $text = shift;
-
- if ($text =~ /\S/)
- {
- return html_default_attribute_class('table', 'cartouche')."
border=\"1\"><tr><td>\n" . $text . "</td></tr></table>\n";
- }
- return '';
-}
-
-sub html_default_sp($$)
-{
- my $number = shift;
- my $preformatted = shift;
- return "<br>\n" x $number if (!$preformatted);
- return "\n" x $number;
-}
-
-sub html_default_acronym_like($$$$$$)
-{
- my $command = shift;
- my $acronym_texi = shift;
- my $acronym_text = shift;
- my $with_explanation = shift;
- my $explanation_lines = shift;
- my $explanation_text = shift;
- my $explanation_simply_formatted = shift;
-
- my $attribute = $command;
- my $opening = "<$attribute>";
- if (defined($explanation_simply_formatted))
- {
- $opening = "<$attribute title=\"$explanation_simply_formatted\">";
- }
- if ($with_explanation)
- {
- return gdt('{acronym_like} ({explanation})', {'acronym_like' =>
$opening . $acronym_text . "</$attribute>", 'explanation' =>
$explanation_text},{'duplicate'=>1})
- }
- else
- {
- return $opening . $acronym_text . "</$attribute>";
- }
-}
-
-sub html_default_quotation($$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $argument_text = shift;
- my $argument_text_texi = shift;
- my $authors = shift;
- my $class = '';
- $class = $command if ($command ne 'quotation');
- my $attribution = '';
- if ($authors)
- {
- foreach my $author (@$authors)
- {
- my $author_texi = $author->{'author_texi'};
- chomp($author_texi);
- $attribution .= gdt("address@hidden --- address@hidden", {'author'
=> $author_texi}, {'duplicate' => 1, 'allow_paragraph' => 1});
- }
- }
- return html_default_attribute_class('blockquote', $class).">\n" . $text
."</blockquote>\n" . $attribution;
-}
-
-# format a whole index
-#
-# argument:
-# index text
-# index name
-sub html_default_print_index($$)
-{
- my $text = shift;
- my $name = shift;
- return '' if (!defined($text));
- return html_default_attribute_class('table', "index-$name")."
border=\"0\">\n" .
- "<tr><td></td><th align=\"left\">" . gdt('Index Entry') .
"</th><td> </td><th align=\"left\"> " . gdt('Section') . "</th></tr>\n"
- . "<tr><td colspan=\"4\"> $DEFAULT_RULE</td></tr>\n" . $text .
- "</table>\n";
-}
-
-# format a letter entry in an index page. The letter entry contains
-# the index entries for the words beginning with that letter. It is
-# a target for links pointing from the summary of the index.
-#
-# arguments:
-# the letter
-# identifier for the letter entry. This should be used to make the target
-# identifier
-# text of the index entries
-sub html_default_index_letter($$$)
-{
- my $letter = shift;
- my $id = shift;
- my $text = shift;
- return $text if ($letter =~ /^\s*$/);
- return '<tr><th>' . &$anchor($id,'',&$normal_text($letter, 0, 0, 0, 0, 0,
[])) .
- "</th><td></td><td></td></tr>\n" . $text .
- "<tr><td colspan=\"4\"> $DEFAULT_RULE</td></tr>\n";
-}
-
-# format an index entry (in a letter entry).
-#
-# arguments:
-# href to the main text, linking to the place where the index entry appears
-# entry text
-# href to the main text, linking to the section or node where the index
-# entry appears
-# section or node heading
-sub html_default_index_entry($$$$$$$$$$)
-{
- my $text_href = shift;
- my $entry = shift;
- my $element_href = shift;
- my $element_text = shift;
- my $entry_file = shift;
- my $current_element_file = shift;
- my $entry_target = shift;
- my $entry_element_target = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
- return '' if ($entry !~ /\S/);
- my $element = $index_entry_ref->{'real_element'};
- if (defined($element))
- {
- my $element_set = 0;
- if (get_conf('NODE_NAME_IN_INDEX'))
- {
- if ($element->{'node'})
- {
- $element_set = 1;
- }
- elsif ($element->{'with_node'})
- {
- $element = $element->{'with_node'};
- $element_set = 1;
- }
- }
- elsif (defined(get_conf('NODE_NAME_IN_INDEX')))
- {
- if (!$element->{'node'})
- {
- $element_set = 1;
- }
- elsif ($element->{'with_section'})
- {
- $element = $element->{'with_section'};
- $element_set = 1;
- }
- }
- if ($element_set)
- {
- $element_href = main::href($element,
$Texi2HTML::THIS_ELEMENT->{'file'},
- $Texi2HTML::THISDOC{'line_nr'});
- $element_text = $element->{'text'};
- }
- }
-
- return '<tr><td></td><td valign="top">' . &$anchor('', $text_href, $entry)
- . $INDEX_ENTRY_COLON . '</td><td> </td><td valign="top">' .
&$anchor('', $element_href, $element_text)
- . "</td></tr>\n";
-}
-
-
-# format an index summary. This is a list of letters linking to the letter
-# entries.
-#
-# arguments:
-# array reference containing the formatted alphabetical letters
-# array reference containing the formatted non lphabetical letters
-sub html_default_index_summary($$)
-{
- my $alpha = shift;
- my $nonalpha = shift;
-
- my $join = '';
- my $nonalpha_text = '';
- my $alpha_text = '';
- $join = " \n<br>\n" if (@$nonalpha and @$alpha);
- if (@$nonalpha)
- {
- $nonalpha_text = join("\n \n", @$nonalpha) . "\n";
- }
- if (@$alpha)
- {
- $alpha_text = join("\n \n", @$alpha) . "\n \n";
- }
- return "<table><tr><th valign=\"top\">" . gdt('Jump to') .":
</th><td>" .
- $nonalpha_text . $join . $alpha_text . "</td></tr></table>\n";
-}
-
-sub html_default_element_label($$$$)
-{
- my $id = shift;
- my $element = shift;
- my $command = shift;
- my $line = shift;
-
- return &$anchor($id) . "\n";
-}
-
-sub html_default_misc_element_label($$)
-{
- my $id = shift;
- my $misc_page_name = shift;
- return &$anchor($id) . "\n";
-}
-
-sub html_default_anchor_label($$$$)
-{
- my $id = shift;
- my $anchor_text = shift;
- my $anchor_reference = shift;
- my $in_special_region = shift;
- return &$anchor($id);
-}
-
-sub html_default_tab_item_texi($$$$$$)
-{
- my $command = shift;
- my $commands_stack = shift;
- my $stack = shift;
- my $state = shift;
- my $line = shift;
- my $line_nr = shift;
-
- if (defined($commands_stack) and @$commands_stack and $commands_stack->[-1]
eq 'multitable' and @html_default_multitable_stack)
- {
- $html_default_multitable_stack[-1]->[1] = -1;
- }
- return undef;
-}
-
-sub html_default_line_command($$$$)
-{
- my $command = shift;
- my $arg_text = shift;
- my $arg_texi = shift;
- my $state = shift;
-
- return '' if ($arg_text eq '' or ($command eq 'author' and
(!$state->{'region'} or $state->{'region'} ne 'titlepage')));
- my $style = $line_command_map{$command};
- if ($style)
- {
- my $attribute_text = '';
- if ($style =~ /^(\w+)(\s+.*)/)
- {
- $style = $1;
- $attribute_text = $2;
- }
- $arg_text = "<${style}$attribute_text>$arg_text</$style>";
- }
- $arg_text .= "<br>" if ($command eq 'author');
- $arg_text .= "\n";
- return $arg_text;
-}
-
-1;
Index: texi2html/formats/info.init
===================================================================
RCS file: texi2html/formats/info.init
diff -N texi2html/formats/info.init
--- texi2html/formats/info.init 24 Oct 2010 22:52:52 -0000 1.60
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,3662 +0,0 @@
-# vim: set filetype=perl:
-#
-#+##############################################################################
-#
-# info.init: convert to info
-#
-# Copyright (C) 2008, 2009, 2010 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-#
-# Some error messages come from texinfo (makeinfo), so copyright holder
-# is the FSF or the individual who wrote them. All come from before the
-# switch of texinfo to GPLv3+.
-#
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-use Data::Dumper;
-
-use strict;
-
-$Data::Dumper::Maxdepth = 25;
-
-my %info_default_indented_commands;
-my %info_default_format;
-my %info_default_enable_encoding_accents;
-my @simple_quoted_commands;
-my @asis_commands;
-my @chevron_commands;
-my %info_default_accent_commands = ();
-my %info_default_leaf_command = ();
-my $info_default_end_sentence_character;
-my $info_default_after_punctuation_characters;
-my $info_default_indent_length;
-my %info_default_indent_format_length;
-my $info_default_index_length_to_node;
-my $info_default_listoffloat_caption_entry_length;
-my $info_default_listoffloat_append;
-my %info_default_index_entries_counts;
-
-sub info_default_load(;$)
-{
-my $from_command_line = shift;
-
-t2h_default_set_variables_default();
-set_default('USE_SECTIONS', 0);
-set_default('USE_NODES', 1);
-set_default('SPLIT', '');
address@hidden = ('info', 'direntry');
-set_default('EXTENSION', 'info');
-set_default('SHOW_MENU', 1);
-set_default('SHOW_TITLE', 0);
-set_default('USE_SETFILENAME_EXTENSION', 1);
-set_default('INLINE_INSERTCOPYING', 1);
-set_default('SIMPLE_MENU', 1);
-$MENU_SYMBOL = '*';
-set_default('ENABLE_ENCODING_USE_ENTITY', 0);
-set_default('ENABLE_ENCODING', 1);
address@hidden = ('png', 'jpg', 'txt');
-$CAPTION_STYLE = 'asis';
-set_default('DEFAULT_ENCODING', 'ascii');
-set_default('HEADERS', 1);
-set_default('INLINE_CONTENTS', 0);
-
-
-$no_paragraph_commands{'anchor'} = 1;
-
-%simple_map = %default_simple_map;
-%simple_map_pre = %simple_map;
-%simple_map_texi = %simple_map;
-
-%things_map = %default_things_map;
-%pre_map = %things_map;
-
-%line_command_map = (
- 'dircategory' => ''
-);
-
-# sc and var upcase.
address@hidden = ('cite', 'code', 'command', 'env', 'file', 'kbd',
- 'option', 'samp');
address@hidden = ('asis', 'w', 'b', 'ctrl', 'i', 'math', 'sc', 't', 'r',
- 'slanted', 'sansserif', 'var', 'titlefont', 'verb', 'clickstyle',
- 'headitemfont');
address@hidden = ('key', 'indicateurl');
-
-%info_default_accent_commands = ();
-%info_default_leaf_command = ();
-
-%style_map = ();
-t2h_default_copy_style_map (\%default_style_map, \%style_map);
-
-foreach my $accent_command ('tieaccent', 'dotless', keys(%unicode_accents),
keys(%accent_map))
-{
- $info_default_accent_commands{$accent_command} = 1;
- $style_map{$accent_command} = { 'function' => \&info_default_accent };
-}
-
-foreach my $command (keys(%style_map))
-{
- delete $style_map{$command}->{'quote'} if
(exists($style_map{$command}->{'quote'}));
- if (grep {$_ eq $command} @simple_quoted_commands)
- {
- delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
- $style_map{$command}->{'begin'} = '`';
- $style_map{$command}->{'end'} = "'";
- next;
- }
- elsif (grep {$_ eq $command} @asis_commands)
- {
- delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
- delete $style_map{$command}->{'begin'} if
(exists($style_map{$command}->{'begin'}));
- delete $style_map{$command}->{'end'} if
(exists($style_map{$command}->{'end'}));
- }
- if (grep {$_ eq $command} @chevron_commands)
- {
- delete $style_map{$command}->{'function'} if
(exists($style_map{$command}->{'function'}));
- $style_map{$command}->{'begin'} = '<';
- $style_map{$command}->{'end'} = '>';
- next;
- }
- $info_default_leaf_command{$command} = 1 if
($style_map{$command}->{'type'} and $style_map{$command}->{'type'} eq
'simple_style');
-}
-
-$style_map{'strong'}->{'begin'} = '*';
-$style_map{'strong'}->{'end'} = '*';
-$style_map{'dfn'}->{'begin'} = '"';
-$style_map{'dfn'}->{'end'} = '"';
-$style_map{'emph'}->{'begin'} = '_';
-$style_map{'emph'}->{'end'} = '_';
-
-
-foreach my $command (keys(%info_default_leaf_command))
-{
- if (defined ($style_map{$command}->{'args'}))
- {
- $style_map{$command}->{'orig_args'} = [
@{$style_map{$command}->{'args'}} ];
- }
- else
- {
- $style_map{$command}->{'orig_args'} = [ 'normal' ];
- }
- $style_map{$command}->{'args'} = [];
- foreach my $arg (@{$style_map{$command}->{'orig_args'}})
- {
- push @{$style_map{$command}->{'args'}}, 'keep';
- }
-}
-
-$style_map{'uref'}->{'function'} = \&info_default_uref;
-$style_map{'url'}->{'function'} = \&info_default_uref;
-$style_map{'email'}->{'function'} = \&info_default_email;
-
-%style_map_pre = ();
-%style_map_texi = ();
-t2h_default_copy_style_map (\%style_map, \%style_map_pre);
-t2h_default_copy_style_map (\%style_map, \%style_map_texi);
-
-$special_list_commands{'itemize'} = {};
-
-%info_default_indent_format_length = ('enumerate' => 2,
- 'itemize' => 3,
- 'table' => 0,
- 'vtable' => 0,
- 'ftable' => 0,
- );
-
-
-%format_map = ();
-foreach my $format ('group', 'raggedright', 'cartouche')
-{
- $format_map{$format} = '';
-}
-
-foreach my $menu_command('menu', 'detailmenu', 'direntry', 'menu_comment')
-{
- $complex_format_map{$menu_command} = {'begin' => '' , 'end' => ''};
-}
-
-foreach my $command (keys (%complex_format_map),
keys(%info_default_indent_format_length), 'quotation', 'smallquotation',
'deff_item', 'deff_itemx')
-{
- $info_default_indented_commands{$command} = 1;
-}
-
-foreach my $command (keys(%info_default_indented_commands), 'multitable',
'float', 'flushright', 'flushleft', 'center')
-{
- $info_default_format{$command} = 1;
-}
-
-# it doesn't change anything for multitable
-foreach my $non_indented_command('format', 'smallformat', 'menu',
- 'detailmenu', 'direntry', 'multitable')
-{
- $info_default_indented_commands{$non_indented_command} = 0;
-}
-
-$info_default_end_sentence_character = quotemeta($punctuation_characters);
-$info_default_after_punctuation_characters =
quotemeta($after_punctuation_characters);
-$info_default_indent_length = 5;
-
-$info_default_index_length_to_node = 41;
-
-$info_default_listoffloat_caption_entry_length = 41;
-$info_default_listoffloat_append = '...';
-
-t2h_default_push_handler(\&info_default_init_accent_enable_encoding,
address@hidden);
-t2h_default_push_handler(\&info_default_init_variables, address@hidden);
-
-
-$style = \&info_default_style;
-$print_page_head = \&info_default_print_page_head;
-$contents = \&info_default_noop;
-$shortcontents = \&info_default_noop;
-$about_body = \&info_default_noop;
-$print_Footnotes = \&info_default_noop;
-$copying_comment = \&info_default_copying_comment;
-$element_heading = \&info_default_element_heading;
-$heading = \&info_default_heading;
-$normal_text = \&info_default_normal_text;
-$paragraph = \&info_default_paragraph;
-$preformatted = \&info_default_preformatted;
-$empty_preformatted = \&info_default_preformatted;
-$empty_line = \&info_default_empty_line;
-# maybe should not be called from the main program?
-$print_page_foot = \&info_default_print_page_foot;
-$print_Top_footer = \&info_default_print_Top_footer;
-$print_Top = \&info_default_print_section;
-$print_section = \&info_default_print_section;
-$end_section = \&info_default_end_section;
-$one_section = \&info_default_one_section;
-$begin_format_texi = \&info_default_begin_format_texi;
-$begin_style_texi = \&info_default_begin_style_texi;
-$begin_paragraph_texi = \&info_default_begin_paragraph_texi;
-$simple_command = \&info_default_simple_command;
-$thing_command = \&info_default_thing_command;
-$begin_special_region = \&info_default_begin_special_region;
-$end_special_region = \&info_default_end_special_region;
-$anchor_label = \&info_default_anchor_label;
-$element_label = \&info_default_noop;
-$menu_link = \&info_default_menu_link;
-#$menu_command = \&info_default_menu_command;
-$complex_format = \&info_default_complex_format;
-$quotation = \&info_default_quotation;
-$misc_command_line = \&info_default_misc_commands;
-$external_ref = \&info_default_external_ref;
-$internal_ref = \&info_default_internal_ref;
-$image = \&info_default_image;
-$image_files = \&info_default_image_files;
-$index_summary = \&info_default_index_summary;
-$summary_letter = \&info_default_summary_letter;
-$index_entry = \&info_default_index_entry;
-$index_entry_command = \&t2h_default_index_entry_command;
-$index_letter = \&info_default_index_letter;
-$printindex = \&info_default_printindex;
-$print_index = \&info_default_print_index;
-$index_entry_label = \&info_default_index_entry_label;
-$foot_section = \&info_default_foot_lines;
-$foot_line_and_ref = \&info_default_foot_line_and_ref;
-$footnote_texi = \&info_default_footnote_texi;
-$list_item = \&info_default_list_item;
-$format_list_item_texi = \&info_default_format_list_item_texi;
-$format = \&info_default_format;
-$tab_item_texi = \&info_default_tab_item_texi;
-$acronym_like = \&info_default_acronym_like;
-$sp = \&info_default_sp;
-$paragraph_style_command = \&info_default_paragraph_style_command;
-$cell = \&info_default_cell;
-$row = \&info_default_row;
-$table_list = \&info_default_table_list;
-$def_item = \&info_default_def_item;
-$def = \&info_default_def;
-$def_line = \&info_default_def_line;
-$float = \&info_default_float;
-$listoffloats_entry = \&info_default_listoffloats_entry;
-$listoffloats = \&info_default_listoffloats;
-$colon_command = \&info_default_colon_command;
-$raw = \&info_default_raw;
-$line_command = \&info_default_line_command;
-$comment = \&t2h_default_comment;
-$unknown_style = \&info_default_unknown_style;
-$heading_text = \&t2h_default_heading_text;
-
-}
-
-my %info_default_state_map = ();
-my $info_default_out_file_nr = 1;
-my $info_default_dir_specification = '';
-my @info_default_pending_indirect = ();
-my @info_default_pending_footnotes = ();
-my $info_default_state_nr = 0;
-
-# maximal length of index entries line number information. Each entry is
-# an index name.
-my %info_default_index_line_string_length = ();
-my %info_default_index_entries = ();
-my $info_default_footnote_index = 0;
-my $info_default_current_node = undef;
-
-my %info_default_command_handler_expand;
-
-sub info_default_intercept_handler
-{
- my $command = $_[0];
- my $result = &{$info_default_command_handler_expand{$command}}(@_);
- return info_default_store_text (undef, $result, $command);
-}
-
-sub info_default_init_variables()
-{
- %info_default_state_map = ();
- $info_default_out_file_nr = 1;
- $info_default_dir_specification = '';
- @info_default_pending_indirect = ();
- @info_default_pending_footnotes = ();
- $info_default_state_nr = 0;
-
- %info_default_index_line_string_length = ();
- %info_default_index_entries = ();
- $info_default_footnote_index = 0;
- $info_default_current_node = undef;
- #$Texi2HTML::THISDOC{'SPLIT'} = 0 if ($OUTPUT_FORMAT eq 'info');
- #$FRAMES = 0 if ($OUTPUT_FORMAT eq 'info');
-
- foreach my $command (keys (%command_handler))
- {
- if ($command_handler{$command}->{'expand'})
- {
- $info_default_command_handler_expand{$command} =
$command_handler{$command}->{'expand'};
- $command_handler{$command}->{'expand'} =
\&info_default_intercept_handler;
- }
- }
-}
-
-# this is put in command_handler_init such that it sets things right
-# in case ENABLE_ENCODING is set and has lead to modification of the
-# accent functions
-sub info_default_init_accent_enable_encoding()
-{
- return unless (get_conf('ENABLE_ENCODING') and get_conf('USE_UNICODE'));
- foreach my $key (keys(%unicode_accents), 'dotless')
- {
- $info_default_enable_encoding_accents{$key} = 1;
- $t2h_enable_encoding_default_accent{'normal'}->{$key} =
\&t2h_default_accent;
- $t2h_enable_encoding_default_accent{'texi'}->{$key} =
\&t2h_default_accent;
- $t2h_enable_encoding_default_accent{'pre'}->{$key} = \&t2h_default_accent;
- $style_map{$key}->{'function'} = \&info_default_accent;
- $style_map_texi{$key}->{'function'} = \&info_default_accent;
- $style_map_pre{$key}->{'function'} = \&info_default_accent;
- }
-}
-
-sub info_default_uref($$)
-{
- shift;
- my $args = shift;
- my $url = shift @$args;
- my $text = shift @$args;
- my $replacement = shift @$args;
- $url = main::normalise_space($url);
- $replacement = '' if (!defined($replacement));
- $replacement = main::normalise_space($replacement);
- return $replacement if ($replacement ne '');
- $text = '' if (!defined($text));
- $text = main::normalise_space($text);
- return "`$url'" if ($text eq '');
- return "$text ($url)";
-}
-
-sub info_default_email($$)
-{
- my $command = shift;
- my $args = shift;
- my $mail = shift @$args;
- my $text = shift @$args;
- $mail = main::normalise_space($mail);
- $text = '' if (!defined($text));
- $text = main::normalise_space($text);
- $mail = "<$mail>";
- return $mail unless ($text ne '');
- return "$text $mail";
-}
-
-
-sub info_default_accent($$$)
-{
- my @args = @_;
- my $command = shift;
- my $args = shift;
- my $text = $args->[0];
- my $style_stack = shift;
- my $state = shift;
-
- my $result;
- if (get_conf('ENABLE_ENCODING') and
$info_default_enable_encoding_accents{$command})
- {
- $result = &t2h_enable_encoding_normal_accent(@args);
- }
- else
- {
- $result = &t2h_default_accent(@args);
- }
- if (scalar(@$style_stack) and
$info_default_accent_commands{$style_stack->[-1]})
- { # still more accents on the stack
- return $result;
- }
- return info_default_store_text($state,$result,'accents_commands');
-}
-
-sub info_default_noop
-{
- return '';
-}
-
-sub info_default_copying_comment($$$$)
-{
- my $copying_lines = shift;
- my $copying_text = shift;
- my $copying_no_texi = shift;
- my $copying_simple_text = shift;
- return '' if ($copying_text eq '');
- return $copying_text;
-}
-
-sub info_default_byte_count($)
-{
- my $string = shift;
- my $out_encoding = get_conf('OUT_ENCODING');
- if ($out_encoding and lc($out_encoding) ne 'us-ascii' and
get_conf('USE_UNICODE'))
- {
- return length (Encode::encode($out_encoding, $string));
- }
- # There is no default encoding. We assume it is us-ascii. Not sure
- # about what perl thinks it is...
- #print STDERR "Unknown encoding for: $string\n" if (!$out_encoding);
- return length($string);
-}
-
-sub info_default_count_lines($;$$)
-{
- my $text = shift;
- my $indent_length = shift;
- my $indentation_done = shift;
-
- my $blank_line;
- my $no_indentation = 0;
-
- if (!defined($indentation_done) or $indentation_done)
- {
- $no_indentation = 1;
- $indent_length = 0;
- }
- my @lines = split /^/, $text;
- # don't accept empty text.
- @lines = ('') if (address@hidden);
- my $line_passed = scalar(@lines);
- $line_passed-- if ($line_passed);
-
- my $end_of_line = 0;
- if (($#lines > 1) and !$end_of_line and ($lines[-1] !~ /\S/) and
($lines[-2] !~ /\S/))
- {
- $blank_line = 1;
- }
- my $last_line = $lines[-1];
-
- my $indented_text = shift (@lines);
- #print STDERR "COUNT info_default_count_lines(i_done $no_indentation,
i_l $indent_length) i_t `$indented_text'\n";
- foreach my $line (@lines)
- {
- if ($indent_length and $line =~ /\S/)
- {
- $indented_text .= ' ' x $indent_length . $line;
- }
- else
- {
- $indented_text .= $line;
- }
- }
- if (chomp($text))
- {
- $line_passed++;
- $end_of_line = 1;
- }
- return ($line_passed, $end_of_line, $last_line, $indented_text,
$blank_line);
-}
-
-sub info_default_get_state($)
-{
- my $state = shift;
- if (!exists $info_default_state_map{$state})
- {
- #print STDERR "NEW state $info_default_state_nr\n";
- my ($current_command, $top_stack);
- $info_default_state_map{$state} = {};
- info_default_reset_state($info_default_state_map{$state});
- # since the page head always leave a blank line, and the state may be
- # used for text right after the page head, we set it to 1 here.
- # it may be wrong in other contexts, to be seen.
- $info_default_state_map{$state}->{'blank_line'} = 1;
- $info_default_state_map{$state}->{'only_spaces'} = 1;
- # this is the first line, so set to 1. This is reset later in
- # most cases, when a node is seen, but may still be useful in
- # @footnote, for example
- $info_default_state_map{$state}->{'line_count'} = 1;
- $info_default_state_map{$state}->{'offset_in_file'} = 0;
- $info_default_state_map{$state}->{'nr'} = $info_default_state_nr;
- $info_default_state_map{$state}->{'state'} = $state;
- $info_default_state_map{$state}->{'multitable_stack'} = [];
- @{$info_default_state_map{$state}->{'align_stack'}} =
({'command'=>'normal'});
- $info_default_state_nr++;
- }
- #print STDERR "RETURN state $state $info_default_state_map{$state}
$info_default_state_map{$state}->{'nr'}\n";
- return $info_default_state_map{$state};
-}
-
-sub info_default_reset_state($)
-{
- my $info_state = shift;
- $info_state->{'top'} = {};
- $info_state->{'current'} = $info_state->{'top'};
-}
-
-sub info_default_iterator_next($$$)
-{
- my $current_command = shift;
- my $command_index = shift;
- my $command_close = shift;
- #print STDERR "NNNNNNNNNNNNNN iterator_next current $current_command idx
$command_index close $command_close\n";
-
- my $sub_command = $current_command->{'content'}->[$command_index];
-
- if ($sub_command->{'content'} and !$command_close)
- {
- return ($sub_command, 0, 0);
- }
-
- if ($current_command->{'content'}->[$command_index+1])
- {
- return ($current_command, $command_index+1, 0);
- }
- elsif (defined($current_command->{'parent'}))
- {
- return ($current_command->{'parent'},
$current_command->{'index_in_parent'}, 1);
- }
- else
- {
- return (undef, undef, undef);
- }
-}
-
-# return ($current_next, $index_next, $close_next, $text, $command);
-#
-# returns the next in tree, identified by the triplet
-# ($current_next, $index_next, $close_next) and also the command
-# and/or text if defined, in $text and $command.
-sub info_default_next($$$)
-{
- my $current = shift;
- my $index = shift;
- my $close = shift;
-
- my $text;
- my $command;
-
- my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
- return ($current_next, $index_next, $close_next, $text, $command) if
(!defined($current_next));
-
- my $content = $current_next->{'content'}->[$index_next];
- $command = $content->{'command'} if (defined($content->{'command'}));
- if ($close_next)
- {
- return ($current_next, $index_next, $close_next, $content->{'end'},
$command);
- }
- if (defined($content->{'text'}))
- {
- return ($current_next, $index_next, $close_next, $content->{'text'},
$command);
- }
- if (defined($content->{'begin'}))
- {
- $text = $content->{'begin'};
- }
- if (defined($content->{'end'}) and !defined($content->{'content'}))
- {
- if (!defined($text))
- {
- $text = $content->{'end'};
- }
- else
- {
- $text .= $content->{'end'};
- }
- }
- return ($current_next, $index_next, $close_next, $text, $command);
-}
-
-
-sub info_default_process_line_text($$$)
-{
- my $text = shift;
- my $line_width_counter = shift;
- my $indent_length = shift;
- $indent_length = 0 if (!defined($indent_length));
-
- my $line_passed = 0;
- my $chomped_text = $text;
- my $end_of_line = chomp($chomped_text);
- if ($indent_length > $line_width_counter and $chomped_text ne '')
- {
- $text = ' ' x ($indent_length - $line_width_counter) . $text;
- }
- $line_width_counter += t2h_default_string_width($text);
- # it seems like it never happens in the tests.
- if ($end_of_line)
- {
- $line_passed = 1;
- $line_width_counter = 0;
- }
- return ($line_width_counter, $line_passed, $text);
-}
-
-# Beware that there is a pending word if the text doesn't end with
-# a space
-sub info_default_process_para_text($$$$$;$$)
-{
- my $text = shift;
- my $line_char_counter = shift;
- my $pending_spaces_word = shift;
- my $indent_length = shift;
- my $max_column = shift;
- my $keep_end_of_lines = shift;
- $keep_end_of_lines = 0 if (!$keep_end_of_lines);
-# indentation for the lines except for the first one
- my $indent_length_next = shift;
- $indent_length = 0 if (!defined($indent_length));
- $indent_length_next = $indent_length if (!defined($indent_length_next));
-
- my $line_passed = 0;
- my $result = '';
-
- #print STDERR
"process_text(indent($indent_length,$indent_length_next),keep_eol
$keep_end_of_lines) spaces `$pending_spaces_word->{'spaces'}')
line_char_counter $line_char_counter |$text|\n";
-
- while ($text ne '')
- {
- #print STDERR "l_c_c $line_char_counter pending_word
".var_to_str($pending_spaces_word->{'word'}).", pending_spaces
`$pending_spaces_word->{'spaces'}', result `$result'\n";
- if (!$keep_end_of_lines and $text =~ s/^(\s+)//)
- {
- my $new_spaces = $1;
- # in general there are no end of lines in the lines cut, since they
- # are replaced by spaces in the main loop. However, it may happen
- # with @* in @def* lines
- my @lines = split /^/, $new_spaces;
- my $eol_spaces;
- # last line is in $new_spaces, other lines are in $eol_spaces
- if (@lines > 1)
- {
- $new_spaces = pop @lines;
- $eol_spaces = join ("", @lines);
- #print STDERR
"EOL_SPACES[$line_char_counter](+$pending_spaces_word->{'spaces'})
`$eol_spaces'\n";
- }
- if (defined($pending_spaces_word->{'word'}))
- {
- # add spaces in front if needed for the indentation
- if ($indent_length > $line_char_counter +
t2h_default_string_width($pending_spaces_word->{'spaces'}))
- {
- $pending_spaces_word->{'spaces'} = ' ' x ($indent_length -
$line_char_counter) . $pending_spaces_word->{'spaces'};
- }
- $result .= $pending_spaces_word->{'spaces'} .
$pending_spaces_word->{'word'};
- $line_char_counter +=
t2h_default_string_width($pending_spaces_word->{'spaces'})+t2h_default_string_width($pending_spaces_word->{'word'});
- $pending_spaces_word->{'spaces'} = $new_spaces;
- $pending_spaces_word->{'word'} = undef;
- }
- elsif (!$eol_spaces)
- {
- $pending_spaces_word->{'spaces'} .= $new_spaces;
- }
- if ($eol_spaces)
- {
- $result .= $eol_spaces;
- $line_passed += scalar(@lines);
- $indent_length = $indent_length_next;
- $line_char_counter = 0;
- $pending_spaces_word->{'spaces'} = '';
- }
- if ((t2h_default_string_width($pending_spaces_word->{'spaces'}) +
$line_char_counter > $max_column))
- {
- $pending_spaces_word->{'spaces'} = '';
- $result .= "\n";
- $line_passed++;
- $indent_length = $indent_length_next;
- $line_char_counter = 0;
- }
- }
- else
- {
- my $word;
- if ($keep_end_of_lines)
- {
- $word = $text;
- $text = '';
- }
- elsif ($text =~ s/^([^\s]+)//)
- {
- $word = $1;
- }
- #else
- #{
- # die "BUG: Impossible situation.\n";
- #}
- $pending_spaces_word->{'word'} = '' if
(!defined($pending_spaces_word->{'word'}));
- $pending_spaces_word->{'word'} .= $word;
- # The $line_char_counter != 0 is here to cope with the case of a
- # word longer than $line_char_counter followed by more text:
- # a line would be passed each time some piece text is appended.
- if
((t2h_default_string_width($pending_spaces_word->{'spaces'})+t2h_default_string_width($pending_spaces_word->{'word'})
+ $line_char_counter > $max_column) and $line_char_counter != 0)
- {
- $pending_spaces_word->{'spaces'} = '';
- $result .= "\n";
- $line_passed++;
- $indent_length = $indent_length_next;
- $line_char_counter = 0;
- }
- }
- }
- return ($line_char_counter, $pending_spaces_word, $line_passed, $result)
-}
-
-sub info_default_skip_spaces($$$)
-{
- my $current = shift;
- my $index = shift;
- my $close = shift;
-
- #print STDERR "SKIP_SPACES\n";
- while(1)
- {
- my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
- return if ($close_next or (!defined($current_next)));
- my $content = $current_next->{'content'}->[$index_next];
- if (defined($content->{'begin'}))
- {
- $content->{'begin'} =~ s/^\s*//;
- #print STDERR "SKIP_SPACES begin\n";
- return if ($content->{'begin'} ne '');
- }
- if (defined($content->{'content'}) or
defined($content->{'format_name'})
- or $content->{'definition_line'})
- { # non empty commands stop space skipping, even if they contain
- # only spaces, like @asis{ }
- # also for item(x) that have format_name defined
- #print STDERR "SKIP_SPACES command?\n";
- return;
- }
- if (defined($content->{'text'}))
- {
- my $command = '';
- $command = $content->{'command'} if
(defined($content->{'command'}));
- #print STDERR "SKIP_SPACES($command) text\n";
- $content->{'text'} =~ s/^\s*//;
- return if ($content->{'text'} ne '');
- }
- if (defined($content->{'end'}))
- {
- #print STDERR "SKIP_SPACES end\n";
- $content->{'end'} =~ s/^\s*//;
- return if ($content->{'end'} ne '');
- }
- ($current, $index, $close) = ($current_next, $index_next, $close_next);
- }
-}
-
-sub info_default_store_pending($$;$)
-{
- my $line_char_counter = shift;
- my $pending_spaces_word = shift;
- my $indent_length = shift;
-
- $indent_length = 0 if (!defined($indent_length));
- my $indent_text = '';
- $indent_text = ' ' x $indent_length;
-
- #print STDERR "store_pending(spaces `$pending_spaces_word->{'spaces'}',
indent($indent_length) `$indent_text' word
`".var_to_str($pending_spaces_word->{'word'})."'\n";
- my $result = $pending_spaces_word->{'spaces'};
- $pending_spaces_word->{'spaces'} = '';
- if (defined($pending_spaces_word->{'word'}))
- {
- $result .= $pending_spaces_word->{'word'};
- $pending_spaces_word->{'word'} = undef;
- }
-
- my $chomped_result = $result;
- chomp ($chomped_result);
- if ($line_char_counter == 0 and $chomped_result ne '')
- {
- $result = $indent_text . $result;
- }
-
- $line_char_counter += t2h_default_string_width($result);
- return ($line_char_counter, $pending_spaces_word, $result);
-}
-
-sub info_default_output($)
-{
- my $info_state = shift;
- my $result = '';
- #print STDERR "Storing the stack\n";
- print STDERR "" . Data::Dumper->Dump([$info_state->{'top'}]) if
(get_conf('DEBUG'));
- my ($bytes_count, $lines_count);
- ($bytes_count, $result, $lines_count) =
info_default_process_content($info_state->{'top'}, $info_state);
- $info_state->{'offset_in_file'} += $bytes_count;
- $info_state->{'line_count'} += $lines_count;
- #print STDERR "HHHHHH($lines_count) $info_state->{'line_count'}: $result\n";
- info_default_reset_state($info_state)
- if (!defined($info_state->{'current'}->{'command'}));
- return $result;
-}
-
-sub info_default_process_content($$)
-{
- my $current_command = shift;
- my $info_state = shift;
-
- my $length = 0;
- my $result = '';
-
- my $line_char_counter = 0;
- my $all_line_passed = 0;
-
- my $pending_spaces_word;
- $pending_spaces_word->{'spaces'} = '';
- my $preformatted = 0;
- my $indent_level = 0;
- my $item_pending;
- my $in_exdent = 0;
- my $in_para = 0;
- my $in_w = 0;
- my $table_item_line = 0;
- my $in_table_item = 0;
- my $max_column = get_conf('FILLCOLUMN');
- my $direntry = 0;
- my $preformatted_format = 0;
- my $indent_length = 0;
-
- # for formats that needs to process a full line (center and flushright)
- # to know the line length before outputing
- my $current_line = undef;
-
- my ($current, $index, $close) = ($current_command, 0, 0);
-
- #print STDERR "info_default_process_content: $current_command\n";
- while(1)
- {
- last if (!defined($current));
- my $content = $current->{'content'}->[$index];
- my $text_added = '';
- my $line_added_before_item = 0;
- my $indentation_done = 0;
- my $prepend_newline;
-
- if (get_conf('DEBUG'))
- {
- my $text_item_pending = '';
- $text_item_pending = $item_pending if (defined($item_pending));
- my $text_length = '';
- $text_length = "$content->{'text'}" if defined($content->{'text'});
- my $text_command = '';
- $text_command = $content->{'command'} if
defined($content->{'command'});
- my $in_node_count = 0;
- $in_node_count = $info_state->{'line_count'} if
defined($info_state->{'line_count'});
- print STDERR
"($text_command|$text_length|$close|${all_line_passed}+$in_node_count|l_c_cnt
$line_char_counter) prfrmted $preformatted para $in_para indent_lvl
$indent_level($indent_length) in_exdent $in_exdent in_w $in_w only_spaces
$info_state->{'only_spaces'} blank_line $info_state->{'blank_line'}
table_item_line $table_item_line in_table_item $in_table_item item_pending
$text_item_pending spaces: `$pending_spaces_word->{'spaces'}' word:
".main::var_to_str($pending_spaces_word->{'word'})."\n";
- }
-
- if ($close)
- {
- if (defined($content->{'end'}))
- {
- $text_added .= $content->{'end'};
- }
- if ($complex_format_map{$content->{'command'}} and
$content->{'content'})
- {
- $preformatted_format--;
- }
- # the format is always empty in the main program so the warning
- # has to be done here
- if (defined($content->{'total_item_nr'}) and
!$content->{'total_item_nr'} and $content->{'content'})
- {
- main::line_warn (sprintf(__("address@hidden has text but no
address@hidden"), $content->{'command'}), $content->{'line_nr'});
- }
- # check whether there is a blank line following, to avoid adding
- # one when closing a format.
- # This is not a required check if not in preformatted since doubled
- # blank lines are discarded.
- my $followed_by_blank_line = 0;
- if ($preformatted_format)
- {
- my ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current, $index, $close);
- if (defined($command_next) and $command_next eq 'preformatted')
- {
- ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current_next, $index_next, $close_next);
- $followed_by_blank_line = 1 if (defined($text_next) and
$text_next =~ /^\s*$/);
- }
- }
-
- if ($info_default_indented_commands{$content->{'command'}})
- {
- $indent_level--;
- $indent_length = $indent_level * $info_default_indent_length;
- # $preformatteed cannot be used here since preformatted
- # is closed before the end of a format
- #if ($indent_level > 0 and !$info_state->{'blank_line'} and
$content->{'command'} !~ /^deff_item/ and !$preformatted_format)
- if ($indent_level > 0 and !$info_state->{'blank_line'} and
$content->{'command'} !~ /^deff_item/ and !$followed_by_blank_line)
- {
- $text_added .= "\n";
- }
- # this nullify a potential noindent in a random format
- $info_state->{'indent_para'} = undef;
- }
- elsif (($complex_format_map{$content->{'command'}} and
$content->{'command'} ne 'menu') or $content->{'command'} eq 'cartouche')
- {
- if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level > 0) and
!$followed_by_blank_line)
- {
- $text_added .= "\n";
- }
- }
- if ($content->{'command'} eq 'paragraph' and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal')
- {
- # if there is no space at the end of a paragraph, there may be
- # pending text, for example, if there is an ending line like
- # Some address@hidden a comment
- my $pending;
- ($line_char_counter, $pending_spaces_word, $pending) =
info_default_store_pending($line_char_counter, $pending_spaces_word,
$indent_length);
- $text_added .= $pending if (defined($pending));
- $text_added =~ s/\s*$//;
- $pending_spaces_word->{'spaces'} = '';
- $in_para = 0;
- $info_state->{'indent_para'} = undef;
- $text_added .= "\n" unless (($line_char_counter +
t2h_default_string_width($text_added)) == 0);
- }
- elsif ($content->{'command'} eq 'preformatted')
- {
- # if preformatted doesn't end with a newline, it is added here
- $text_added .= "\n" unless ($line_char_counter == 0);
- $preformatted--;
- }
- elsif ($content->{'command'} eq 'menu')
- {
- $text_added .= "\n" unless ($info_state->{'blank_line'});
- }
- elsif ($content->{'command'} eq 'float')
- {
- #$text_added = "\n" . $text_added unless
($info_state->{'blank_line'});
- $prepend_newline = 1 unless ($info_state->{'blank_line'});
- }
- elsif ($content->{'command'} eq 'w')
- {
- $in_w--;
- }
- elsif ($paragraph_style{$content->{'command'}})
- {
- my $popped = pop @{$info_state->{'align_stack'}};
- print STDERR "BUG".main::format_line_number().": align_stack,
popped $popped->{'command'} ne command $content->{'command'}\n" if
($popped->{'command'} ne $content->{'command'});
- }
- elsif ($content->{'command'} eq 'multitable')
- {
- my $multitable = pop @{$info_state->{'multitable_stack'}};
- if (!defined($multitable->{'cells'}) and ($result ne ''))
- {
- $multitable->{'result'} .= $result;
- $multitable->{'length'} += $length;
- $multitable->{'line_count'} += $all_line_passed;
- }
- $max_column = $multitable->{'max_column_kept'};
- $result = $multitable->{'result_kept'};
- $line_char_counter = $multitable->{'line_char_counter_kept'};
- $all_line_passed = $multitable->{'all_line_passed_kept'};
- $indent_level = $multitable->{'indent_level_kept'};
- $indent_length = $multitable->{'indent_length_kept'};
- #$indent_length_next_line = undef;
- $length = $multitable->{'length_kept'};
- $info_state->{'offset_in_file'} =
$multitable->{'offset_in_file_kept'};
- $info_state->{'line_count'} = $multitable->{'line_count_kept'};
- #print STDERR "MULTITABLE close, lines:
$multitable->{'line_count_kept'} + $all_line_passed\n";
- foreach my $anchor_and_index (@{$multitable->{'anchors'}},
@{$multitable->{'index_entries'}})
- {
- $anchor_and_index->{'line_nr'} +=
$multitable->{'line_count_kept'} + $all_line_passed;
- }
- if (! scalar(@{$info_state->{'multitable_stack'}}))
- {
- #print STDERR "MULTITABLE close, lengths:
$multitable->{'offset_in_file_kept'} + $length\n";
- foreach my $anchor (@{$multitable->{'anchors'}})
- {
- $anchor->{'info_offset'} +=
$multitable->{'offset_in_file_kept'} + $length;
- }
- }
- else
- {
- push
@{$info_state->{'multitable_stack'}->[-1]->{'anchors'}},
@{$multitable->{'anchors'}};
- push
@{$info_state->{'multitable_stack'}->[-1]->{'index_entries'}},
@{$multitable->{'index_entries'}};
- }
- $text_added .= $multitable->{'result'};
- $indentation_done = 1;
-
- goto new_text;
- }
- elsif ($content->{'command'} eq 'multitable_cell')
- {
- my $cell =
$info_state->{'multitable_stack'}->[-1]->{'cells'}->[-1];
- $cell->{'result'} = $result;
- $cell->{'length'} = $length;
- $cell->{'line_passed'} = $all_line_passed;
- }
- elsif ($content->{'command'} eq 'direntry')
- {
- $direntry--;
- # this has to be done here, otherwise, at the end, $direntry
- # would be 0
- $info_default_dir_specification .= $text_added;
- $text_added = '';
- }
- elsif ($content->{'command'} eq 'multitable_row')
- {
- my $multitable = $info_state->{'multitable_stack'}->[-1];
- my $indent_len = $multitable->{'indent_length_kept'};
- #print STDERR "INDENT: $indent_len\n";
- my $row_length = 0;
- my $row = '';
- my $max_lines = 0;
- my $cell_beginning = 0;
- my @anchor_lines_array;
- my $cell_idx = 0;
- my @anchors;
- my @indices;
- foreach my $cell (@{$multitable->{'cells'}})
- {
- $cell->{'beginning'} = $cell_beginning;
- $cell_beginning += $cell->{'cell_width'}+1;
- @{$cell->{'lines'}} = split /^/, $cell->{'result'};
- $max_lines = scalar(@{$cell->{'lines'}}) if
(scalar(@{$cell->{'lines'}}) > $max_lines);
- foreach my $anchor (@{$cell->{'anchors'}})
- {
- push @{$anchor_lines_array[$anchor->{'line_nr'}]},
$anchor;
- $anchor->{'cell_idx'} = $cell_idx;
- push @anchors, $anchor;
- }
- push @indices, @{$cell->{'index_entries'}};
- $cell_idx++;
- }
- my $previous_last_cell = scalar(@{$multitable->{'cells'}});
- #print STDERR "ROW cell_beginning $cell_beginning, max_lines
$max_lines, previous_last_cell $previous_last_cell\n";
- for (my $line_idx = 0; $line_idx < $max_lines; $line_idx++)
- {
- my $line_width = $indent_len;
- my $line_bytes = info_default_byte_count(' ' x$indent_len);
- my $line = '';
- # determine the last cell in the line, to fill spaces in
- # cells preceding that cell on the line
- my $last_cell = 0;
- for (my $cell_idx = 0; $cell_idx < $previous_last_cell;
$cell_idx++)
- {
- $last_cell = $cell_idx+1 if
(defined($multitable->{'cells'}->[$cell_idx]->{'lines'}->[$line_idx]));
- }
- #print STDERR " L(last_cell $last_cell): $line_idx\n";
- for (my $cell_idx = 0; $cell_idx < $last_cell; $cell_idx++)
- {
- my $cell_text =
$multitable->{'cells'}->[$cell_idx]->{'lines'}->[$line_idx];
- #print STDERR " C($cell_idx) ";
- if (defined($cell_text))
- {
- chomp($cell_text);
- #print STDERR "$cell_text";
- if ($line eq '' and $cell_text ne '')
- {
- $line = ' ' x $indent_len;
- }
- $line .= $cell_text;
- $line_width += t2h_default_string_width($cell_text);
- $line_bytes += info_default_byte_count($cell_text);
- }
- if ($cell_idx+1 < $last_cell)
- {
- if ($line_width < $indent_len +
$multitable->{'cells'}->[$cell_idx+1]->{'beginning'})
- {
- if ($line eq '')
- {
- $line = ' ' x $indent_len;
- }
- my $spaces = ' ' x ($indent_len +
$multitable->{'cells'}->[$cell_idx+1]->{'beginning'} - $line_width);
- $line_width += t2h_default_string_width($spaces);
- $line_bytes += info_default_byte_count($spaces);
- $line .= $spaces;
- #print STDERR " Csp($line_width) `$spaces'";
- }
- }
- }
- if (defined($anchor_lines_array[$line_idx]))
- {
- foreach my $anchor (@{$anchor_lines_array[$line_idx]})
- {
- my $anchor_position = $indent_len +
$anchor->{'line_char_counter'} +
$multitable->{'cells'}->[$anchor->{'cell_idx'}]->{'beginning'};
- if ($anchor_position > $line_width)
- {
- my $spaces = ' ' x ($anchor_position -
$line_width);
- $line .= $spaces;
- $line_width += t2h_default_string_width($spaces);
- $line_bytes += info_default_byte_count($spaces);
- }
- $anchor->{'info_offset'} = $line_bytes + $row_length
+ $multitable->{'length'};
- #print STDERR "ROW anchor close:
anchor[$anchor->{'cell_idx'}]($multitable->{'cells'}->[$anchor->{'cell_idx'}]->{'beginning'}+$anchor->{'line_char_counter'})
$anchor_position $anchor->{'info_offset'}\n";
- $anchor->{'line_char_counter'} = $anchor_position;
- }
- }
- $line .= "\n";
- $row_length += info_default_byte_count($line);
- #print STDERR " ($line_width,".length($line).") $line";
- $row .= $line;
- $previous_last_cell = $last_cell;
- }
- foreach my $anchor_and_index (@anchors, @indices)
- {
- $anchor_and_index->{'line_nr'} +=
$multitable->{'line_count'};
- #print STDERR "ROW close: new line count:
$anchor_and_index->{'line_nr'} + \n";
- }
- if ($content->{'item_command'} eq 'headitem')
- {
- # at this point cell_beginning is at the beginning of
- # the cell following the end of the table -> full width
- my $line = ' ' x $indent_len . '-' x $cell_beginning . "\n";
- $row .= $line;
- $row_length += info_default_byte_count($line);
- }
- #print STDERR "ROW_LENGTH $row_length\n";
- $multitable->{'result'} .= $row;
- $multitable->{'length'} += $row_length;
- $multitable->{'line_count'} += $max_lines;
- $multitable->{'cells'} = [];
- push @{$multitable->{'anchors'}}, @anchors;
- push @{$multitable->{'index_entries'}}, @indices;
- }
- }
- else
- {
- if ($content->{'command'})
- {
- # if processing a paragraph, there may be some pending text
- # and spaces, as the idea is to write them down only when
- # there is a space in case of pending text, or when there is some
- # text in case of pending space. So all the commands
- # that should write something within paragraph must flush the
- # pending text/spaces _before_ they output something, or the
- # text order will be reversed, with the pending things output
- # after the other commands text.
- my $pending_added_length = 0;
- my $pending_added_bytes = 0;
-
- if ($content->{'command'} eq 'anchor' or $content->{'command'}
eq 'image' or $content->{'command'} eq 'index_command' or $content->{'command'}
eq 'sp' or $content->{'raw_command'})
- {
- my $pending;
- ($line_char_counter, $pending_spaces_word, $pending) =
info_default_store_pending($line_char_counter, $pending_spaces_word,
$indent_length);
- # here spaces out of any environment are ignored.
- if ($in_para or $preformatted or $pending =~ /\S/)
- { # this has to be done before the anchor related code
- # to have the right count.
- # FIXME this is wrong if an end of line was passed.
- # in that case line_char_counter has been increased and
- # $pending ends with an end of line
- $pending_added_length +=
t2h_default_string_width($pending);
- $pending_added_bytes +=
info_default_byte_count($pending);
- $text_added .= $pending;
- }
- }
- if ($content->{'command'} eq 'strong')
- {
- my ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current, $index, $close);
- if (defined($text_next) and $text_next =~ /^Note\b/i)
- {
- main::line_warn(__("address@hidden produces a spurious
cross-reference in Info; reword to avoid that"), $content->{'line_nr'});
- }
- }
- elsif ($content->{'command'} eq 'w')
- {
- $in_w++ if ($content->{'content'});
- }
- elsif ($content->{'command'} eq 'anchor' or
($content->{'command'} eq 'float' and $content->{'anchor_reference'}))
- {
- #print STDERR "anchor: offset_in_file
$info_state->{'offset_in_file'}, line_count $info_state->{'line_count'},
line_char_counter $line_char_counter pending_added_length
$pending_added_length\n";
- $content->{'anchor_reference'}->{'info_offset'} = $length +
$info_state->{'offset_in_file'} + $pending_added_bytes;
- $content->{'anchor_reference'}->{'line_nr'} =
$all_line_passed + $info_state->{'line_count'};
- $content->{'anchor_reference'}->{'line_char_counter'} =
$line_char_counter + $pending_added_length;
- if (@{$info_state->{'multitable_stack'}})
- {
- if ($info_state->{'multitable_stack'}->[-1]->{'cells'})
- {
- push
@{$info_state->{'multitable_stack'}->[-1]->{'cells'}->[-1]->{'anchors'}},
$content->{'anchor_reference'};
- }
- else
- {
- push
@{$info_state->{'multitable_stack'}->[-1]->{'anchors'}},
$content->{'anchor_reference'};
- }
- }
- push @{$info_state->{'pending_tags'}},
$content->{'anchor_reference'};
- push @{$info_state->{'align_stack'}->[-1]->{'anchors'}},
$content->{'anchor_reference'} if
($info_state->{'align_stack'}->[-1]->{'command'} eq 'center' or
$info_state->{'align_stack'}->[-1]->{'command'} eq 'flushright');
- }
- elsif ($content->{'command'} eq 'index_label')
- {
- #print STDERR "FFFFFFFFF($content->{'index_command'})
$all_line_passed + $info_state->{'line_count'} `$content->{'texi_entry'}'\n";
- my $index_line_nr = $all_line_passed +
$info_state->{'line_count'};
- if ($info_state->{'blank_line'} and
$content->{'index_command'} =~ /index$/)
- {
- my ($current_next, $index_next, $close_next) =
info_default_iterator_next($current, $index, $close);
- $index_line_nr-- if (!defined($current_next));
- }
- elsif ($content->{'index_command'} =~ /^[vf]table$/)
- {
- # if in a table, index label is systematically entered after
- # the line is processed, as the line is processed with the
- # item command, while the index entry is entered with the
- # index_label callback that is done much later.
- $index_line_nr--;
- }
- #print STDERR "index in a blank_line
$content->{'index_command'} `$content->{'texi_entry'}'\n" if
($info_state->{'blank_line'});
- my $index_name =
$content->{'index_entry_reference'}->{'index_name'};
- $info_default_index_line_string_length{$index_name} =
t2h_default_string_width($index_line_nr)
- if
(!defined($info_default_index_line_string_length{$index_name}) or
$info_default_index_line_string_length{$index_name} <
t2h_default_string_width($index_line_nr));
- #print STDERR
"RRRRRRRRRRRRR($content->{'index_entry_reference'})
$content->{'index_entry_reference'}->{'texi'} name: $index_name line:
$index_line_nr max: $info_default_index_line_string_length{$index_name}\n";
- my $index_ref = { 'index_entry_reference' =>
$content->{'index_entry_reference'}, 'line_nr' => $index_line_nr };
-#print STDERR "INDEX($index_name) line $index_line_nr\n";
-
$info_default_index_entries{$content->{'index_entry_reference'}} = $index_ref;
- # there may be no cell in case of an empty multitable
- if (@{$info_state->{'multitable_stack'}})
- {
- if ($info_state->{'multitable_stack'}->[-1]->{'cells'})
- {
- push
@{$info_state->{'multitable_stack'}->[-1]->{'cells'}->[-1]->{'index_entries'}},
$index_ref;
- }
- else
- {
- push
@{$info_state->{'multitable_stack'}->[-1]->{'index_entries'}}, $index_ref;
- }
- }
- push @{$info_state->{'pending_index_entries'}}, $index_ref;
- }
- elsif ($content->{'command'} eq '*' and !$preformatted)
- {
- if (defined($pending_spaces_word->{'word'}))
- {
- $text_added .= $pending_spaces_word->{'spaces'} .
$pending_spaces_word->{'word'};
- $pending_spaces_word->{'word'} = undef;
- }
- # spaces preceding @* are skipped
- $pending_spaces_word->{'spaces'} = '';
- $text_added .= $content->{'text'};
- # just like following spaces
- info_default_skip_spaces($current, $index, $close);
- # this isn't done otherwise, though, here it is not important
- # since this end the line
- $line_char_counter +=
t2h_default_string_width($content->{'text'});
- goto new_text;
- }
- elsif ($content->{'command'} eq 'paragraph' and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal')
- {
- # empty paragraph
- goto new_text if (!$content->{'content'});
- my $paragraphindent = get_conf('paragraphindent');
- $paragraphindent = 0 if ($paragraphindent eq 'none');
- if ($paragraphindent ne 'asis')
- {
- info_default_skip_spaces($current, $index, $close);
- }
- # if within a format $content->{'paragraph_in_element_nr'}
- # should not be defined so no indentation will take place
- if ($paragraphindent ne 'asis' and $paragraphindent and
$line_char_counter == 0 and (defined($content->{'paragraph_in_element_nr'}))
and ($info_state->{'indent_para'} or (!defined($info_state->{'indent_para'})
and ($content->{'paragraph_in_element_nr'} or (get_conf('firstparagraphindent')
eq 'insert')))))
- {
- $text_added .= ' ' x $paragraphindent;
- }
- $in_para = 1;
- }
- elsif ($content->{'command'} eq 'preformatted')
- {
- $preformatted++ if ($content->{'content'});
- }
- elsif ($content->{'command'} eq 'exdent')
- {
- # if an end of line is added, in_exdent is set to 2 and
- # set to one when processing the end of line that was just
- # added, and set to 0 at the end of the line.
- # if there is no end of line added, it is only set to 1.
- if ($line_char_counter != 0)
- {
- $text_added .= "\n";
- $in_exdent = 2;
- }
- else
- {
- $in_exdent = 1;
- }
- $indent_length = ($indent_level -1) *
$info_default_indent_length if ($indent_level > 0);
- #goto new_text;
- }
- elsif ($content->{'command'} eq 'indent')
- {
- $info_state->{'indent_para'} = 1;
- }
- elsif ($content->{'command'} eq 'noindent')
- {
- $info_state->{'indent_para'} = 0;
- }
- elsif ($content->{'command'} eq 'sp')
- {
- $text_added .= $content->{'text'};
- goto new_text;
- }
- elsif ($content->{'command'} eq 'image')
- {
- # @image result count isn't counted in line_char_counter
- # since it is not displayed in info
- my $indent_added = 0;
- $indent_added = ($indent_length - $line_char_counter) if
($indent_length - $line_char_counter > 0);
- $text_added .= ' ' x $indent_added . $content->{'text'};
- $line_char_counter += $indent_added;
- goto new_text;
- }
- elsif ($content->{'command'} eq 'ref')
- { # adds a . if needed.
- if ($content->{'text'} !~ /[\.,]$/ and $content->{'text'} !~
/::$/)
- {
- my ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current, $index, $close);
- if (!defined($text_next) or $text_next !~ /^[\.,]/)
- {
- $content->{'text'} .= '.';
- }
- }
- }
- elsif ($content->{'command'} eq 'xref')
- { # warn if there is no punctuation following
- my ($current_next, $index_next, $close_next, $text_next,
$command_next) = info_default_next ($current, $index, $close);
- if (!defined($text_next) or $text_next !~ /^./)
- { # in makeinfo it is
- # "End of file reached while looking for `.' or `,'"
- # but maybe it may not be true.
- main::line_warn(__("`.' or `,' must follow
address@hidden"), $Texi2HTML::THISDOC{'line_nr'});
- }
- elsif ($text_next !~ /^[\.,]/)
- {
- my $char = substr($text_next, 0, 1);
- main::line_warn(sprintf(__("`.' or `,' must follow
address@hidden, not %s"), $char), $Texi2HTML::THISDOC{'line_nr'});
- }
- }
- elsif ($content->{'definition_line'})
- {
-
- my $dummy_line_passed;
- print STDERR "BUG: defined pending_word before
DEFINITION_LINE\n" if defined($pending_spaces_word->{'word'});
- #print STDERR
"DEFINITION_LINE($line_char_counter,$pending_spaces_word->{'spaces'},$indent_length,$in_para,$max_column):
$content->{'text'}";
- ($line_char_counter, $pending_spaces_word,
$dummy_line_passed, $text_added) =
info_default_process_para_text($content->{'text'}, $line_char_counter,
$pending_spaces_word, $indent_length, $max_column, 0,
$indent_length+2*$info_default_indent_length);
- $text_added .= $pending_spaces_word->{'spaces'};
- $pending_spaces_word->{'spaces'} = '';
- #print STDERR
"DEFINITION_LINE($line_char_counter,$pending_spaces_word->{'spaces'}) ->
$text_added";
- print STDERR "BUG: defined pending_word after
DEFINITION_LINE\n" if defined($pending_spaces_word->{'word'});
- $indentation_done = 1;
-
- goto new_text;
- }
- elsif (($content->{'command'} eq 'item' or $content->{'command'}
eq 'itemx') and exists
$info_default_indent_format_length{$content->{'format_name'}})
- {
- $item_pending = $content->{'format_name'};
- #if (!$info_state->{'blank_line'} and $content->{'command'}
eq 'item')
- my $first_item = 0;
-
- if ($content->{'command'} eq 'item')
- {
- if (!defined($content->{'parent'}->{'item_nr'}))
- {
- $content->{'parent'}->{'item_nr'} = 1;
- $first_item = 1;
- }
- else
- {
- $content->{'parent'}->{'item_nr'}++;
- }
- }
-
- if ($item_pending =~ /table$/)
- {
- $table_item_line = 1;
- $indent_length = ($indent_level -1) *
$info_default_indent_length if ($indent_level > 0);
- $in_table_item = 0;
- }
- else
- {
- $indent_length =
($info_default_indent_format_length{$item_pending}
- +($indent_level -1)* $info_default_indent_length);
- }
- if (!$info_state->{'blank_line'} and ($content->{'command'}
ne 'itemx') and (!$first_item or $indent_level > 1))
- {
- my $dummy_line_passed;
- ($line_char_counter, $dummy_line_passed, $text_added) =
info_default_process_line_text($text_added, $line_char_counter, $indent_length);
- $indentation_done = 1;
- $line_added_before_item = 1;
- $prepend_newline = 1;
- #$text_added = "\n" . $text_added;
- }
-
- if ($item_pending =~ /table$/)
- {
- # one less indentation level and no line break
- # adding line_added_before_item allows the table_item_line
to
- # still be active after the additional blank line
- $table_item_line = 1+$line_added_before_item;
- }
- else
- {
- info_default_skip_spaces($current, $index, $close);
- }
- }
- elsif ($content->{'command'} eq 'menu' or $content->{'command'}
eq 'listoffloats' or $content->{'heading_command'})
- {
- $text_added .= "\n" unless ($info_state->{'blank_line'});
- }
- elsif ($content->{'command'} eq 'direntry')
- {
- if ($content->{'content'})
- {
- $direntry++;
- }
- }
- elsif ($paragraph_style{$content->{'command'}})
- {
- goto new_text if (!$content->{'content'});
- push @{$info_state->{'align_stack'}}, {'command' =>
$content->{'command'}};
- }
- elsif ($content->{'command'} eq 'verbatim' or
$content->{'command'} eq 'verbatiminclude')
- {
- # $preformatted cannot be used here since preformatted
- # is closed before a verbatim, $preformatted_format is used
- if (!$preformatted_format and $indent_level != 0)
- {
- if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'})
- {
- $text_added .= "\n";
- }
- my $verb_text = $content->{'text'};
- my ($line_passed, $end_of_line, $last_line,
$text_indented, $blank_line) = info_default_count_lines($verb_text);
- $content->{'text'} .= "\n" unless ($blank_line or
($last_line =~ /^\s*$/));
- }
- }
- # other raw commands
- elsif ($content->{'raw_command'})
- {
- # not considered as in a paragraph even if in a paragraph
- $text_added .= $content->{'text'};
- goto new_text;
- }
- elsif ($content->{'command'} eq 'multitable' and
$content->{'content'})
- {
- my $indent_length_kept = $indent_level *
$info_default_indent_length;
- my $multitable = {
- 'offset_in_file_kept' => $info_state->{'offset_in_file'},
- 'line_count_kept' => $info_state->{'line_count'},
- 'columns_size' => [ @{$content->{'columns_size'}}
],
- 'result' => '',
- 'length' => 0,
- 'line_count' => 0,
- 'result_kept' => $result,
- 'length_kept' => $length,
- 'all_line_passed_kept' => $all_line_passed,
- 'line_char_counter_kept' => $line_char_counter,
- 'max_column_kept' => $max_column,
- 'indent_level_kept' => $indent_level,
- 'indent_length_kept' => $indent_length_kept,
- };
- push @{$info_state->{'multitable_stack'}}, $multitable;
- $info_state->{'offset_in_file'} = 0;
- $info_state->{'line_count'} = 0;
- $result = '';
- $length = 0;
- $all_line_passed = 0;
- $line_char_counter = 0;
- $indent_level = 0;
- $indent_length = 0;
- }
- elsif ($content->{'command'} eq 'multitable_row')
- {
- my $multitable = $info_state->{'multitable_stack'}->[-1];
- if (!defined($multitable->{'cells'}) and ($result ne ''))
- {
- $multitable->{'result'} .= $result;
- $multitable->{'length'} += $length;
- $multitable->{'line_count'} += $all_line_passed;
- $multitable->{'cells'} = [];
- }
- $multitable->{'cell_index'} = -1;
- }
- elsif ($content->{'command'} eq 'multitable_cell')
- {
- my $multitable = $info_state->{'multitable_stack'}->[-1];
- $multitable->{'cell_index'}++;
- my $cell_width =
$content->{'parent'}->{'parent'}->{'columns_size'}->[$multitable->{'cell_index'}];
- #$max_column = $cell_width-1;
- $max_column = $cell_width -2;
- my $cell = {'cell_width' => $cell_width, 'index_entries' =>
[], 'anchors' => []};
- push @{$multitable->{'cells'}}, $cell;
- $result = '';
- $length = 0;
- $all_line_passed = 0;
- $line_char_counter = 0;
- $indent_level = 0;
- $indent_length = 0;
- if (!$content->{'content'})
- {# empty cell
- $cell->{'result'} = $result;
- $cell->{'length'} = $length;
- $cell->{'line_passed'} = $all_line_passed;
- }
- #info_default_skip_spaces($current, $index, $close);
- }
- if ($info_default_indented_commands{$content->{'command'}})
- {
- if ($content->{'command'} =~ /^deff_item/)
- {
- info_default_skip_spaces($current, $index, $close);
- }
- #elsif (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0) and !$preformatted)
- elsif (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0))
- {
- $text_added .= "\n";
- }
- # there is no close if !$content->{'content'}
- $indent_level++ if ($content->{'content'});
- $indent_length = $indent_level * $info_default_indent_length;
- }
- elsif (($complex_format_map{$content->{'command'}} and
$content->{'command'} ne 'menu') or $content->{'command'} eq 'cartouche')
- {
- #if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0) and !$preformatted_format)
- if (!$info_state->{'blank_line'} and
$info_state->{'only_spaces'} and ($indent_level != 0))
- {
- $text_added .= "\n";
- }
- }
- if ($complex_format_map{$content->{'command'}} and
$content->{'content'})
- {
- $preformatted_format++;
- }
- }
-
- if (defined($content->{'text'}))
- {
- if ($in_para and !$in_exdent)
- {
- #print STDERR "IN_PARA text\n";
- my $new_text = $content->{'text'};
- # first find if in a context of no puncutation related
- # modification: code style command or @var, @cite, @math
- # acceptable for punctuation related modifications:
- # asis b dfn emph i slanted sansserif r sc strong t w
- my $current_tested = $content;
- my $no_punctation_munging_command;
- while ($current_tested)
- {
- if (defined($current_tested->{'command'}) and
(($style_map{$current_tested->{'command'}} and
$style_map{$current_tested->{'command'}}->{'args'} and
$style_map{$current_tested->{'command'}}->{'args'}->[0] and
$style_map{$current_tested->{'command'}}->{'args'}->[0] eq 'code') or
$current_tested->{'command'} eq 'var' or $current_tested->{'command'} eq 'cite'
or $current_tested->{'command'} eq 'math'))
- {
- $no_punctation_munging_command = 1;
- last;
- }
- $current_tested = $current_tested->{'parent'};
- }
- # a punctuation at the end of line in a command is treated
- # like a punctuation in plain text, except for @:,
- # accent commands, @dots, 'simple_style' command, and if in
- # a command as found out just above.
-
- if (!$no_punctation_munging_command and
(!defined($content->{'command'}) or ($content->{'command'} ne ':' and
$content->{'command'} ne 'accents_commands' and $content->{'command'} ne
'dots') and !$info_default_leaf_command{$content->{'command'}}) and
get_conf('frenchspacing') ne 'on' and $new_text =~
/([$info_default_end_sentence_character])([$info_default_after_punctuation_characters]*)(\s*)$/)
- {
- my $spaces = $3;
- if (chomp($new_text))
- {
- $new_text =~ s/(\s*)$/ /;
- }
- else
- {
- # these variables hold the place where the end
- # of line characters are normalized.
- my ($current_start_from, $index_start_from,
$close_start_from) = ($current, $index, $close);
- my $only_after_punctuation_characters = 1;
- my $spaces_to_normalize = 0;
-
- # first find whether there are only
- # after_punctuation_characters followed by spaces
- # and find the place where the
- # after_punctuation_characters end
- my ($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current, $index, $close);
- # go through the text as long as there are
after_punctuation_characters
- if (!$spaces)
- {
- while (1)
- {
- # !defined($text_next) catches many special
- # commands, like anchor, index. Not sure if
- # it is right or wrong.
- # Also a style_map command never stops
- # the search, so that @emph{ or @strong{
- # begin and end are not taken into account
- if (!defined($current_next) or
(!defined($text_next)) or (defined($command_next) and $command_next eq '*') or
($text_next !~ /^[$info_default_after_punctuation_characters]*(\s*)$/ and
(!defined($command_next) or !$style_map{$command_next})))
- {
- $only_after_punctuation_characters = 0;
- last;
- }
- my $text_next_kept = $text_next;
- # begin normalizing spaces at the last place
- # where there are
after_punctuation_characters
- $current_start_from = $current_next;
- $index_start_from = $index_next;
- $index_start_from = $index_next;
- ($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current_next, $index_next,
$close_next);
- if ($text_next_kept =~
/^[$info_default_after_punctuation_characters]*\s+$/)
- {
- if (chomp($text_next_kept))
- {
- $spaces_to_normalize = 1;
- }
- last;
- }
- }
- }
- # check if there are only spaces until end of line
- if ($only_after_punctuation_characters and
!$spaces_to_normalize)
- {
- while (1)
- {
- # !defined($text_next) catches many special
- # commands, like anchor, index. Not sure if
- # it is right or wrong.
- last if (!defined($current_next) or
(!defined($text_next)) or (defined($command_next) and $command_next eq '*'));
- if ($text_next =~ /\S/ and
(!defined($command_next) or !$style_map{$command_next}))
- {
- last;
- }
- else
- {
- if (chomp($text_next))
- {
- $spaces_to_normalize = 1;
- last;
- }
- }
- ($current_next, $index_next, $close_next,
$text_next, $command_next) = info_default_next ($current_next, $index_next,
$close_next);
- }
-
- }
- if ($spaces_to_normalize)
- {
- # now do the spaces normalization
- info_default_skip_spaces($current_start_from,
$index_start_from, $close_start_from);
- my $content =
$current_start_from->{'content'}->[$index_start_from];
- $content->{'text'} =~ s/(\s*)$/ /;
- }
- }
- }
- elsif (chomp($new_text))
- {
- $new_text =~ s/(\s*)$/ /;
- }
- $text_added .= $new_text;
- } # ignore spaces outside of paragraphs and preformatted
- elsif ($preformatted or
$info_state->{'align_stack'}->[-1]->{'command'} ne 'normal')
- {
- #print STDERR "IN_PREFORMATTED or ALIGN text\n";
- $text_added .= $content->{'text'};
- }
- else
- {
- my $chomped_text = $content->{'text'};
- if ($chomped_text !~ /\S/ and chomp($chomped_text) and
!$item_pending)
- {
- if ($in_table_item and $info_state->{'only_spaces'})
- {
- # in a blank_line
- #print STDERR "IN_ITEM ignored:
`$content->{'text'}'\n";
- }
- elsif (!$info_state->{'blank_line'} or
!$info_state->{'only_spaces'})
- {
- #print STDERR "IN_ADDING_BLANK_LINE because no line
before or text before\n";
- $text_added .= "\n";
- }
- else
- {
- #print STDERR "IN_NOT_ADDING_BLANK_LINE\n";
- }
- }
- else
- { # exdent, item not in paragraph nor in preformatted
- #print STDERR "NOWHERE and not end of line (or
item_pending) `$content->{'text'}'\n";
- $text_added .= $content->{'text'};
- }
- }
- }
- else
- {
- if (defined($content->{'begin'}))
- {
- $text_added .= $content->{'begin'};
- }
- # command that won't be closed, so the end has to be added
- # here. It should mostly happen for empty style @-commands.
- if (defined($content->{'end'}) and
!defined($content->{'content'}))
- {
- $text_added .= $content->{'end'};
- }
- }
- }
- if (!$preformatted and !$in_exdent and
$info_state->{'align_stack'}->[-1]->{'command'} eq 'normal' and $in_para)
- {
- # the line_passed returned here are not used, since they are computed
- # below.
- $indentation_done = 1;
- my $dummy_line_passed;
- ($line_char_counter, $pending_spaces_word, $dummy_line_passed,
$text_added) = info_default_process_para_text($text_added, $line_char_counter,
$pending_spaces_word, $indent_length, $max_column, $in_w, $indent_level *
$info_default_indent_length) if ($text_added ne '');
- }
- elsif ($info_state->{'align_stack'}->[-1]->{'command'} ne 'center' and
$info_state->{'align_stack'}->[-1]->{'command'} ne 'flushright')
- {
- my $dummy_line_passed;
- ($line_char_counter, $dummy_line_passed, $text_added) =
info_default_process_line_text($text_added, $line_char_counter, $indent_length);
- #$indentation_done = 1;
- }
- else
- {
- $line_char_counter += t2h_default_string_width($text_added);
- }
- new_text:
- if ($text_added ne '')
- {
- if ($item_pending and !$line_added_before_item)
- {
- #info_default_skip_spaces($current, $index, $close);
- $item_pending = undef;
- }
- }
- if ($text_added =~ /\S/)
- {
- $in_table_item = 0 if ($in_table_item);
- $info_state->{'blank_line'} = 0;
- }
- $text_added = "\n" . $text_added if ($prepend_newline);
- print STDERR "TEXT_ADDED($indent_length) `$text_added'\n" if
($text_added ne '' and get_conf('DEBUG'));
- #print STDERR "TEXT_ADDED($indent_length) `$text_added'\n";
- # from here, the next cmmand is available
- ($current, $index, $close) = info_default_iterator_next($current,
$index, $close);
-
- my ($line_passed, $end_of_line, $last_line, $text_indented, $blank_line)
= info_default_count_lines($text_added, $indent_length, ($indentation_done
- or $info_state->{'align_stack'}->[-1]->{'command'} eq 'center'
- or $info_state->{'align_stack'}->[-1]->{'command'} eq 'flushright'));
- $info_state->{'blank_line'} = 1 if ($blank_line);
- print STDERR "ADDING `$text_indented'\n" if ($text_indented ne '' and
get_conf('DEBUG'));
- # only_space is set in all the conditionals
- if ($end_of_line)
- {
- $line_char_counter = 0;
- if ($in_exdent)
- {
- $in_exdent--;
- }
- if ($table_item_line)
- {
- $table_item_line--;
- $in_table_item = 1;
- }
- if (!$table_item_line and !$in_exdent and !$item_pending)
- {
- $indent_length = $indent_level * $info_default_indent_length;
- }
- $info_state->{'blank_line'} = 1 if ($info_state->{'only_spaces'} and
($last_line !~ /\S/));
- $info_state->{'only_spaces'} = 1;
- }
- else
- {
- if ($line_passed)
- {# in that case we added more than one line, the $line_char_counter
- # is reset to the last line length.
- $line_char_counter = t2h_default_string_width($last_line);
- $in_exdent = 0;
- $indent_length = $indent_level * $info_default_indent_length;
- if ($last_line !~ /\S/)
- {
- $info_state->{'only_spaces'} = 1;
- }
- else
- {
- $info_state->{'only_spaces'} = 0;
- }
- }
- else
- {
- $info_state->{'only_spaces'} = 0 if ($last_line =~ /\S/);
- }
- }
- if ($info_state->{'align_stack'}->[-1]->{'command'} eq 'center'
- or $info_state->{'align_stack'}->[-1]->{'command'} eq 'flushright')
- {
- if (defined($current_line))
- {
- $text_added = $current_line . $text_added;
- }
- $text_indented = '';
- $current_line = undef;
- my $spaces_prepended = undef;
- foreach my $line (split /^/, $text_added)
- {
- my $chomped_line = $line;
- if (chomp($chomped_line))
- {
- $line =~ s/^\s*//;
- $line =~ s/\s*$//;
-
- if (t2h_default_string_width($line) eq 0)
- {
- $spaces_prepended = 0;
- $text_indented .= "\n";
- }
- else
- {
- my $line_width = t2h_default_string_width($line);
- if ($line_width > $max_column)
- {
- $spaces_prepended = 0;
- }
- elsif ($info_state->{'align_stack'}->[-1]->{'command'} eq
'center')
- {
- $spaces_prepended = (($max_column -1 - $line_width)
/2);
- }
- else
- {
- $spaces_prepended = ($max_column -1 - $line_width);
- }
- $text_indented .= ' ' x$spaces_prepended . $line ."\n";
- }
- }
- else
- {
- $current_line = $line;
- }
- }
- if (defined ($spaces_prepended) and
defined($info_state->{'align_stack'}->[-1]->{'anchors'}))
- {
- while (@{$info_state->{'align_stack'}->[-1]->{'anchors'}})
- {
- my $anchor = shift
@{$info_state->{'align_stack'}->[-1]->{'anchors'}};
- $anchor->{'info_offset'} += info_default_byte_count(' '
x$spaces_prepended);
- }
- }
- }
-
- if ($direntry)
- {
- $info_default_dir_specification .= $text_indented;
- }
- else
- {
- $result .= $text_indented;
- $length += info_default_byte_count($text_indented);
- $all_line_passed += $line_passed;
- }
- }
- return ($length, $result, $all_line_passed);
-}
-
-sub info_default_open_command($$;$)
-{
- my $state = shift;
- my $command = shift;
- my $additional_entries = shift;
-
- my $index = 0;
-
- my $info_state = info_default_get_state($state);
- # index in the parent content list
- $index = scalar(@{$info_state->{'current'}->{'content'}})
- if (defined($info_state->{'current'}->{'content'}));
- my $new_command = {'command' => $command, 'parent' =>
$info_state->{'current'}, 'index_in_parent' => $index };
- if (defined($additional_entries))
- {
- foreach my $key (keys(%$additional_entries))
- {
- $new_command->{$key} = $additional_entries->{$key};
- }
- }
-
- push @{$info_state->{'current'}->{'content'}}, $new_command;
- $info_state->{'current'} = $new_command;
- print STDERR "TREE($info_state->{'nr'}): Opened $command\n" if
(get_conf('DEBUG'));
-}
-
-sub info_default_close_command($$;$$$)
-{
- my $state = shift;
- my $command = shift;
- my $begin = shift;
- my $end = shift;
- my $command_entries = shift;
-
- $state = $Texi2HTML::THISDOC{'state'} if (!defined($state));
- my $info_state = info_default_get_state($state);
- print STDERR "TREE($info_state->{'nr'}): Closing $command\n" if
(get_conf('DEBUG'));
- if (!defined($info_state->{'current'}))
- {
- print STDERR "info_state->{'current'} not defined (closing $command)\n";
- }
- elsif (!defined($info_state->{'current'}->{'command'}))
- {
- print STDERR "info_state->{'current'}->{'command'} not defined (closing
$command)\n";
- }
- elsif ($command ne $info_state->{'current'}->{'command'})
- {
- print STDERR "Was waiting for $info_state->{'current'}->{'command'}
(closing $command)\n";
- }
- #return if $no_close;
- $command_entries->{'begin'} = $begin;
- $command_entries->{'end'} = $end;
- $command_entries->{'line_nr'} = $Texi2HTML::THISDOC{'line_nr'};
- foreach my $key (keys(%$command_entries))
- {
- $info_state->{'current'}->{$key} = $command_entries->{$key}
- if (defined($command_entries->{$key}));
- }
-
- $info_state->{'current'} = $info_state->{'current'}->{'parent'};
-
- return info_default_output($info_state)
- if (!defined($info_state->{'current'}->{'command'}));
- return '';
-}
-
-sub info_default_store_text($$;$$)
-{
- my $state = shift;
- my $text = shift;
- my $command = shift;
- my $text_entries = shift;
-
- $state = $Texi2HTML::THISDOC{'state'} if (!defined($state));
- my $info_state = info_default_get_state($state);
- return '' if ((!defined($text) or $text eq '') and !defined($command));
-
- ################################## debug
- my $command_text = '';
- $command_text = "\[$command\]" if (defined($command));
- $command_text .= $text if (defined($text));
- print STDERR "TREE($info_state->{'nr'}) Storing: ${command_text}\n" if
(get_conf('DEBUG'));
- ################################## end debug
-
- $text_entries->{'text'} = $text if (defined($text));
- $text_entries->{'command'} = $command if (defined($command));
- $text_entries->{'parent'} = $info_state->{'current'};
- $text_entries->{'line_nr'} = $Texi2HTML::THISDOC{'line_nr'};
- push @{$info_state->{'current'}->{'content'}}, $text_entries;
- return info_default_output($info_state)
- if (!defined($info_state->{'current'}->{'command'}));
- return '';
-}
-
-sub info_default_increment_paragraph ($$$;$)
-{
- my $in_format = shift;
- my $parent_format = shift;
- my $info_state = shift;
- my $command = shift;
-
- if ($in_format)
- {
- $parent_format->{'paragraph_in_format_nr'} = 0 if
(!defined($parent_format->{'paragraph_in_format_nr'}));
- $parent_format->{'paragraph_in_format_nr'}++;
- }
- else
- {
- $info_state->{'paragraph_in_element_nr'}++;
- }
- ####################### debug
- $command = 'PARA' if (!defined($command));
- if (0)
- #if (1)
- {
- my $format_info = '';
- if ($in_format)
- {
- $format_info = "format:
[$parent_format->{'command'}],$parent_format->{'paragraph_in_format_nr'}"
- }
- print STDERR "INCREMENT_PARA($command)
$info_state->{'paragraph_in_element_nr'} $format_info\n";
- }
- ####################### end debug
-}
-
-sub info_default_begin_format_texi($$$)
-{
- my $command = shift;
- my $line = shift;
- my $state = shift;
-
- my $info_state = info_default_get_state ($state);
- my ($parent_format, $in_format);
- ($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'});
- info_default_increment_paragraph ($in_format, $parent_format, $info_state,
$command);
- # remove space in front of center, unless it removes the end of line!
- $line =~ s/^\s*// if ($command eq 'center' and $line =~ /\S/);
- # don't open a format if it is a @def*x command and we are already in the
- # corresponding @def* command
- info_default_open_command($state,$command) unless ($def_map{$command} and
$command =~ /x$/ and defined($info_state->{'current'}->{'command'}) and
"$info_state->{'current'}->{'command'}x" eq $command);
- return $line;
-}
-
-sub info_default_begin_style_texi($$$$$)
-{
- my $command = shift;
- my $state = shift;
- my $stack = shift;
- my $real_style_command = shift;
- my $remove_texi = shift;
-
- info_default_open_command($state,$command)
- unless ($info_default_accent_commands{$command} or exists
$things_map{$command}
- or $command =~ /^special_(\w+)_(\d+)$/);
-# if ($real_style_command);
-}
-
-sub info_default_begin_paragraph_texi($$$)
-{
- my $command = shift;
- my $paragraph_macros = shift;
- my $paragraph_command = shift;
- #print STDERR "begin_paragraph $command\n";
- my $state = shift;
- my $stack = shift;
- info_default_open_command($state,$command);
- foreach my $style_command (@$paragraph_macros)
- {
- #print STDERR "para stack: $style_command->{'style'}\n";
- info_default_open_command($state,$style_command->{'style'});
- }
-}
-
-sub info_default_simple_command($$$$$)
-{
- my $command = shift;
- my $in_preformatted = shift;
- my $in_math = shift;
- my $line_nr = shift;
- my $state = shift;
-
- my $result = $simple_map{$command};
- $result = $simple_map_math{$command} if ($in_math and
defined($simple_map_math{$command}));
- # discards '-' '|' '/' and ':'. If ':' is associated with a punctuation
- # character it is added to the tree in info_default_colon_command
- return info_default_store_text($state,$result,$command) if ($result ne '');
- return '';
-}
-
-sub info_default_colon_command($)
-{
- my $punctuation_character = shift;
- if (defined($colon_command_punctuation_characters{$punctuation_character})
- and $punctuation_character =~ /^[$punctuation_characters]$/)
- {
- return
info_default_store_text(undef,$colon_command_punctuation_characters{$punctuation_character},
':');
- }
- else
- {
- return info_default_store_text(undef,$punctuation_character);
- }
-}
-
-sub info_default_thing_command($$$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $in_preformatted = shift;
- my $in_math = shift;
- my $line_nr = shift;
- my $state = shift;
-
- my $result = $things_map{$command};
- #return info_default_close_command($state, $command, $result, $text, '');
- return info_default_store_text($state, $result, $command);
-# return $result . $text;
-}
-
-
-sub info_default_style($$$$$$$$$$)
-{
- my $style = shift;
- my $command = shift;
- my $text = shift;
- my $args = shift;
- my $no_close = shift;
- my $no_open = shift;
- my $line_nr = shift;
- my $state = shift;
- my $command_stack = shift;
- my $kept_line_nrs = shift;
-
- my $begin = '';
- my $end = '';
-
- # note that the $text is always discarded for closed commands
-
- # the formatting is done right here, and the result is entered as text
below.
- if ($info_default_leaf_command{$command})
- {
- my $style_index = 0;
- my @formatted_args = ();
- foreach my $arg (@$args)
- {
- # we don't use style, since we only set 'orig_args' in style_map
- # and not in style_map_pre.
- my $arg_style = $style_map{$command}->{'orig_args'}->[$style_index];
- my $new_state = main::duplicate_formatting_state($state);
- if ($arg_style eq 'normal')
- {
- push @formatted_args, main::substitute_line($arg,
"address@hidden", $new_state);
- }
- elsif ($arg_style eq 'code')
- {
- $new_state->{'code_style'} = 1;
- push @formatted_args, main::substitute_line($arg,
"address@hidden", $new_state);
- }
- else
- {
- print STDERR "Unknown arg style($style_index) $arg_style for
$command, $state->{'remove_texi'}\n";
- }
- $style_index++;
- }
- $args = address@hidden;
- }
- if (defined($style->{'function'}))
- { # in case of an accent, some text is returned here if there are still
- # more accents on the command_stack, otherwise it is put in the tree.
- # Other commands text results are put in the tree below.
- $text = &{$style->{'function'}}($command, $args, $command_stack, $state,
$line_nr, $kept_line_nrs);
- }
- elsif ($info_default_leaf_command{$command})
- { # no formatting function but a leaf command, it is just replaced
- # by the formatted argument, and put in the tree below.
- $text = $args->[0];
- }
- if (defined($style->{'begin'}) and !$no_open)
- {
- $begin = $style->{'begin'};
- }
- if (defined($style->{'end'}) and !$no_close)
- {
- $end = $style->{'end'};
- }
- # normal style commands
- unless($special_style{$command} or $info_default_accent_commands{$command}
or ($command eq 'hyphenation') or $info_default_leaf_command{$command})
- {
- return info_default_close_command($state, $command, $begin, $end);
- }
- # this is for *ref, images and footnotes text registering and putting
- # in the tree.
- # anchor is already in the tree, from anchor_label.
- if (($special_style{$command} or $info_default_leaf_command{$command}) and
$command ne 'anchor')
- {
- return info_default_store_text ($state, $begin.$text.$end, $command);
- }
- # for accents, hyphenation and anchor
- # (though the result for anchor is always an empty string).
- return $begin.$text.$end;
-}
-
-sub info_default_header ()
-{
- return $Texi2HTML::THISDOC{'info_header'} if
(defined($Texi2HTML::THISDOC{'info_header'}));
-# $Texi2HTML::THISDOC{'program'}
- my $input_basename = $Texi2HTML::THISDOC{'input_file_name'};
- $input_basename =~ s/^.*\///;
- $input_basename = $STDIN_DOCU_NAME if ($input_basename eq '-');
- my $output_basename = $Texi2HTML::THISDOC{'filename'}->{'top'};
- $output_basename =~ s/^.*\///;
- my $result = "This is $output_basename, produced by makeinfo version 4.13
from $input_basename. ";
- my $dummy;
- ($dummy, $dummy, $dummy, $result) =
info_default_process_para_text($result, 0, {'spaces' => ''}, undef,
get_conf('FILLCOLUMN'));
- $result .= "\n\n";
- $result .= "$Texi2HTML::THISDOC{'copying_comment'}";
- if ($info_default_dir_specification)
- {
- $result .= "$info_default_dir_specification\n";
- }
- $Texi2HTML::THISDOC{'info_header'} = $result;
- return $result;
-}
-
-sub info_default_print_page_head($)
-{
- my $fh = shift;
- my $header = info_default_header();
- print $fh "".$header;
-
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
- $info_state->{'offset_in_file'} += info_default_byte_count($header);
- $info_state->{'blank_line'} = 1 if ($Texi2HTML::THISDOC{'copying_comment'}
eq '');
-}
-
-sub info_default_parent_format($)
-{
- my $parent_format = shift;
- my $in_format = 0;
- while (1)
- {
- if (defined($parent_format->{'command'}) and
$info_default_format{$parent_format->{'command'}})
- {
- $in_format = 1;
- last;
- }
- last if (!defined($parent_format->{'parent'}));
-
- $parent_format = $parent_format->{'parent'};
- }
- return ($parent_format, $in_format);
-}
-
-sub info_default_paragraph($$$$$$$$$$$$)
-{
- my $text = shift;
- my $align = shift;
- my $indent = shift;
- my $paragraph_command = shift;
- my $paragraph_command_formatted = shift;
- my $paragraph_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
-
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
- my ($parent_format, $in_format);
- ($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'}->{'parent'});
- info_default_increment_paragraph ($in_format, $parent_format, $info_state);
- my $additional_args = {'top_stack' => $top_stack, 'parent_format' =>
$parent_format};
- $additional_args->{'paragraph_in_element_nr'} =
($info_state->{'paragraph_in_element_nr'} - 1) if (!$in_format);
-
- return info_default_close_command(undef, 'paragraph', undef, undef,
$additional_args);
-}
-
-# currently not used, but could be used if info_default_preformatted
-# return something that is not 'false', for example spaces, though we
-# want the preformatted to be ignored. Though it is not sure that if there
-# are spaces we want to ignore the preformatted.
-sub info_default_empty_preformatted($)
-{
- my $text = shift;
- my $result = info_default_preformatted($text, undef, undef, undef, undef,
- undef, undef, undef, undef, undef, undef, undef);
- return 0;
-}
-
-sub info_default_preformatted($$$$$$$$$$$$)
-{
- my $text = shift;
- my $pre_style = shift;
- my $class = shift;
- my $leading_command = shift;
- my $leading_command_formatted = shift;
- my $preformatted_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
- return info_default_close_command(undef, 'preformatted');
-}
-
-
-sub info_default_node_line($$)
-{
- my $element = shift;
- my $info_state = shift;
- my $outfile = $Texi2HTML::THISDOC{'filename'}->{'top'};
- $outfile = $STDOUT_DOCU_NAME if ($outfile eq '-');
- my $result = "\x{1F}\nFile: $outfile, Node: $element->{'text'}";
- if (defined($element->{'NodeNext'}))
- { # This is not translatable
- $result .= ", Next: $element->{'NodeNext'}->{'text'}";
- }
- if (defined($element->{'NodePrev'}))
- {
- $result .= ", Prev: $element->{'NodePrev'}->{'text'}";
- }
- if (defined($element->{'NodeUp'}))
- {
- $result .= ", Up: $element->{'NodeUp'}->{'text'}";
- }
- $result .= "\n\n";
- # the line_count is ahead from the number of lines by one.
- $info_state->{'line_count'} = 3;
- $info_state->{'offset_in_file'} += info_default_byte_count($result);
- $info_state->{'blank_line'} = 1;
- return $result;
-}
-
-sub info_default_element_heading($$$$$$$$$$$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
- my $one_section = shift;
- my $element_heading = shift;
- my $first_in_page = shift;
- my $is_top = shift;
- my $previous_is_top = shift;
- my $command_line = shift;
- my $element_id = shift;
- my $new_element = shift;
-
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
-
- # FIXME use $element or $Texi2HTML::THIS_ELEMENT? Main program should
- # ensure they are the same.
- if ($new_element and ($element ne $new_element and $element->{'node'}))
- {
- die "There is a new element, but element `$element->{'texi'}' is not
the new element\n";
- }
- # FIXME
- # non node element may appear if the element appears before the first
- # node/section element. For example `element not associated with a node'
- # won't be associated with a node.
- # @unnumbered element not associated with a node
- # @node Top
- # @top Top element
- if (!$element->{'node'})
- {
- return &$heading($element, $command, $texi_line, $line,
$in_preformatted, $one_section, $element_heading);
- }
-
- my $before = '';
- $element->{'info_offset'} = $info_state->{'offset_in_file'};
- push @{$info_state->{'pending_tags'}}, $element;
-
- my $result = info_default_node_line($element, $info_state);
-
- $info_default_footnote_index = 0;
- $info_default_current_node = $element;
-
- return $before.$result;
-}
-
-sub info_default_heading($$$$$;$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
- my $one_section = shift;
- my $element_heading = shift;
-
- die "Heading called for a node\n" if ($element->{'node'});
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
- $info_state->{'paragraph_in_element_nr'} = 0;
- if (!defined($element->{'texi'}))
- {
- main::msg_debug("for $element, element->{'texi'} not defined,
texi_line: $texi_line");
- }
- elsif (!defined($element->{'text'}))
- {
- main::msg_debug("for $element, $element->{'texi'}, element->{'text'}
not defined");
- }
- return '' if ($element->{'tag'} eq 'part');
-
- my $text = "$element->{'text'}";
- # when @top is empty, use settitle
- $text = $Texi2HTML::THISDOC{'settitle'} if (!length($text) and
$element->{'tag'} eq 'top' and defined ($Texi2HTML::THISDOC{'settitle'}) and
length($Texi2HTML::THISDOC{'settitle'}));
- my $result = &$heading_text ("address@hidden", $text, $element->{'level'});
-
- $result .= "\n";
-
- return info_default_store_text($state, $result, $command,
{'heading_command' => 1});
-}
-
-sub info_default_normal_text($$$$$$$;$)
-{
- my @initial_args = @_;
- my $text = shift;
- my $in_raw_text = shift; # remove_texi
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- # This is always done here since it is not done in t2h_utf8_normal_text
- $text = uc($text) if (in_cmd($style_stack, 'var'));
-
- # ENCODING_NAME should be defined, but maybe
- # not when parsing commands in first or second pass, and removing texi
- # like what is done for @setfilename.
- if (get_conf('ENABLE_ENCODING') and defined(get_conf('ENCODING_NAME')) and
(get_conf('ENCODING_NAME') eq 'utf-8') and get_conf('USE_UNICODE'))
- {
- $text = &t2h_utf8_normal_text(@initial_args);
- }
- else
- {
- #print STDERR "info_default_normal_text $text $in_preformatted $in_code
\n";
- $text = uc($text) if (in_cmd($style_stack, 'sc'));
- if (! $in_code and !$in_preformatted)
- {
- $text =~ s/---/\x{1F}/g;
- $text =~ s/--/-/g;
- $text =~ s/\x{1F}/--/g;
- $text =~ s/``/"/g;
- $text =~ s/\'\'/"/g;
- }
- }
- # accented characters are not handled as normal text, but when the last
- # accent command on the stack is closed.
- if ($style_stack and @$style_stack and
$info_default_accent_commands{$style_stack->[-1]})
- {
- return $text;
- }
-#print STDERR "NORMAL\n";
- return info_default_store_text($state,$text);
-}
-
-# this is not called in preformatted
-sub info_default_empty_line($$)
-{
- my $text = shift;
- my $state = shift;
- #ignore the line if it just follows a deff
- #return '' if ($state->{'deff_line'});
- return info_default_store_text($state,$text);
-# return '';
-}
-
-# change interface?
-sub info_default_anchor_label($$$$)
-{
- my $id = shift;
- my $anchor_text = shift;
- my $anchor_reference = shift;
- my $in_special_region = shift;
- return '' if ($in_special_region);
- #print STDERR "Storing anchor $anchor_reference->{'text'}\n";
- main::line_warn(__("anchor outside of any node, it won't be registered"),
$Texi2HTML::THISDOC{'line_nr'}) if (!defined($info_default_current_node));
- return info_default_store_text(undef,undef,'anchor',{'anchor_reference' =>
$anchor_reference});
-}
-
-sub info_default_acronym_like($$$$$$)
-{
- my $command = shift;
- my $acronym_texi = shift;
- my $acronym_text = shift;
- my $with_explanation = shift;
- my $explanation_lines = shift;
- my $explanation_text = shift;
- my $explanation_simply_formatted = shift;
-
- if ($with_explanation)
- {
- return "$acronym_text ($explanation_text)";
- }
- else
- {
- return "$acronym_text";
- }
-}
-
-
-sub info_default_print_page_foot($)
-{
- my $fh = shift;
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
- my $indirect = 0;
- if (!defined ($info_state->{'pending_tags'}))
- { # i18n
- main::document_warn ("Document without nodes.");
- }
- else
- {
- $indirect = 1 if ($info_default_out_file_nr > 1);
- if ($indirect)
- {
- close ($Texi2HTML::THISDOC{'FH'});
- unless (rename
("$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}",
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}-1"))
- {
- main::document_warn ("Rename
$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}
failed: $!");
- }
-
- my $INDIRECT =
main::open_out("$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'filename'}->{'top'}");
- print $INDIRECT "".info_default_header();
- print $INDIRECT "\x{1F}\nIndirect:";
- foreach my $indirect (@info_default_pending_indirect)
- {
- print $INDIRECT "\n$indirect->{'file'}: $indirect->{'offset'}";
- }
- $fh = $INDIRECT;
- }
- # makeinfo seems to add systematically an additional \n, done just below
- print $fh "\n\x{1F}\nTag Table:\n";
-
- if ($indirect)
- {
- print $fh "(Indirect)\n";
- }
- my $Top_seen;
- foreach my $element (@{$info_state->{'pending_tags'}})
- {
- my $prefix;
- $prefix = 'Node' if ($element->{'node'});
- $prefix = 'Ref' if ($element->{'anchor'} or $element->{'float'});
- print $fh "$prefix:
$element->{'text'}\x{7F}$element->{'info_offset'}\n";
- $Top_seen = 1 if ($element->{'text'} =~ /^top$/i);
- }
- if (!$Top_seen)
- {# i18n
- main::document_warn ("Document without Top node.");
- }
- print $fh "\x{1F}\nEnd Tag Table\n";
- }
-
- # IN_ENCODING is the documentencoding transformed to the encoding names
- # usually seen in html. This is what the info readers should understand.
- my $coding = get_conf('IN_ENCODING');
- $coding = get_conf('documentencoding') if (!defined($coding));
- if (defined($coding))
- {
- print $fh "\n\x{1F}\nLocal Variables:\ncoding: $coding\nEnd:\n";
- }
-}
-
-sub info_default_print_Top_footer($$$)
-{
- my $fh = shift;
- my $end_page = shift;
- my $element = shift;
- if ($end_page)
- {
- &$print_page_foot($fh);
- }
- info_default_end_section($fh, $end_page, $element);
-}
-
-sub info_default_footnote_texi($$$)
-{
- my $text = shift;
- my $state = shift;
- my $style_stack = shift;
-
- unless ($state->{'outside_document'} or
(defined($state->{'multiple_pass'}) and $state->{'multiple_pass'} > 0))
- {
- $info_default_footnote_index++;
- }
- my $footnote_number = $info_default_footnote_index;
- $footnote_number = $NO_NUMBER_FOOTNOTE_SYMBOL if
(!get_conf('NUMBER_FOOTNOTES'));
- return "($footnote_number) $text";
- #return undef;
-}
-
-sub info_default_print_section
-{
- my $fh = shift;
- my $first_in_page = shift;
- my $previous_is_top = shift;
- my $element = shift;
- my $nw = main::print_lines($fh);
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
- if (!$info_state->{'blank_line'})
- {
- my $end = "\n";
- $info_state->{'offset_in_file'} += info_default_byte_count($end);
- $info_state->{'line_count'}++;
- print $fh "$end";
- }
- if (@info_default_pending_footnotes)
- {
- my $footnote_text;
- my $footnote_element;
- if (get_conf('footnotestyle') eq 'separate')
- {
- my $node_ref = $info_default_current_node;
- # thee is a warning when processing the footnote, like
- # "Footnote defined without parent node"
- $node_ref = {'text' => 'no node', 'file' => ''} if
(!defined($node_ref));
- $footnote_element = { 'NodeUp' => $node_ref,
- 'text' => $node_ref->{'text'} . "-Footnotes",
- 'file' => $node_ref->{'file'},
- 'info_offset' => $info_state->{'offset_in_file'},
- 'node' => 1,
- };
- $footnote_element->{'element_ref'} = $footnote_element;
- push @{$info_state->{'pending_tags'}}, $footnote_element;
- $footnote_text = info_default_node_line($footnote_element,
$info_state);
- }
- else
- { # FIXME i18n?
- $footnote_text = " ---------- Footnotes ----------\n\n";
- $info_state->{'offset_in_file'} +=
info_default_byte_count($footnote_text);
- $info_state->{'line_count'} += 2;
- #print STDERR "MMMMMMMMMMMMMMMMMM $info_state->{'line_count'}\n";
- }
- while (@info_default_pending_footnotes)
- {
- #push @info_default_pending_footnotes, [$lines, $footnote_text,
${info_default_footnote_index}, $node_name, $footnote_info_state];
- my $footnote = shift @info_default_pending_footnotes;
- my $foot_nr = $footnote->{'footnote_index'};
- my $node_name = $footnote->{'node_name'};
- my $lines = $footnote->{'lines'};
- push @{$info_state->{'pending_tags'}}, {'anchor' => 1, 'text' =>
"${node_name}-Footnote-${foot_nr}", 'info_offset' =>
$info_state->{'offset_in_file'} };
- my $footnote_info_state = $footnote->{'footnote_info_state'};
- my $footnote_result = shift @{$lines};
- # this is used to keep track of the size when there were
- # leading spaces that will be removed below. This is only used
- # to get the difference, the value itself is not of use.
- my $initial_length = info_default_byte_count($footnote_result);
-
- $footnote_result =~ s/^\s*//;
- #$footnote_result = " ($foot_nr) " . $footnote_result;
- $footnote_result = ' ' x get_conf('paragraphindent') .
$footnote_result;
- foreach my
$footnote_pending_tags(@{$footnote_info_state->{'pending_tags'}})
- {
- $footnote_pending_tags->{'info_offset'} +=
$info_state->{'offset_in_file'} + info_default_byte_count($footnote_result) -
$initial_length;
- push @{$info_state->{'pending_tags'}}, $footnote_pending_tags;
- }
- foreach my
$footnote_pending_index_entry(@{$footnote_info_state->{'pending_index_entries'}})
- {
- #print STDERR
"TTTTTTTTTTT($footnote_pending_index_entry->{'index_entry_reference'}->{'entry'})
$footnote_pending_index_entry->{'line_nr'} $info_state->{'line_count'}\n";
- $footnote_pending_index_entry->{'line_nr'} +=
$info_state->{'line_count'};
-
$footnote_pending_index_entry->{'index_entry_reference'}->{'real_element'} =
$footnote_element if (get_conf('footnotestyle') eq 'separate');
- }
- my $line;
- while (@$lines)
- {
- $line = shift @$lines;
- $footnote_result .= $line;
- }
- my ($line_passed, $end_of_line, $last_line, $text_indented,
$blank_line) = info_default_count_lines($footnote_result);
- if ($line_passed == 0)
- {# certainly out of paragraph commands
- $footnote_result =~ s/\s*$//;
- $footnote_result .= "\n";
- $line_passed = 1;
- }
- unless (($last_line !~ /\S/ and $end_of_line) or ($blank_line))
- {
- $footnote_result .= "\n";
- $line_passed += 1;
- }
-
- $info_state->{'offset_in_file'} +=
info_default_byte_count($footnote_result);
- $info_state->{'line_count'} += $line_passed;
- $footnote_text .= $footnote_result;
- }
- print $fh "$footnote_text";
- }
-}
-
-sub info_default_end_section($$$)
-{
- my $fh = shift;
- my $end_foot_navigation = shift;
- my $element = shift;
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
-
- if (defined(get_conf('SPLIT_SIZE')) and
- $info_state->{'offset_in_file'} > ($info_default_out_file_nr) *
get_conf('SPLIT_SIZE'))
- {
- if ($info_default_out_file_nr == 1)
- { # push also the first node, which is always the first pending_tags
- push @info_default_pending_indirect,
{'file'=>"$Texi2HTML::THISDOC{'filename'}->{'top'}-$info_default_out_file_nr",
'offset' => $info_state->{'pending_tags'}->[0]->{'info_offset'} };
- }
- $info_default_out_file_nr++;
- # these file descriptors leak, but this allows the user to write a
- # foot navigation himself, otherwise he would write on a closed file
- # descriptor
- #close($Texi2HTML::THISDOC{'FH'});
- if (!$end_foot_navigation)
- {
-
main::open_out_file("$Texi2HTML::THISDOC{'filename'}->{'top'}-$info_default_out_file_nr");
- #print STDERR "X-$info_default_out_file_nr:
$info_state->{'offset_in_file'}\n";
- &$print_page_head($Texi2HTML::THISDOC{'FH'});
- push @info_default_pending_indirect,
{'file'=>"$Texi2HTML::THISDOC{'filename'}->{'top'}-$info_default_out_file_nr",
'offset' => $info_state->{'offset_in_file'}};
- }
- }
-}
-
-sub info_default_one_section($$)
-{
- my $fh = shift;
- my $element = shift;
- &$print_section($fh, 1, 0, $element);
- &$print_page_foot($fh);
-}
-
-sub info_default_begin_special_region($$$)
-{
- my $region = shift;
- my $state = shift;
- my $lines = shift;
- my $info_state = info_default_get_state ($state);
- # reset paragraph_in_element_nr if out ofdocument formatting
- if ($state->{'outside_document'})
- {
- $info_state->{'paragraph_in_element_nr'} = 0;
- }
-}
-
-sub info_default_end_special_region($$$)
-{
- my $region = shift;
- my $state = shift;
- my $text = shift;
- my $info_state = info_default_get_state ($state);
- my $end = '';
- if (!$info_state->{'blank_line'})
- {
- $end = "\n";
- $info_state->{'offset_in_file'} += info_default_byte_count($end);
- }
- return $text.$end;
-}
-
-sub info_default_menu_link($$$$$$$$)
-{
- my $entry = shift;
- my $state = shift;
- my $href = shift;
- my $node = shift;
- my $title = shift;
- my $ending = shift;
- my $has_title = shift;
- my $command_stack = shift;
- my $preformatted = shift;
-
- $title = '' unless ($has_title);
- $title .= ':' if ($title ne '');
- my $result = "$MENU_SYMBOL$title$node$ending";
- return info_default_store_text($state,$result,'menu_entry');
-}
-
-# not used, menu is a normal preformatted command
-#sub info_default_menu_command($$$)
-#{
-# my $format = shift;
-# my $text = shift;
-# my $in_preformatted = shift;
-# return info_default_close_command(undef, $format, "* Menu:\n", undef,
"\n");
-#}
-
-sub info_default_complex_format($$)
-{
- my $name = shift;
- my $text = shift;
- my ($begin, $end);
- if ($name eq 'menu')
- {
- main::line_warn(__("address@hidden before first node"),
$Texi2HTML::THISDOC{'line_nr'}) if (!defined($info_default_current_node));
- $begin = "* Menu:\n\n";
- }
- elsif ($name eq 'direntry')
- {
- main::line_warn(__("address@hidden after first node"),
$Texi2HTML::THISDOC{'line_nr'}) if (defined($info_default_current_node));
- $begin = "START-INFO-DIR-ENTRY\n";
- $end = "END-INFO-DIR-ENTRY\n";
- }
- return info_default_close_command(undef, $name, $begin, $end);
-}
-
-sub info_default_quotation($$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $argument_text = shift;
- my $argument_text_texi = shift;
- my $authors = shift;
-
- my $attribution;
- if ($authors)
- {
- $attribution = '';
- foreach my $author (@$authors)
- {
- my $author_texi = $author->{'author_texi'};
- chomp($author_texi);
- $attribution .= gdt("address@hidden --- address@hidden", {'author'
=> $author_texi}, {'duplicate' => 1, 'allow_paragraph' => 1});
- }
- }
-
- return info_default_close_command(undef, $command, undef, $attribution);
-}
-
-sub info_default_misc_commands($$$$$)
-{
- my $command = shift;
- my $line = shift;
- my $args = shift;
- my $stack = shift;
- my $state = shift;
-
- info_default_store_text($state,undef,$command) if ($command eq 'exdent' or
$command eq 'noindent' or $command eq 'indent');
- return ($command, $line, undef);
-}
-
-sub info_default_external_ref($$$$$$$$$)
-{
- my $type = shift;
- my $section = shift;
- my $book = shift;
- my $file = shift;
- my $href = shift;
- my $cross_ref = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
- my $node = shift;
-
- return info_default_inforef($formatted_args) if ($type eq 'inforef');
- return info_default_normal_reference($type, $formatted_args);
-}
-
-sub info_default_internal_ref($$$$$$$$)
-{
- my $type = shift;
- my $href = shift;
- my $short_name = shift;
- my $name = shift;
- my $is_section = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
- my $element = shift;
-
- $formatted_args->[1] = $name if ($element->{'float'} and
(!defined($formatted_args->[1]) or $formatted_args->[1] eq ''));
- return info_default_inforef($formatted_args) if ($type eq 'inforef');
- return info_default_normal_reference($type, $formatted_args);
-}
-
-sub info_default_normal_reference($$)
-{
- my $command = shift;
- my $formatted_args = shift;
- for (my $i = 0; $i < scalar(@$formatted_args); $i++)
- {
- $formatted_args->[$i] = undef if (defined($formatted_args->[$i]) and
- $formatted_args->[$i] =~ /^\s*$/);
- }
- my $node = $formatted_args->[0];
- # an error, should trigger the message: Undefined node `' in @ref.
- # avoid undef value and use an empty string instead.
- $node = '' if (!defined($node));
- my $name = $formatted_args->[1];
- $name = $formatted_args->[2] if (!defined($name));
- my $file = $formatted_args->[3];
- $file = '' if (!defined($file) and defined($formatted_args->[4]));
- $name = $node if (!defined($name) and defined($file));
- my $result = '*note ';
- $result = '*Note ' if ($command eq 'xref');
- if (defined($name))
- {
- $result .= "${name}: ";
- $result .= "($file)" if (defined($file));
- $result .= "$node";
- $result .= '.' if ($command eq 'pxref');
- }
- else
- {
- $result .= "${node}::";
- }
- return $result;
-}
-
-sub info_default_inforef($)
-{
- my $formatted_args = shift;
- return info_default_normal_reference('ref', [$formatted_args->[0],
$formatted_args->[1], undef, $formatted_args->[2], 'dumb manual name']);
-}
-
-sub info_default_image_files($$$$)
-{
- my $base = shift;
- my $extension = shift;
- my $texi_base = shift;
- my $texi_extension = shift;
- my @files = ();
- return @files if (!defined($base) or ($base eq ''));
-
- if (defined($extension) and ($extension ne ''))
- {
- push @files, ["${base}$extension", "${texi_base}$extension"];
- push @files, ["$base.$extension", "$texi_base.$extension"];
- }
- foreach my $ext (@IMAGE_EXTENSIONS)
- {
- push @files, ["$base.$ext", "$texi_base.$ext"];
- }
- return @files;
-}
-
-sub info_default_image($$$$$$$$$$$$$$$$$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- my $file_name = shift;
- my $alt = shift;
- my $width = shift;
- my $height = shift;
- my $raw_alt = shift;
- my $extension = shift;
- my $working_dir = shift;
- my $file_path = shift;
- my $in_paragraph = shift;
- my $file_locations = shift;
- my $base_simple_format = shift;
- my $extension_simple_format = shift;
- my $file_name_simple_format = shift;
- my $line_nr = shift;
-
- my $txt_path;
- my $found_file;
-
- my @extensions = @IMAGE_EXTENSIONS;
- if (defined($extension) and ($extension ne ''))
- {
- unshift @extensions, ".$extension";
- unshift @extensions, "$extension";
- }
- else
- {
- $extension = undef;
- }
- my $file_found_index = undef;
- my $file_index = 0;
- foreach my $file_location (@$file_locations)
- {
- my ($file_located, $path, $file_simple_format) = @$file_location;
- my $extension = shift @extensions;
- if (defined($path))
- {
- if ($extension eq 'txt' and !defined($txt_path))
- {
- $txt_path = $path;
- }
- elsif (!defined($found_file))
- {
- $found_file = [$file_located, $extension, $file_simple_format];
- $file_found_index = $file_index;
- }
- }
- $file_index++;
- }
-
- my $text;
- if (defined($txt_path))
- {
- if (open(TXT, "<$txt_path"))
- {
- my $in_encoding = get_conf('IN_ENCODING');
- if (defined($in_encoding) and get_conf('USE_UNICODE'))
- {
- binmode(TXT, ":encoding($in_encoding)");
- }
- $text='[' if ($in_paragraph or $preformatted);
- while (my $img_txt = <TXT>)
- {
- $text .= $img_txt;
- }
- # remove last end of line
- chomp ($text);
- $text .= ']' if ($in_paragraph or $preformatted);
- close(TXT);
- }
- else
- {
- main::line_warn (sprintf(__("address@hidden file `%s' unreadable:
%s"), $txt_path, $!), $line_nr);
- }
- }
- elsif (!defined($found_file))
- {
- main::line_warn (sprintf(__("Cannot find address@hidden file
`%s.txt'"), $base), $line_nr);
- }
- if (defined($found_file) and (!defined($extension) or $file_found_index <=
1))
- {
- my $filename = $found_file->[2];
- $filename =~ s/\\/\\\\/g;
- $filename =~ s/\"/\\\"/g;
- my $result = "\x{00}\x{08}[image src=\"$filename\"";
- if (defined($alt))
- {
- $alt =~ s/\\/\\\\/g;
- $alt =~ s/\"/\\\"/g;
- $result .= " alt=\"$alt\"";
- }
- if (defined($text))
- {
- $text =~ s/\\/\\\\/g;
- $text =~ s/\"/\\\"/g;
- $result .= " text=\"$text\"";
- }
- $result .= "\x{00}\x{08}]";
- return $result;
- }
- return $text if (defined($text));
- return '';
-}
-
-sub info_default_printindex($$)
-{
- my $index_name = shift;
- my $printindex = shift;
- %info_default_index_entries_counts = ();
- return
info_default_store_text(undef,t2h_GPL_default_printindex($index_name,$printindex),'printindex');
-}
-
-sub info_default_print_index($$)
-{
- my $text = shift;
- my $name = shift;
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
- my $before = '';
- if (!$info_state->{'blank_line'})
- {
- $before = "\n";
- }
- return $before if (!defined($text));
- my $result = "\x{00}\x{08}[index\x{00}\x{08}]\n* Menu:\n\n" .$text."\n";
- return $before.$result;
-}
-
-sub info_default_index_letter($$$)
-{
- my $letter = shift;
- my $id = shift;
- my $text = shift;
- return $text;
-}
-
-sub info_default_index_entry_label($$$$$$$$$)
-{
- my $identifier = shift;
- my $preformatted = shift;
- my $entry = shift;
- my $index_name = shift;
- my $index_command = shift;
- my $texi_entry = shift;
- my $formatted_entry = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
- #return '' if ($index_entry_ref->{'hidden'});
- #return '' if (!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
- return '' if ($in_region_not_in_output or
!defined($index_entry_ref->{'index_name'}));
- main::line_warn(sprintf(__("Entry for index `%s' outside of any node"),
$index_entry_ref->{'index_name'}), $Texi2HTML::THISDOC{'line_nr'}) if
(!defined($info_default_current_node) and
!$Texi2HTML::THISDOC{'state'}->{'outside_document'});
- my $index_entry_stored = {'index_entry_reference' => $index_entry_ref,
'index_command' => $index_command, 'texi_entry' => $texi_entry};
- return info_default_store_text(undef, undef, 'index_label',
$index_entry_stored);
-}
-
-sub info_default_index_entry($$$$$$$$$$)
-{
- my $text_href = shift;
- my $entry = shift;
- my $element_href = shift;
- my $element_text = shift;
- my $entry_file = shift;
- my $current_element_file = shift;
- my $entry_target = shift;
- my $entry_element_target = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
- #return '' if ($index_entry_ref->{'hidden'});
- #return '' if (!$index_entry_ref->{'seen_in_output'} and
defined($index_entry_ref->{'region'}));
- return '' if ($in_region_not_in_output);
- my $state = {};
- $state = { 'code_style' => 1 } if ($index_entry_ref->{'in_code'});
- $entry = main::substitute_line($index_entry_ref->{'texi'}, "index entry in
address@hidden", $state);
- return '' if ($entry =~ /^\s*$/);
-
- my $entry_nr = '';
- if (!defined($info_default_index_entries_counts{$entry}))
- {
- $info_default_index_entries_counts{$entry} = 0;
- }
- else
- {
- $info_default_index_entries_counts{$entry} ++;
- $entry_nr = ' <'.$info_default_index_entries_counts{$entry}.'>';
- }
-
- my $result = "* $entry${entry_nr}: ";
- if (t2h_default_string_width($result) < $info_default_index_length_to_node)
- {
- $result .= ' ' x($info_default_index_length_to_node -
t2h_default_string_width($result));
- }
-
- #print STDERR "DDDDDDDDDDD $index_entry_ref
`$index_entry_ref->{'texi'}'\n";
- my $info_index_entry_ref = $info_default_index_entries{$index_entry_ref};
- my $line_nr = $info_index_entry_ref->{'line_nr'};
-
- my $real_element_text;
- my $element = $index_entry_ref->{'real_element'};
- # in case $element->{'text'} is not defined, it certainly means that we
- # are n a special elemet, most likely the virtual element appearing
- # before anything else
- if (!defined($element->{'text'}))
- {
- $real_element_text = gdt('(outside of any node)');
- $line_nr = 0;
- }
- else
- {
- $element = $element->{'element_ref'} if ($element->{'element_ref'});
- $real_element_text = $element->{'text'};
- # this happens for index entries appearing after @printindex. In that
case
- # it is considered that they are at the beginning of the node.
- $line_nr = 3 if (defined($line_nr) and $line_nr < 3);
- $line_nr = 4 if (!defined($line_nr));
- }
- $result .= $real_element_text . '.';
- my $max_len =
$info_default_index_line_string_length{$index_entry_ref->{'index_name'}};
- $max_len = t2h_default_string_width($line_nr) if (!defined($max_len));
- my $line_nr_spaces = sprintf("%${max_len}d", $line_nr);
- my $line_part = "(line ${line_nr_spaces})";
- #print STDERR "GGGGGGGGGG name: $index_entry_ref->{'index_name'} max:
${max_len} line_nr: `$line_nr' line_nr_spaces `$line_nr_spaces' $line_part \n";
- if (t2h_default_string_width($result)+t2h_default_string_width($line_part)
+1 > get_conf('FILLCOLUMN'))
- {
- $result .= "\n" . ' ' x (get_conf('FILLCOLUMN') -
t2h_default_string_width($line_part)) ;
- }
- else
- {
- $result .= ' ' x (get_conf('FILLCOLUMN') -
t2h_default_string_width($line_part) - t2h_default_string_width($result));
- }
- $result .= "$line_part\n";
-
- return $result;
-}
-
-sub info_default_index_summary($$)
-{
- my $alpha = shift;
- my $nonalpha = shift;
-
- return '';
-}
-
-sub info_default_summary_letter
-{
- return '';
-}
-
-sub info_default_foot_line_and_ref($$$$$$$$)
-{
- my $foot_num = shift;
- my $relative_num = shift;
- my $footid = shift;
- my $docid = shift;
- my $from_file = shift;
- my $footnote_file = shift;
- my $lines = shift;
- my $state = shift;
-
- my $footnote_state = $Texi2HTML::THISDOC{'state'};
- my $footnote_info_state = info_default_get_state ($footnote_state);
-
- my $footnote_text = "($info_default_footnote_index)";
- $footnote_text = "($NO_NUMBER_FOOTNOTE_SYMBOL)" if
(!get_conf('NUMBER_FOOTNOTES'));
- my $node_name;
- $node_name = '';
- if (defined($info_default_current_node))
- {
- $node_name = $info_default_current_node->{'text'};
- }
- else
- { # i18n
- # no warning when outside of document, for footnotes in
- # titlepage and copying
- main::line_error(__("Footnote defined without parent node"),
$Texi2HTML::THISDOC{'line_nr'}) unless ($footnote_state->{'outside_document'});
- #print STDERR "".main::context_string()."\n";
- }
- if (get_conf('footnotestyle') eq 'separate')
- {
- $footnote_text .= ' (' . info_default_normal_reference('pxref',
["${node_name}-Footnote-${info_default_footnote_index}"]) . ')';
- }
- push @info_default_pending_footnotes, {'lines' => $lines,
- 'footnote_text' => $footnote_text,
- 'footnote_index' => ${info_default_footnote_index},
- 'node_name' => $node_name,
- 'footnote_info_state' => $footnote_info_state}
- unless ($state->{'outside_document'} or
(defined($state->{'multiple_pass'}) and $state->{'multiple_pass'} > 0));
- return ([], $footnote_text);
-}
-
-sub info_default_foot_lines($)
-{
- my $lines = shift;
- #my $state = $Texi2HTML::THISDOC{'state'};
- #my $info_state = info_default_get_state ($state);
- @$lines = ();
-}
-
-# remark: table_item is the html one, but it gets added to the table text
-# on the stack, and is ignored there (in info_default_format).
-sub info_default_format_list_item_texi($$$$)
-{
- my $format = shift;
- my $line = shift;
- my $prepended = shift;
- my $command = shift;
- my $number = shift;
-
- my $open_command = 0;
- my $result_line;
- $command = 'bullet' if ((!defined($command) or $command eq '') and
(!defined($prepended) or $prepended eq '') and $format eq 'itemize');
- $prepended = "address@hidden" if (defined($command) and $command ne '');
- $prepended = "$number." if (defined($number) and $number ne '');
-
- $line =~ s/^\s*//;
-
- if (defined($command) and $command ne '' and $format ne 'itemize')
- {
- address@hidden
- $line =~ s/\s*$//;
- if (exists ($style_map{$command}))
- {
- $result_line = "address@hidden";
- }
- elsif (exists ($things_map{$command}))
- {
- $result_line = "address@hidden $line\n";
- }
- else
- {
- $result_line = "address@hidden $line\n";
- }
- }
-# elsif (defined($prepended) and $prepended ne '')
-# { # @enumerate and @itemize
-# $prepended =~ s/^\s*//;
-# $prepended =~ s/\s*$//;
-# $result_line = $prepended . ' ' . $line;
-# }
-
- return ($result_line, $open_command);
-}
-
-sub info_default_list_item($$$$$$$$$$$$)
-{
- my $text = shift;
- my $format = shift;
- my $command = shift;
- my $formatted_command = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $prepended = shift;
- my $prepended_formatted = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
- my $item_command = shift;
-
-# my $prepend = '';
-# if (defined($formatted_command) and $formatted_command ne '')
-# {
-# $prepend = $formatted_command;
-# }
-# return $prepend . $text;
-# $command = 'bullet' if ((!defined($command) or $command eq '') and
(!defined($prepended) or $prepended eq '') and $format eq 'itemize');
- $formatted_command = $things_map{'bullet'} if ((!defined($command) or
$command eq '') and (!defined($prepended) or $prepended eq '') and $format eq
'itemize');
-
- if ($format !~ /table$/)
- {
- my $result = '';
- if ($format eq 'enumerate')
- {
- $result = $number.'.';
- }
- elsif ($format eq 'itemize')
- {
- if (defined($formatted_command) and $formatted_command ne '')
- {
- $result = $formatted_command;
- }
- elsif (defined ($prepended_formatted) and $prepended_formatted ne '')
- {
- $prepended_formatted =~ s/^\s*//;
- $prepended_formatted =~ s/\s*$//;
- $result = $prepended_formatted;
- }
- }
- else
- {
- $result = '';
- }
- $result .= ' ' if ($result ne '');
- return info_default_close_command (undef, $item_command, $result);
- }
- return $text;
-}
-
-sub info_default_format($$$)
-{
- my $tag = shift;
- my $element = shift;
- my $text = shift;
-
- # currently no command has something else than '' as $element.
- # notice that any text is discarded
- $element = undef if ($element eq '');
- my $element_end = $element;
- if (defined($element) and $element =~ /^(\w+)(\s+)(.+)/)
- {
- $element = $1;
- $element_end = $2;
- }
- return info_default_close_command(undef, $tag, $element, $element_end);
-}
-
-sub info_default_tab_item_texi($$$$$$)
-{
- my $command = shift;
- my $commands_stack = shift;
- my $stack = shift;
- my $state = shift;
- my $line = shift;
- my $line_nr = shift;
-
- $line =~ s/^\s*//;
- my $format;
- my $info_state = info_default_get_state ($state);
- #$format = $commands_stack->[-1] if (defined($commands_stack) and
@$commands_stack and $commands_stack->[-1]);
- my ($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'});
- print STDERR "Not in_format in info_default_tab_item_texi\n" if
(!$in_format);
- $format = $parent_format->{'command'};
- # in case of an @item or @tab outside of any format $format will be
- # undefined, or not multitable for a @tab.
- # however the main program still do as if something was opened, plus
- # it is checked there that the nesting is correct
- #return $line if (!defined($format) or $command eq 'tab' and $format ne
'multitable');
- #print STDERR "tab_item_texi $format $command $commands_stack, $stack,
$state, $line, ".main::format_line_number($line_nr)."\n";
- if ($format eq 'multitable')
- { # even if it is a tab, if it is not already in a multitable_row, one
- # should be started
- if ($command ne 'tab' or $info_state->{'current'}->{'command'} ne
'multitable_row')
- {
- info_default_open_command($state, 'multitable_row');
- }
- info_default_open_command($state, 'multitable_cell');
- }
- elsif ($format =~ /table$/)
- {
- info_default_store_text ($state, undef, $command, {'format_name' =>
$format});
- }
- else
- {
- info_default_open_command ($state, $command, {'format_name' =>
$format});
- }
- # this allows removing blank space in front of the item or tab argument
- return $line;
-}
-
-sub info_default_sp($$)
-{
- my $number = shift;
- my $preformatted = shift;
- my $result = "\n" x $number;
- return info_default_store_text(undef,$result,'sp');
-}
-
-sub info_default_paragraph_style_command($$)
-{
- my $format = shift;
- my $text = shift;
- return info_default_close_command(undef, $format);
-}
-
-sub info_default_row($$$$$$$$)
-{
- my $text = shift;
- my $macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
- #print STDERR "info_default_row: $text\n";
-
- return info_default_close_command(undef, 'multitable_row', undef, undef,
{'item_command' => $macro});
-}
-
-sub info_default_cell($$$$$$$$)
-{
- my $text = shift;
- my $row_macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- # in general, when before_items, there will be no call to the function
- # since there should never be a text sent back, so that this
- # function will not be called for the first row (the multitable title).
- # However, if there is a @tab before the first @item, the main program
- # is less careful and closes the cell in any case, so before_items
- # has to be checked for that case.
- return info_default_close_command(undef, 'multitable_cell') unless
($before_items);
-}
-
-sub info_default_table_list($$$$$$$$$)
-{
- my $format_command = shift;
- my $text = shift;
- my $command = shift;
- my $formatted_command = shift;
-# enumerate
- my $item_nr = shift;
- my $enumerate_style = shift;
-# itemize
- my $prepended = shift;
- my $prepended_formatted = shift;
-# multitable
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
-
- die "BUG: $format_command item_nr undef\n" if (!defined($item_nr));
-
- return info_default_close_command(undef, $format_command, undef, undef,
{'total_item_nr' => $item_nr}) if ($format_command ne 'multitable');
-
- my $columnsize = [];
- if (defined($prototype_lengths) and @$prototype_lengths)
- {
- $columnsize = [ @$prototype_lengths ];
- }
- elsif (defined($columnfractions) and @$columnfractions)
- {
- foreach my $fraction (@$columnfractions)
- {
- push @$columnsize, int($fraction * get_conf('FILLCOLUMN') +0.5);
- }
- }
- else
- { # empty multitable
- #print STDERR "Empty multitable?\n";
- }
-
- return info_default_close_command(undef, $format_command, undef, undef,
{'columns_size' => $columnsize, 'total_item_nr' => $item_nr});
-}
-
-sub info_default_def_item($$$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $command = shift;
-
- my $format = 'deff_item';
- $format = 'deff_itemx' if ($command =~ /x$/);
- return info_default_close_command(undef, $format);
-}
-
-sub info_default_def_line($$$$$$$$$$$$$$$$)
-{
- my $category_prepared = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- my $index_label = shift;
- my $arguments_array = shift;
- my $arguments_type_array = shift;
- my $unformatted_arguments_array = shift;
- my $command = shift;
- my $class_name = shift;
- my $category = shift;
- my $class = shift;
- my $style = shift;
- my $original_command = shift;
-
- $name = '' if (!defined($name) or ($name =~ /^\s*$/));
- $type = '' if (!defined($type) or $type =~ /^\s*$/);
- $arguments = '' if (!defined($arguments) or $arguments =~ /^\s*$/);
-
- my $type_name = '';
- $type_name .= "$type " if ($type ne '');
- $type_name .= $name if ($name ne '');
-
- my $result = " -- $category_prepared: ${type_name}$arguments";
- $result =~ s/\s*$//;
- $result .= "\n";
- my $state = $Texi2HTML::THISDOC{'state'};
- info_default_store_text(undef,$result,"${command}_line",{'definition_line'
=> 1});
- my $format = 'deff_item';
- $format = 'deff_itemx' if ($original_command =~ /x$/);
- return info_default_open_command($state, $format);
-}
-
-sub info_default_def($$)
-{
- my $text = shift;
- my $command = shift;
- return info_default_close_command(undef, $command);
-}
-
-sub info_default_float($$$$$)
-{
- my $text = shift;
- my $float = shift;
- my $caption = shift;
- my $shortcaption = shift;
-
- my $additional_arguments;
- if (exists($float->{'id'}))
- {
- $additional_arguments->{'anchor_reference'} = $float;
- main::line_warn(__("float reference outside of any node, it won't be
registered"), $Texi2HTML::THISDOC{'line_nr'}) if
(!defined($info_default_current_node) and
!$Texi2HTML::THISDOC{'state'}->{'outside_document'});
- }
- my $caption_text = '';
-
- if (defined($float->{'caption_texi'}))
- {
- $caption_text = $caption;
- }
- elsif (defined($float->{'shortcaption_texi'}))
- {
- $caption_text = $shortcaption;
- }
- elsif (defined($caption))
- {
- $caption_text = $caption;
- }
-
- #return $caption_text;
- return info_default_close_command(undef, 'float', undef, $caption_text,
$additional_arguments);
-}
-
-sub info_default_listoffloats_entry($$$$)
-{
- my $style_texi = shift;
- my $float = shift;
- my $float_style = shift;
- my $caption = shift;
- my $href = shift;
-
- my @lines = split /^/, $caption;
- $caption = $lines[0];
- $caption = '' if (!defined($caption));
- chomp ($caption);
-
- my $result = '';
- #$caption .= ':' if ($caption ne '');
- my $caption_entry = "* $float_style: $float->{'text'}.";
- if (t2h_default_string_width($caption_entry) >
$info_default_listoffloat_caption_entry_length)
- {
- $caption_entry .= "\n" . ' ' x
$info_default_listoffloat_caption_entry_length;
- }
- else
- {
- $caption_entry .= ' ' x
($info_default_listoffloat_caption_entry_length - length($caption_entry));
- }
- my $width = $info_default_listoffloat_caption_entry_length;
- while ($caption =~ s/^(\S+\s*)//)
- {
- my $new_word = $1;
- if ((t2h_default_string_width($new_word) + $width) >
get_conf('FILLCOLUMN') - 3)
- {
- $caption_entry .= $info_default_listoffloat_append;
- last;
- }
- else
- {
- $caption_entry .= $new_word;
- $width += t2h_default_string_width($new_word);
- }
- }
- return $caption_entry. "\n";
-}
-
-sub info_default_listoffloats($$$)
-{
- my $style_texi = shift;
- my $style = shift;
- my $float_entries = shift;
-
- my $state = $Texi2HTML::THISDOC{'state'};
- my $info_state = info_default_get_state ($state);
- my $result = "* Menu:\n\n";
- foreach my $float_entry (@$float_entries)
- {
- $result .= $float_entry;
- }
- my ($parent_format, $in_format);
- ($parent_format, $in_format) =
info_default_parent_format($info_state->{'current'});
- #print STDERR "address@hidden not at top level\n" if ($in_format);
- info_default_increment_paragraph ($in_format, $parent_format, $info_state,
'listoffloats');
- return info_default_store_text($state,$result,'listoffloats');
-}
-
-sub info_default_raw($$)
-{
- my $style = shift;
- my $text = shift;
- my $expanded = 1 if (grep {$style eq $_} @EXPAND);
- # no warning for unknown raw formats
- if ($style eq 'verbatim' or $style eq 'verbatiminclude' or $expanded)
- {
- return info_default_store_text(undef, $text, $style, {'raw_command' =>
1});
- }
- return '';
-}
-
-sub info_default_line_command($$$$)
-{
- my $command = shift;
- my $arg_text = shift;
- my $arg_texi = shift;
- my $state = shift;
-
- main::line_warn(__("address@hidden after first node"),
$Texi2HTML::THISDOC{'line_nr'}) if (defined($info_default_current_node));
- return '' if ($arg_text eq '');
- $info_default_dir_specification .= "INFO-DIR-SECTION $arg_text\n";
- return '';
-}
-
-sub info_default_unknown_style($$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $state = shift;
- my $no_close = shift;
- my $no_open = shift;
-
- my ($result, $result_text, $message);
- $result_text = info_default_close_command(undef, $command, undef, undef,
undef);
- $message = "Unknown command with braces address@hidden'" if (!$no_open);
- return (1, $result_text, $message);
-}
-
-1;
Index: texi2html/formats/plaintext.init
===================================================================
RCS file: texi2html/formats/plaintext.init
diff -N texi2html/formats/plaintext.init
--- texi2html/formats/plaintext.init 15 Jul 2010 12:27:00 -0000 1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,168 +0,0 @@
-#+##############################################################################
-#
-# plaintext.init: convert to plaintext
-#
-# Copyright (C) 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-use strict;
-
-sub plaintext_default_load(;$)
-{
-my $from_command_line = shift;
-info_default_load();
-
-set_default('SHOW_MENU', 0);
-set_default('OUTFILE', '-');
-# unless(defined($OUT) and $OUT !~ m:/$:);
-set_default('HEADERS', 0);
address@hidden = ('plaintext');
-
-$print_page_head = \&plaintext_default_print_page_head;
-$print_page_foot = \&plaintest_default_print_page_foot;
-$element_heading = \&plaintext_default_element_heading;
-$image = \&plaintext_default_image;
-$print_index = \&plaintext_default_print_index;
-
-}
-
-sub plaintext_default_print_page_head($)
-{
- my $fh = shift;
-}
-
-sub plaintest_default_print_page_foot($)
-{
- my $fh = shift;
-}
-
-sub plaintext_default_element_heading($$$$$$$$$$$$)
-{
- my $info_result = &Texi2HTML::Config::info_default_element_heading(@_);
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
- my $one_section = shift;
- my $element_heading = shift;
- my $first_in_page = shift;
- my $is_top = shift;
- my $previous_is_top = shift;
- my $command_line = shift;
- my $element_id = shift;
- my $new_element = shift;
-
- return $info_result if (!$element->{'node'});
- return '';
-}
-
-sub plaintext_default_image($$$$$$$$$$$$$$$$$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- my $file_name = shift;
- my $alt = shift;
- my $width = shift;
- my $height = shift;
- my $raw_alt = shift;
- my $extension = shift;
- my $working_dir = shift;
- my $file_path = shift;
- my $in_paragraph = shift;
- my $file_locations = shift;
- my $base_simple_format = shift;
- my $extension_simple_format = shift;
- my $file_name_simple_format = shift;
- my $line_nr = shift;
-
- my $txt_path;
- my $found_file;
-
- my @extensions = @IMAGE_EXTENSIONS;
- if (defined($extension) and ($extension ne ''))
- {
- unshift @extensions, ".$extension";
- unshift @extensions, "$extension";
- }
- else
- {
- $extension = undef;
- }
- my $file_found_index = undef;
- my $file_index = 0;
-
- foreach my $file_location (@$file_locations)
- {
- my ($file_located, $path, $file_simple_format) = @$file_location;
- my $extension = shift @extensions;
- if (defined($path))
- {
- if ($extension eq 'txt' and !defined($txt_path))
- {
- $txt_path = $path;
- }
- elsif (!defined($found_file))
- {
- $found_file = [$file_located, $extension, $file_simple_format];
- $file_found_index = $file_index;
- }
- }
- $file_index++;
- }
-
- my $text = '';
- if (defined($txt_path))
- {
- if (open(TXT, "<$txt_path"))
- {
- my $in_encoding = get_conf('IN_ENCODING');
- if (defined($in_encoding) and get_conf('USE_UNICODE'))
- {
- binmode(TXT, ":encoding($in_encoding)");
- }
- $text='[' if ($in_paragraph or $preformatted);
- while (my $img_txt = <TXT>)
- {
- $text .= $img_txt;
- }
- $text .= ']' if ($in_paragraph or $preformatted);
- close(TXT);
- }
- else
- {
- main::line_warn (sprintf(__("address@hidden file `%s' unreadable:
%s"), $txt_path, $!), $line_nr);
- }
- }
- elsif (!defined($found_file))
- {
- main::line_warn (sprintf(__("Cannot find address@hidden file
`%s.txt'"), $base), $line_nr);
- }
- return $text;
-}
-
-sub plaintext_default_print_index($$)
-{
- my $text = shift;
- my $name = shift;
- return '';
-}
-
-1;
Index: texi2html/formats/xml.init
===================================================================
RCS file: texi2html/formats/xml.init
diff -N texi2html/formats/xml.init
--- texi2html/formats/xml.init 15 Jul 2010 12:27:00 -0000 1.31
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,1276 +0,0 @@
-# vim: set filetype=perl:
-#
-# Convert to texinfo xml.
-#
-# This file is in the public domain. Thus it may easily be used as an
-# example for further customizations.
-#
-# Originally written by Patrice Dumas in 2009.
-
-use strict;
-
-my @xml_multitable_stack = ();
-my @xml_table_stack = ();
-
-my @xml_ignored_misc_commands;
-my %xml_misc_command_output;
-my %xml_misc_elements_with_arg_map;
-my @xml_misc_elements_with_arg;
-my %def_format_xml;
-my $xml_current_section;
-
-sub xml_default_load(;$)
-{
-my $from_command_line = shift;
-
-t2h_default_set_variables_xml();
-set_default('DOCTYPE', '<!DOCTYPE texinfo PUBLIC "-//GNU//DTD TexinfoML
V4.12//EN" "http://www.gnu.org/software/texinfo/dtd/4.12/texinfo.dtd";>');
-set_default('SIMPLE_MENU', 0);
-set_default('SEPARATE_DESCRIPTION', 1);
address@hidden = ('xml', 'direntry');
-set_default('HEADERS', 0);
-set_default('INLINE_INSERTCOPYING', 0);
-set_default('SHOW_MENU', 1);
-set_default('SHOW_TITLE', 0);
-set_default('NUMBER_SECTIONS', 0);
-set_default('USE_NODES', 1);
-set_default('USE_SECTIONS', 1);
-set_default('SPLIT', '');
-
-t2h_default_push_handler(\&xml_init_variables, address@hidden);
-
-$colon_command_punctuation_characters{'.'} = '.';
-$colon_command_punctuation_characters{':'} = ':';
-$colon_command_punctuation_characters{'?'} = '?';
-$colon_command_punctuation_characters{'!'} = '!';
-
-$simple_map{'*'} = '&linebreak;';
-$simple_map{' '} = '&space;';
-$simple_map{"\t"} = '&space;';
-$simple_map{"\n"} = '&space;';
-$simple_map{'.'} = '&eosperiod;';
-$simple_map{'!'} = '&eosexcl;';
-$simple_map{'?'} = '&eosquest;';
-
-%simple_map_pre = %simple_map;
-
-# FIXME right?
-$things_map{'l'} = '/l';
-$things_map{'L'} = '/L';
-$things_map{'enddots'} = '&enddots;';
-$things_map{'dots'} = '&dots;';
-# FIXME equiv, point, expansion could be ameliorated
-$things_map{'equiv'} = '==';
-$things_map{'point'} = '-!-';
-$things_map{'expansion'} = '==>'; # →?
-
-$things_map{'minus'} = '−';
-$things_map{'result'} = '⇒';
-$things_map{'bullet'} = '•';
-$things_map{'copyright'} = '©right;';
-$things_map{'registeredsymbol'} = '®istered;';
-$things_map{'arrow'} = '→';
-$things_map{'TeX'} = '&tex;';
-$things_map{'LaTeX'} = '&latex;';
-
-%pre_map = %things_map;
-
-$stop_paragraph_command{'caption'} = 1;
-$stop_paragraph_command{'shortcaption'} = 1;
-
-%line_command_map = ();
-foreach my $command ('contents', 'shortcontents', 'summarycontents')
-{
- $line_command_map{$command} = $command;
-}
-
-%format_map = ();
-
-$format_map{'copying'} = '';
-$format_map{'titlepage'} = 'titlepage';
-$format_map{'documentdescription'} = 'documentdescription';
-$format_map{'group'} = 'group';
-$format_map{'raggedright'} = 'raggedright';
-
-foreach my $region ('titlepage', 'documentdescription', 'copying')
-{
- $region_formats_kept{$region} = 1;
-}
-
-%style_map = ();
-t2h_default_copy_style_map (\%default_style_map, \%style_map);
-
-foreach my $style (keys(%style_map))
-{
- next if grep {$style eq $_} ('asis', 'ctrl', 'w');
- if (grep {$style eq $_} ('tieaccent', 'dotless', keys(%unicode_accents)))
- {
- $style_map{$style} = { 'function' => \&xml_default_accent };
- }
- elsif (!exists($style_map{$style}->{'args'}) or
(scalar(@{$style_map{$style}->{'args'}}) eq 1 and
($style_map{$style}->{'args'}->[0] eq 'code' or
$style_map{$style}->{'args'}->[0] eq 'normal')))
- {
- $style_map{$style}->{'inline_attribute'} = $style;
- delete ($style_map{$style}->{'quote'});
- delete ($style_map{$style}->{'begin'});
- delete ($style_map{$style}->{'end'});
- delete ($style_map{$style}->{'function'});
- }
-}
-
-foreach my $complex_format (keys(%complex_format_map))
-{
- my $style = $complex_format_map{$complex_format}->{'style'};
- delete $complex_format_map{$complex_format};
- $complex_format_map{$complex_format}->{'begin'} = "<$complex_format
xml:space=\"preserve\">";
- $complex_format_map{$complex_format}->{'end'} = "</$complex_format>";
- $complex_format_map{$complex_format}->{'style'} = $style if
(defined($style));
-}
-foreach my $menu_command('menu', 'detailmenu', 'direntry', 'menu_comment')
-{
- $complex_format_map{$menu_command} = undef;
- delete $complex_format_map{$menu_command};
-}
-
-# this is not needed because normal_text isn't the same than in html
-#t2h_remove_text_substitutions("'", 1, 0, 0, 1);
-#t2h_remove_text_substitutions('`', 1, 0, 0, 1);
-
-$style_map{'w'}->{'end'} = '<!-- /@w -->';
-$style_map{'='}->{'function'} = \&xml_macron;
-$style_map{'email'}->{'function'} = \&xml_email;
-$style_map{'titlefont'}->{'function'} = \&xml_titlefont;
-$style_map{'math'}->{'function'} = \&xml_math;
-$style_map{'uref'}->{'function'} = \&xml_uref;
-$style_map{'url'}->{'function'} = \&xml_uref;
-$style_map{'t'}->{'inline_attribute'} = 'tt';
-# FIXME
-delete $special_accents{'ringaccent'};
-$special_accents{'ogonek'} = 'aeiuAEIU';
-
-%style_map_pre = %style_map;
-
-$no_paragraph_commands{'cindex'} = 0;
-
-#my @xml_ignored_misc_commands = ('bye', 'sp', 'verbatiminclude');
-
address@hidden = ('bye', 'sp', 'verbatiminclude', 'clickstyle',
- 'defcodeindex',
- 'syncodeindex', 'paragraphindent', 'shorttitlepage', 'refill', 'noindent');
-
-# we want to proceed all the misc commands
-# makeinfo ignores clickstyle, changes setfilename. Not sure it is right.
-foreach my $misc_command (keys(%misc_command))
-{
- next if (grep {$misc_command eq $_} @xml_ignored_misc_commands);
- $xml_misc_command_output{$misc_command} = 1;
-}
-
-$format_map{'menu'} = 'menu';
-# checked on bug-texinfo, only node is in code_style, as with makeinfo --xml
-#$format_code_style{'menu'} = 1;
-#$format_code_style{'menu_name'} = 1;
-#$format_code_style{'menu_description'} = 1;
-$format_map{'detailmenu'} = 'detailmenu';
-$format_map{'direntry'} = 'direntry';
-$format_map{'menu_comment'} = '';
-
-$menu_description = \&xml_menu_description;
-$menu_link = \&xml_menu_link;
-$element_heading = \&xml_heading;
-$heading = \&xml_heading;
-$paragraph = \&xml_paragraph;
-$preformatted = \&xml_preformatted;
-$misc_element_label = \&xml_noop;
-$element_label = \&xml_noop;
-$anchor_label = \&xml_anchor_label;
-$index_entry_label = \&xml_index_entry_label;
-$index_entry_command = \&xml_index_entry_command;
-$listoffloats = \&xml_listoffloats;
-$acronym_like = \&xml_acronym_like;
-$foot_line_and_ref = \&xml_foot_line_and_ref;
-$image = \&xml_image;
-$sp = \&xml_sp;
-$quotation = \&xml_quotation;
-$table_list = \&xml_table_list;
-$row = \&xml_row;
-$cell = \&xml_cell;
-$list_item = \&xml_list_item;
-$format_list_item_texi = \&xml_format_list_item_texi;
-$misc_command_line = \&xml_misc_commands;
-$begin_format_texi = \&xml_begin_format_texi;
-$def_line = \&xml_def_line;
-$def = \&xml_def;
-$def_item = \&xml_def_item;
-$printindex = \&xml_printindex;
-$index_summary = \&xml_index_summary;
-$external_ref = \&xml_external_ref;
-$internal_ref = \&xml_internal_ref;
-$table_item = \&xml_table_item;
-$table_line = \&xml_table_line;
-$float = \&xml_float;
-$caption_shortcaption = \&xml_caption_shortcaption;
-$caption_shortcaption_command = \&xml_caption_shortcaption_command;
-$normal_text = \&xml_normal_text;
-$protect_text = \&xml_default_protect_text;
-$paragraph_style_command = \&xml_paragraph_style_command;
-$raw = \&xml_raw;
-$cartouche = \&xml_cartouche;
-
-$print_Top = \&xml_print_Top;
-$print_Top_footer = \&xml_print_Top_footer;
-$print_page_head = \&xml_print_page_head;
-$print_foot_navigation = \&xml_noop;
-$toc_body = \&xml_noop;
-$about_body = \&xml_noop;
-$print_page_foot = \&xml_print_page_foot;
-$end_section = \&xml_end_section;
-$one_section = \&xml_one_section;
-
-%xml_misc_elements_with_arg_map = (
- 'title' => 'booktitle',
- 'subtitle' => 'booksubtitle'
-);
-
address@hidden = ('author',
- 'dircategory', 'settitle');
-#my @xml_misc_elements_with_arg = ('author', 'shorttitlepage',
-# 'vskip', 'dircategory', 'settitle');
-
-%def_format_xml = (
- 'deffn' => [ ['category', 'category'], ['function', 'name'] ],
- 'defvr' => [ ['category', 'category'], ['variable', 'name'] ],
- 'deftypefn' => [ ['category', 'category'], ['type', 'type'], ['function',
'name'] ],
- 'deftypeop' => [ ['category', 'category'], ['type', 'type'], ['operation',
'name'] ],
- 'deftypevr' => [ ['category', 'category'], ['type', 'type'], ['variable',
'name'] ],
- 'defcv' => [ ['category' , 'category'], ['class', 'class'], ['classvar',
'name'] ],
- 'deftypecv' => [ ['category', 'category'], ['type', 'type'], ['classvar',
'name'] ],
- 'defop' => [ ['category', 'category'], ['class', 'class'], ['operation',
'name'] ],
- 'deftp' => [ ['category', 'category'], ['datatype', 'name'] ]
-);
-
-
-}
-
-sub xml_macron($$)
-{
- my $accent = shift;
- my $args = shift;
- return $args->[0] . "¯";
-}
-
-sub xml_email($$)
-{
- my $command = shift;
- my $args = shift;
- my $mail = shift @$args;
- my $text = shift @$args;
- $mail = main::normalise_space($mail);
- my $result = "<email><emailaddress>$mail</emailaddress>";
- if (defined($text) and $text =~ /\S/)
- {
- $result .= "<emailname>".main::normalise_space($text)."</emailname>";
- }
- return $result . '</email>';
-}
-
-sub xml_uref($$)
-{
- shift;
- my $args = shift;
- my $url = shift @$args;
- my $text = shift @$args;
- my $replacement = shift @$args;
- $url = main::normalise_space($url);
- $replacement = '' if (!defined($replacement));
- $replacement = main::normalise_space($replacement);
- $text = '' if (!defined($text));
- $text = main::normalise_space($text);
- my $result = "<uref><urefurl>$url</urefurl>";
- $result .= "<urefdesc>$text</urefdesc>" if ($text ne '');
- $result .= "<urefreplacement>$replacement</urefreplacement>" if
($replacement ne '');
- return $result.'</uref>';
-}
-
-
-sub xml_titlefont($$)
-{
- shift;
- my $args = shift;
- return "<titlefont>$args->[0]</titlefont>";
-}
-
-sub xml_math($$)
-{
- shift;
- my $args = shift;
- my $text = shift @$args;
- return "<math>$text</math>";
-}
-
-
-sub xml_menu_description($$$)
-{
- my $text = shift;
- my $state = shift;
- my $element_text = shift;
- return "<menucomment>$text</menucomment>\n</menuentry>";
-}
-
-sub xml_menu_link($$$$$$$$$$)
-{
- my $entry = shift;
- my $state = shift;
- my $href = shift;
- my $menunode = shift;
- my $menutitle = shift;
- my $ending = shift;
- my $has_title = shift;
- my $command_stack = shift;
- my $in_preformatted = shift;
- my $menunode_normalized = shift;
-
- return
"<menuentry>\n<menunode>$menunode_normalized</menunode>\n<menutitle>$menutitle</menutitle>\n";
-}
-
-sub xml_print_page_head($)
-{
- my $fh = shift;
- my $setfilename = '';
- $setfilename =
"<setfilename>$Texi2HTML::THISDOC{'file_base_name'}.".get_conf('EXTENSION')."</setfilename>"
- unless (defined(get_conf('setfilename')) and get_conf('setfilename')
ne '');
- my $language = get_conf('documentlanguage');
- my $doctype = get_conf('DOCTYPE');
- print $fh <<EOT;
-<?xml version="1.0"?>
-$doctype
-<texinfo xml:lang="$language">
-$setfilename
-EOT
-}
-
-sub xml_print_page_foot($)
-{
- my $fh = shift;
- print $fh "". xml_close_section();
- print $fh <<EOT;
-</texinfo>
-EOT
-}
-
-sub xml_one_section($$)
-{
- my $fh = shift;
- my $element = shift;
- main::print_lines($fh);
- #print $fh "". xml_footing($element);
- &$print_foot_navigation($fh);
- &$print_page_foot($fh);
-}
-
-sub xml_heading($$$$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
-
-#print STDERR "'$command' $line";
- if (defined($command) and $command =~ /heading/)
- {
- my $text = '';
- if (defined($line))
- {
- $text = $line;
- # this isn't done in main program in that case...
- chomp ($text);
- $text =~ s/^\s*//;
- }
- return "<${command}>$text</${command}>\n";
- }
- elsif (defined($command) and $command eq 'node')
- {
-#print STDERR "node $command $node_element->{'texi'}\n";
- my $result = '';
- $result .= xml_close_section();
- $result .= "<node>\n";
- $result .= "<nodename>$element->{'text'}</nodename>\n";
- foreach my $direction('nodenext', 'nodeprev', 'nodeup')
- {
- if ($element->{$direction})
- {
- $result .=
"<${direction}>$element->{$direction}->{'text'}</${direction}>\n";
- }
- }
- $result .= "</node>\n";
- return $result;
-
- }
- else
- {
- my $result = '';
- $result .= xml_close_section();
- $result .=
"<".xml_element_tag($element).">\n<title>$element->{'text'}</title>\n";
- $xml_current_section = $element;
- return $result;
- }
-}
-
-sub xml_element_tag($)
-{
- my $element = shift;
- my $class = $element->{'tag_level'};
- return $class;
-}
-
-sub xml_close_section()
-{
- my $element = $xml_current_section;
-
- if (!defined($element))
- {
- return '';
- }
- my $result = '';
-
- $xml_current_section = undef;
-
- # there is a special case for a @chapter that is a child of @top
- # but should not be considered as is, since it is also toplevel.
- # @part, however may have other toplevel elements as children.
- return '' if ($element->{'child'} and (!$element->{'child'}->{'toplevel'}
or $element->{'tag'} ne 'top'));
- $result .= '</'.xml_element_tag($element).">\n";
-
- my $current = $element;
- # the second condition is such that top is closed only if it has
- # sub-elements below chapter.
- # the third condition is such that elements with a next element are
- # only closed for the last element, except when the next element is
- # toplevel and below top, such that @top is closed before the first
- # @chapter if there are @section or the like below @top
- while ($current->{'sectionup'} and !($current->{'sectionup'}->{'tag'} eq
'top' and $current->{'toplevel'}) and (!$current->{'childnext'} or
($current->{'childnext'}->{'toplevel'} and $current->{'sectionup'}->{'tag'} eq
'top')))
- {
- $current = $current->{'sectionup'};
- $result .= '</'.xml_element_tag($current).">\n";
- }
- return $result;
-
- ## there is a special case for a @chapter that is a child of @top
- ## but should not be considered as is, since it is also toplevel.
- #return '' if ($element->{'child'} and !$element->{'child'}->{'toplevel'});
- #$result .= '</'.xml_element_tag($element).">\n";
-
- #return $result if ($element->{'sectionnext'} or $element->{'level'} <= 1);
- #my $current = $element;
- #while ($current->{'level'} != 1 and $current->{'sectionup'} and
!$current->{'sectionnext'})
- #{
- # $current = $current->{'sectionup'};
- # $result .= '</'.xml_element_tag($current).">\n";
- #}
- #return $result;
-}
-
-sub xml_end_section($$$)
-{
- my $fh = shift;
- my $end_foot_navigation = shift;
- my $element = shift;
-}
-
-sub xml_print_Top($$$)
-{
- my $fh = shift;
- my $has_top_heading = shift;
- my $element = shift;
- main::print_lines($fh, $Texi2HTML::THIS_SECTION);
-}
-
-sub xml_print_Top_footer($$)
-{
- my $fh = shift;
- my $end_page = shift;
- my $element = shift;
-}
-
-# FIXME warning:
-#
-# @samp{first para
-#
-# second para}.
-#
-# maybe should lead to:
-# <para><samp>first para second para</samp>.</para>
-#
-# But it leads to
-# <para><samp>first para
-# </samp></para>
-# <para><samp>second para</samp>.
-# </para>
-sub xml_paragraph($$$$$$$$$$$$)
-{
- my $text = shift;
- my $align = shift;
- my $indent = shift;
- my $paragraph_command = shift;
- my $paragraph_command_formatted = shift;
- my $paragraph_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
- # no para in multitables, caption and shortcaptions.
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- return $text if ($top_stack eq 'multitable' or $top_stack eq
'shortcaption' or $top_stack eq 'caption' or $top_stack eq
'documentdescription');
-
- if ($text =~ /\S/)
- {
- return "<para>$text</para>";
- }
- return $text;
-}
-
-sub xml_preformatted($$$$$$$$$$$$)
-{
- my $text = shift;
- my $pre_style = shift;
- my $class = shift;
- my $leading_command = shift;
- my $leading_command_formatted = shift;
- my $preformatted_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
- return $text;
-}
-
-sub xml_misc_commands($$$$$)
-{
- my $macro = shift;
- my $line = shift;
- my $args = shift;
- my $stack = shift;
- my $state = shift;
-
-#print STDERR "$macro $line";
-#print STDERR "ARGS @$args\n" if defined ($args);
- return ($macro, $line, undef) unless($xml_misc_command_output{$macro});
-
- my $value_name = '';
- my $value = '';
- if ($macro eq 'set' or $macro eq 'clear')
- {
- my $value_line = $line;
- if ($value_line =~ s/^\s+([\w\-]+)//)
- {
- $value_name = $1;
- if ($macro eq 'set')
- {
- $value = $value_line;
- chomp ($value);
- $value =~ s/^\s*//;
- }
- }
- }
- my $result_text = "<${macro}></${macro}>";
- if ($macro eq 'set' or $macro eq 'clear')
- {
- $result_text = "<${macro}value
name=\"$value_name\">$value</${macro}value>\n";
- }
- if ($macro eq 'c' or $macro eq 'comment' and scalar(@$args))
- {
- my $comment_line = $args->[0];
- chomp ($comment_line);
- # makeinfo remove all the leading spaces
- $comment_line =~ s/^\s//;
- $result_text = &$comment ($comment_line);
- }
- if ($macro eq 'frenchspacing')
- {
- my $value = $args->[0];
- $value =~ s/\s*//g;
- $result_text = "<${macro} var=\"$value\"></${macro}>";
- }
- if (grep {$macro eq $_} @xml_misc_elements_with_arg)
- {
- my $arg = $args->[0];
- $arg =~ s/^\s*//;
- chomp($arg);
- $result_text = "<${macro}>".main::substitute_line($arg,
"address@hidden")."</${macro}>\n";
- }
- if (exists($xml_misc_elements_with_arg_map{$macro}))
- {
- my $arg = $args->[0];
- $arg =~ s/^\s*//;
- chomp($arg);
- $result_text =
"<$xml_misc_elements_with_arg_map{$macro}>".main::substitute_line($arg,
"address@hidden")."</$xml_misc_elements_with_arg_map{$macro}>\n";
- }
- if ($macro eq 'setfilename')
- {
- my $arg = $args->[0];
- #$arg =~ s/^\s*//;
- #$arg =~ s/\s*$//;
- #$arg = main::substitute_line($arg, "address@hidden");
- if ($arg =~ /\S/)
- {
- $arg = get_conf('setfilename');
- $arg =~ s/\.[^\.]*$//;
- $result_text = "<${macro}>${arg}.xml</${macro}>\n";
- }
- }
- return ($macro, $line, $result_text);
-}
-
-
-sub xml_anchor_label($$)
-{
- my $id = shift;
- my $anchor_text = shift;
- return '<anchor name="'. &$protect_text($anchor_text) . '"></anchor>';
-}
-
-sub xml_index_entry_command($$$$$)
-{
- my $command = shift;
- my $index_name = shift;
- my $label = shift;
- my $entry_texi = shift;
- my $entry_formatted = shift;
-
- return $label if (defined($label) and $label ne '');
- return
xml_index_entry_label('','','',$main::index_prefix_to_name{$index_name}, '',
'', $entry_formatted, {});
-}
-
-sub xml_index_entry_label($$$$$$$$$)
-{
- my $identifier = shift;
- my $preformatted = shift;
- my $formatted_entry = shift;
- my $index_name = shift;
- my $index_command = shift;
- my $texi_entry = shift;
- my $formatted_entry_reference = shift;
- my $in_region_not_in_output = shift;
- my $index_entry_ref = shift;
-
-
- return "<indexterm
index=\"${index_name}\">${formatted_entry_reference}</indexterm>";
-}
-
-sub xml_listoffloats($$$)
-{
- my $style_texi = shift;
- my $style = shift;
- my $float_entries = shift;
- # FIXME style, style_texi? Protected?
- return "<listoffloats type=\"$style\"></listoffloats>";
-}
-
-sub xml_acronym_like($$$$$$)
-{
- my $command = shift;
- my $acronym_texi = shift;
- my $acronym_text = shift;
- my $with_explanation = shift;
- my $explanation_lines = shift;
- my $explanation_text = shift;
- my $explanation_simply_formatted = shift;
-
- $command = 'abbrev' if ($command eq 'abbr');
- my $opening = "<${command}><${command}word>$acronym_text</${command}word>";
- if ($with_explanation)
- {
- $opening .= "<${command}desc>$explanation_text</${command}desc>";
- }
- return $opening . "</${command}>";
-}
-
-sub xml_foot_line_and_ref($$$$$$$)
-{
- my $number_in_doc = shift;
- my $number_in_page = shift;
- my $footnote_id = shift;
- my $place_id = shift;
- my $document_file = shift;
- my $footnote_file = shift;
- my $lines = shift;
- my $state = shift;
-
- my $result = '<footnote>';
- foreach my $line (@$lines)
- {
- $result .= $line;
- }
- return ([], $result . '</footnote>');
-}
-
-sub xml_image($$$$$$$$$$$$$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- my $file_name = shift;
- my $alt = shift;
- my $width = shift;
- my $height = shift;
- my $raw_alt = shift;
- my $extension = shift;
- my $working_dir = shift;
- my $file_path = shift;
- my $in_paragraph = shift;
- my $file_locations = shift;
-
- $alt = '' if (!defined($alt));
- # dirty hack to avoid " that can be here because of a @verb
- $alt =~ s/"/"/g;
-
- $width = '' if (!defined($width));
- $height = '' if (!defined($height));
-
- my $tag = 'inlineimage';
- $tag = 'image' if ($preformatted or !$in_paragraph);
-
- return "<$tag width=\"$width\" height=\"$height\" name=\"".
&$protect_text($base)."\"
extension=\"$extension\"><alttext>$alt</alttext></$tag>";
-}
-
-sub xml_sp($$)
-{
- my $number = shift;
- my $preformatted = shift;
- return "<sp lines=\"$number\"></sp>\n";
-}
-
-sub xml_quotation($$$$$)
-{
- my $command = shift;
- my $text = shift;
- my $argument_text = shift;
- my $argument_text_texi = shift;
- my $authors = shift;
- return "<$command>\n" . $text . "</$command>\n";
-}
-
-sub xml_format_list_item_texi($$$$)
-{
- my $format = shift;
- my $line = shift;
- my $prepended = shift;
- my $command = shift;
-
- my $result_line = undef;
-
- if (defined($command) and $command ne '' and !exists
$special_list_commands{$format}->{$command} and $format ne 'itemize')
- {
- address@hidden
- $line =~ s/^\s*//;
- $line =~ s/\s*$//;
- if (exists ($style_map{$command}))
- {
- $result_line = "address@hidden";
- }
- elsif (exists ($things_map{$command}))
- {
- $result_line = "address@hidden $line\n";
- }
- else
- {
- $result_line = "address@hidden $line\n";
- }
- }
-
- return ($result_line, 0);
-}
-
-sub xml_list_item($$$$$$$$$)
-{
- my $text = shift;
- my $format = shift;
- my $command = shift;
- my $formatted_command = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $prepended = shift;
- my $prepended_formatted = shift;
-
- return '<item>' . $text . "</item>\n";
-}
-
-sub xml_init_variables()
-{
- @xml_multitable_stack = ();
- @xml_table_stack = ();
- $xml_current_section = undef;
-}
-
-# row in multitable
-sub xml_row($$;$$)
-{
- my $text = shift;
- my $macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
-
- my $result = '';
- if ($macro eq 'headitem')
- {
- if ($xml_multitable_stack[-1] != 0)
- {
- $result .= "<thead>";
- $result = "</tbody>" . $result if ($xml_multitable_stack[-1] ==
1);
- $xml_multitable_stack[-1] = 0;
- }
- }
- elsif ($xml_multitable_stack[-1] != 1)
- {
- $result .= "<tbody>";
- $result = "</thead>" . $result if ($xml_multitable_stack[-1] == 0);
- $xml_multitable_stack[-1] = 1;
- }
- $result .= "<row>$text</row>";
-
- return $result;
-}
-
-# cell in multitable
-sub xml_cell($$;$$)
-{
- my $text = shift;
- my $row_macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
-
- return "<entry>" . $text . '</entry>';
-}
-
-sub xml_table_list($$$$$$$$$)
-{
- my $format_command = shift;
- my $text = shift;
- my $command = shift;
- my $formatted_command = shift;
-# enumerate
- my $item_nr = shift;
- my $enumerate_style = shift;
-# itemize
- my $prepended = shift;
- my $prepended_formatted = shift;
-# multitable
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $number = shift;
-
- my $result = "<$format_command>";
- if ($format_command eq 'itemize')
- {
- my $itemfunction;
- $prepended_formatted =~ s/^\s*// if (defined($prepended_formatted));
- if (defined($formatted_command) and $formatted_command ne '')
- {
- $itemfunction = $formatted_command;
- $itemfunction .= " $prepended_formatted" if
(defined($prepended_formatted) and $prepended_formatted ne '');
- }
- elsif (defined($prepended_formatted))
- {
- $itemfunction = $prepended_formatted;
- }
- $itemfunction = "•" if (!defined($itemfunction) or
- $itemfunction eq '');
- $result .= "<itemfunction>$itemfunction</itemfunction>";
- }
- elsif ($format_command eq 'enumerate')
- {
- $result = "<$format_command first=\"$enumerate_style\">";
- }
- elsif ($format_command eq 'multitable')
- {
- my $fractions;
- my $multiply = 1;
- if (defined($columnfractions) and (ref($columnfractions) eq 'ARRAY')
- and scalar(@$columnfractions))
- {
- $fractions = [ @$columnfractions ];
- $multiply = 100;
- }
- elsif (defined($prototype_lengths) and (ref($prototype_lengths) eq
'ARRAY')
- and scalar(@$prototype_lengths))
- {
- $fractions = [ @$prototype_lengths ];
- }
-
- if (defined ($fractions))
- {
- foreach my $fraction (@$fractions)
- {
- $result .=
"<columnfraction>".($fraction*$multiply)."</columnfraction>\n";
- }
- }
- $text .= "</tbody>" if ($xml_multitable_stack[-1] == 1);
- $text .= "</thead>" if ($xml_multitable_stack[-1] == 0);
- pop @xml_multitable_stack;
- }
- elsif ($format_command =~ /^(v|f)?table$/)
- {
- $result = '<table>';
- $text .= '</tableitem>' if ($xml_table_stack[-1] == 1);
- pop @xml_table_stack;
- return $result . "$text</table>\n";
- }
- return $result . "$text</$format_command>\n";
-}
-
-sub xml_begin_format_texi($$$)
-{
- my $command = shift;
- my $line = shift;
- my $state = shift;
-
- push (@xml_multitable_stack, -1) if ($command eq 'multitable');
- push (@xml_table_stack, 0) if ($command =~ /^(v|f)?table/);
- return $line;
-}
-
-sub xml_def_line($$$$$$$$$$$$$$$)
-{
- my $category_prepared = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- my $index_label = shift;
- my $arguments_array = shift;
- my $arguments_type_array = shift;
- my $unformatted_arguments_array = shift;
- my $command = shift;
- my $class_name = shift;
- my $category = shift;
- my $class = shift;
- my $style = shift;
- my $original_command = shift;
-
- my $result = "<definitionterm><indexterm index=\""
- .$main::index_prefix_to_name{$style}."\">$class_name</indexterm>";
-
- my %arguments = ( 'prepared_category' => $category_prepared,
- 'category' => $category,
- 'name' => $name,
- 'type' => $type,
- 'class' => $class
- );
- foreach my $type (keys(%arguments))
- {
- $arguments{$type} = '' if (!defined($arguments{$type}));
- }
-
- foreach my $mandatory_arg (@{$def_format_xml{$command}})
- {
- my $elem = $mandatory_arg->[0];
- $result .= "<def$elem>$arguments{$mandatory_arg->[1]}</def$elem>";
- }
-
- my $params = '';
- my @types = @$arguments_type_array;
- foreach my $arg (@$arguments_array)
- {
- my $type = shift @types;
- if (grep {$_ eq $type} ('param', 'paramtype', 'delimiter'))
- {
- $result .= "<def$type>$arg</def$type>";
- }
- }
-
- $result .= "</definitionterm>\n";
- return $result;
-}
-
-# FIXME
-# @deffn
-# @c comment
-# @end deffn
-# leads to the creation of a <definitionitem> with a comment within,
-# while there should be no definitionitem
-sub xml_def_item($$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
-
- if ($text =~ /\S/)
- {
- return '<definitionitem>' . $text . '</definitionitem>' unless
$only_inter_item_commands;
- return $text;
- }
- return '';
-}
-
-sub xml_def($)
-{
- my $text = shift;
- return '<definition>'.$text.'</definition>';
-}
-
-sub xml_index_summary($$)
-{
- my $alpha = shift;
- my $nonalpha = shift;
- return '';
-}
-
-sub xml_printindex($$)
-{
- my $name = shift;
- my $printindex = shift;
- return "<printindex>$name</printindex>\n";
-}
-
-sub xml_any_ref($$)
-{
- my $type = shift;
- my $args = shift;
- my $result = '';
- if ($type eq 'pxref')
- {
- $result = gdt('see ',{'duplicate'=>1});
- }
- elsif ($type eq 'xref' or $type eq 'inforef')
- {
- $result = gdt('See ',{'duplicate'=>1});
- }
- if ($type eq 'inforef')
- {
- $result .= "<inforef><inforefnodename>$args->[0]</inforefnodename>";
- $result .= "<inforefrefname>$args->[1]</inforefrefname>" if
($args->[1] ne '');
- $result .= "<inforefinfoname>$args->[2]</inforefinfoname></inforef>"
- }
- else
- {
- $result .= "<xref><xrefnodename>$args->[0]</xrefnodename>";
- $result .= "<xrefinfoname>$args->[1]</xrefinfoname>" if ($args->[1] ne
'');
- $result .= "<xrefprinteddesc>$args->[2]</xrefprinteddesc>" if
($args->[2] ne '');
- $result .= "<xrefinfofile>$args->[3]</xrefinfofile>" if ($args->[3] ne
'');
- $result .= "<xrefprintedname>$args->[4]</xrefprintedname>" if
($args->[4] ne '');
- $result .= '</xref>';
- }
- return $result;
-}
-
-sub xml_external_ref($$$$$$$$$)
-{
- my $type = shift;
- my $section = shift;
- my $book = shift;
- my $file = shift;
- my $href = shift;
- my $cross_ref = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
- my $node = shift;
-
- return xml_any_ref ($type, $formatted_args);
-}
-
-sub xml_internal_ref($$$$$)
-{
- my $type = shift;
- my $href = shift;
- my $short_name = shift;
- my $name = shift;
- my $is_section = shift;
- my $args_texi = shift;
- my $formatted_args = shift;
-
- return xml_any_ref ($type, $formatted_args);
-}
-
-sub xml_table_item($$$$$$$)
-{
- my $text = shift;
- my $index_label = shift;
- my $format = shift;
- my $command = shift;
-# my $formatted_command = shift;
- my $style_stack = shift;
-# my $text_formatted = shift;
-# my $text_formatted_leading_spaces = shift;
-# my $text_formatted_trailing_spaces = shift;
- my $item_cmd = shift;
- my $formatted_index_entry = shift;
-
-
-# $formatted_command = '' if (!defined($formatted_command));
-#
-# if (defined($text_formatted))
-# {
-# $text_item = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
-# }
-# else
-# {
-# $text_item = $text;
-# }
-
- my $result = '';
- if ($item_cmd eq 'item')
- {
- $result .= '</tableitem>' if ($xml_table_stack[-1] == 1);
- $xml_table_stack[-1] = 1;
- $result .= '<tableitem>';
- }
- $result .= '<tableterm>';
- #print STDERR "$text | $format | $command | $formatted_command |
$text_formatted | $item_cmd \n";
- my $indexterm = '';
-#print STDERR "FFFFFFFFFFFFFFFFf `$index_label' `$text'\n";
- if ($format =~ /^(v|f)/)
- {
-# my $index_prefix = $1;
-# $indexterm = $text;
-# $indexterm =~ s/^\s*//;
-# $result .= "<indexterm
index=\"$main::index_prefix_to_name{$index_prefix}\">$formatted_index_entry</indexterm>";
- $result .= "$index_label";
- }
- $result .= $text ."</tableterm>\n";
- return $result;
-}
-
-sub xml_table_line($)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- if ($text =~ /\S/)
- {
- return "<item>$text</item>" unless $only_inter_item_commands;
- return $text;
- }
- else
- {
- return '';
- }
-}
-
-sub xml_caption_shortcaption($)
-{
- my $float = shift;
- my $caption_lines;
- my $shortcaption_lines;
- if (defined($float->{'caption_texi'}))
- {
- @$caption_lines = @{$float->{'caption_texi'}};
- }
- if (defined($float->{'shortcaption_texi'}))
- {
- @$shortcaption_lines = @{$float->{'shortcaption_texi'}};
- }
- return ($caption_lines, $shortcaption_lines);
-}
-
-sub xml_caption_shortcaption_command($$$)
-{
- my $command = shift;
- my $text = shift;
- my $texi_lines = shift;
- my $float_element = shift;
-
- if ($text =~ /\S/)
- {
- return "<$command>$text</$command>";
- }
- return '';
-}
-
-sub xml_float($$$$$)
-{
- my $text = shift;
- my $float = shift;
- my $caption = shift;
- my $shortcaption = shift;
-
- # FIXME don't use the texi, but a normalized node name
- my $label_texi = $float->{'texi'};
- $label_texi = '' if (!defined($label_texi));
- my $result = "<float name=\"$label_texi\">\n";
- my $style = $float->{'style'};
- $style = '' if (!defined($style));
- $result .= "<floattype>$style</floattype>\n";
- $result .= "<floatpos></floatpos>\n";
- $result .= $text;
- return $result."</float>\n";
-}
-
-sub xml_normal_text($$$$$$$;$)
-{
- my $text = shift;
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
-#print STDERR "Bug: in_raw_text in_simple $text\n" if ($in_raw_text and
$in_simple);
- my $style_stack = shift;
- my $state = shift;
-
- $text = &$protect_text($text) unless($in_raw_text);
-
- if (! $in_code and !$in_preformatted and !$in_raw_text)
- {
- $text =~ s/---/\&mdash\;/g;
- $text =~ s/--/\&ndash\;/g;
- $text =~ s/``/\&ldquo\;/g;
- $text =~ s/''/\&rdquo\;/g;
- }
- return $text;
-}
-
-sub xml_paragraph_style_command($$)
-{
- my $format = shift;
- my $text = shift;
- return "<$format>$text</$format>" if ($format eq 'center');
- return $text;
-}
-
-sub xml_raw($$)
-{
- my $style = shift;
- my $text = shift;
-
- if ($style eq 'verbatim' or $style eq 'verbatiminclude')
- {
- return '<verbatim xml:space="preserve">' . &$protect_text($text) .
'</verbatim>';
- }
- return '' unless (grep {$style eq $_} @EXPAND);
- if ($style eq 'xml')
- {
- chomp ($text);
- return $text;
- }
- else
- {
- main::msg_warn ("Raw style $style not handled",
$Texi2HTML::THISDOC{'line_nr'});
- return &$protect_text($text);
- }
-}
-
-sub xml_cartouche($$)
-{
- my $text = shift;
-
- return "<cartouche>$text</cartouche>";
-}
-
-sub xml_noop
-{
- return '';
-}
-
-1;
Index: texi2html/maintained_extra/book.init
===================================================================
RCS file: texi2html/maintained_extra/book.init
diff -N texi2html/maintained_extra/book.init
--- texi2html/maintained_extra/book.init 15 Jul 2010 12:27:00 -0000
1.7
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,208 +0,0 @@
-# A style that tries to be analogous with a book, in HTML.
-#
-# This file is in the public domain. Thus it may easily be used as an
-# example for further customizations.
-#
-# Originally written by Patrice Dumas in 2004.
-# Modified in 2007, 2008.
-#
-# This style is based on the scriptbasic style.
-
-#html_default_load();
-t2h_default_load_format('html');
-
-set_default('contents', 1);
-
-set_default('INLINE_CONTENTS', 1);
-set_default('USE_TITLEPAGE_FOR_TITLE', 1);
-
address@hidden =
- (
- 'Back', 'Forward', ' ', 'Contents', 'Index', 'About'
- );
-
address@hidden = @SECTION_BUTTONS;
address@hidden = @SECTION_BUTTONS;
-
address@hidden = ('Contents', 'Index', 'About');
address@hidden = @SECTION_FOOTER_BUTTONS;
-
address@hidden = ('Back', 'Forward');
-
-set_default('WORDS_IN_PAGE', undef);
-set_default('SHOW_MENU', 0);
-
-$BIG_RULE = '<hr>';
-
-#FIXME lift that constraint once it is better supported
-set_default('USE_SECTIONS', 1);
-set_default('USE_NODES', undef);
-
-push @command_handler_init, \&book_initialize_variables;
-
-sub book_print_sub_toc($$);
-
-sub book_print_sub_toc($$)
-{
- my $parent_element = shift;
- my $element = shift;
- my $result = "<li> ".&$anchor('', main::href($element,
$parent_element->{'file'}), $element->{'text'}) . " </li>\n";
-#print STDERR "SUB_TOC $element->{'text'}\n"; #sleep 1;
- if (exists($element->{'child'}))
- {
-#print STDERR "SUB_TOC child $element->{'child'}->{'text'}\n";
- $result .=
'<li>'.html_default_attribute_class('ul',$NO_BULLET_LIST_CLASS).">\n".
book_print_sub_toc($parent_element, $element->{'child'}) ."</ul></li>\n";
- }
- if (exists($element->{'sectionnext'}))
- {
-#print STDERR "SUB_TOC next($element->{'text'})
$element->{'next'}->{'text'}\n";
- $result .= book_print_sub_toc($parent_element,
$element->{'sectionnext'});
- }
- return $result;
-}
-
-sub book_print_up_toc($)
-{
- my $element = shift;
-
- my $result = '';
- my $current_element = $element;
- my @elements;
- while (defined($current_element->{'sectionup'}) and
($current_element->{'sectionup'} ne $current_element))
- {
- unshift (@elements, $current_element->{'sectionup'});
- $current_element = $current_element->{'sectionup'};
- }
- # this happens for example for top element
- return '' if !(@elements);
- #print $fh "<ul>" . &$anchor('', $Texi2HTML::HREF{Contents}, '[' .
$Texi2HTML::NAME{Contents} . ']') . " <br>\n";
- my $elem = shift @elements;
- $result .= html_default_attribute_class('ul',
$NO_BULLET_LIST_CLASS)."><li>" . &$anchor('', main::href($elem,
$element->{'file'}), $elem->{'text'}) . " </li>\n";
- foreach my $elem (@elements)
- {
- $result .= '<li>'.html_default_attribute_class('ul',
$NO_BULLET_LIST_CLASS)."><li>" . &$anchor('', main::href($elem,
$element->{'file'}), $elem->{'text'}) . " </li>\n";
- }
- foreach my $elem (@elements)
- {
- $result .= "</ul></li>\n";
- }
- $result .= "</ul>\n";
-}
-
-$print_head_navigation = \&book_print_head_navigation;
-
-sub book_print_head_navigation($$)
-{
- my $fh = shift;
- my $buttons = shift;
- my $first_in_page = shift;
- my $previous_is_top = shift;
- my $element = shift;
-
- if (defined($element) and $first_in_page)
- {
- return book_print_up_toc($Texi2HTML::THIS_ELEMENT) .
- HTML_DEFAULT_print_head_navigation($fh, $buttons, $first_in_page,
$previous_is_top, $element);
- }
- return HTML_DEFAULT_print_head_navigation($fh, $buttons, $first_in_page,
$previous_is_top, $element);
-}
-
-my $unumbered_nr;
-my $previous_nr;
-my $previous_file_name;
-
-sub book_initialize_variables()
-{
- $unumbered_nr = -1;
- $previous_nr = undef;
- $previous_file_name = undef;
-}
-
-$element_file_name = \&book_element_file_name;
-
-sub book_element_file_name($$$)
-{
- my $element = shift;
- my $type = shift;
- my $prefix = shift;
-
- return undef if (get_conf('NODE_FILENAMES') or !get_conf('SPLIT'));
- return undef if (!defined($element));
-
- if (defined($previous_nr) and ($element->{'doc_nr'} == $previous_nr))
- {
- return $previous_file_name;
- }
- if ($type eq 'top')
- {
- $previous_file_name = "${prefix}_top.html";
- }
- elsif (defined($element->{'plain_number'}) and ($element->{'plain_number'}
ne ''))
- {
- my $number = $element->{'plain_number'};
- $number .= '.' unless ($number =~ /\.$/);
- $previous_file_name = "${prefix}_$number" . 'html';
- }
- else
- {
- $unumbered_nr++;
- $previous_file_name = "${prefix}_U." . $unumbered_nr . '.html';
- }
- $previous_nr = $element->{'doc_nr'};
- return $previous_file_name;
-}
-
-$heading = \&book_heading;
-
-sub book_heading($$$$$$;$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
- my $one_section = shift;
- my $element_heading = shift;
-
- my $level = 3;
-
- if (!$element->{'node'})
- {
- $level = $element->{'level'};
- }
- else
- {
- return '' unless ($element->{'this'} and !$element->{'with_section'});
- }
- my $text = $element->{'text'};
- my $class = $element->{'tag_level'};
- $class = 'node' if ($element->{'node'});
- my $result = '';
-
- if (get_conf('TOC_LINKS') and $command !~ /heading/ and
defined($element->{'tocid'}))
- {
- $text = &$anchor ('',
"$Texi2HTML::THISDOC{'toc_file'}#$element->{'tocid'}", $text);
- }
- if (!$in_preformatted)
- {
- $result = &$heading_text("address@hidden", $text, $level);
- }
- else
- {
- $result = &$heading_text_preformatted("address@hidden", $text, $level);
- }
- # @top should already have a table of contents, either because there
- # is a @contents, or setcontentsaftertitlepage is set.
- # In any case it would just be a duplication
- # of the table of contents, better let the user decide where it should be.
- if (exists($element->{'child'})
- and ($element->{'tag_level'} !~ /heading/) and $element->{'tag'} ne
'top')
- {
- $result .=
html_default_attribute_class('ul',$NO_BULLET_LIST_CLASS).">\n";
- $result .= "" . book_print_sub_toc($element, $element->{'child'});
- $result .= "</ul>\n";
- }
- return $result;
-}
-
-1;
Index: texi2html/maintained_extra/chm.init
===================================================================
RCS file: texi2html/maintained_extra/chm.init
diff -N texi2html/maintained_extra/chm.init
--- texi2html/maintained_extra/chm.init 15 Jul 2010 12:27:00 -0000 1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,444 +0,0 @@
-# -*-perl-*-
-
-#+##############################################################################
-#
-# chm.init: convert to chm intermediate formats hhp, hhc, hhk and html files
-#
-# Copyright (C) 2004, 2006, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-use strict;
-
-#html_default_load();
-t2h_default_load_format('html');
-
-set_default('TOP_NODE_FILE', undef);
-set_default('TOP_FILE', undef);
-
-#$SECTION_NAVIGATION = 0; # to avoid headers in normal elements
-set_default('SHOW_MENU', 0);
-set_default('SPLIT', 'node');
-set_default('contents', 1);
-set_default('SPLIT_INDEX', undef);
-set_default('IDX_SUMMARY', 1);
-
-$SMALL_RULE = '';
-$DEFAULT_RULE = '';
-$MIDDLE_RULE = '';
-$BIG_RULE = '';
-
-# FIXME why was documentdescription set?
-#set_from_init_file('documentdescription', '');
-set_default('footnotestyle', 'end');
-
-#FIXME remove that later
-set_default('USE_SECTIONS', 1);
-
-push @command_handler_process, \&chm_initialize_variables;
-
-$index_summary_file_entry = \&chm_index_summary_file_entry;
-$index_summary_file_begin = \&chm_index_summary_file_begin;
-$index_summary_file_end = \&chm_index_summary_file_end;
-
-$print_page_foot = \&chm_print_page_foot;
-# no-ops to avoid headers and footers
-$print_head_navigation = \&chm_noop;
-#$print_Top_footer = \&chm_noop;
-$print_foot_navigation = \&chm_noop;
-
-my $default_toc_body = $toc_body;
-$toc_body = \&chm_toc_body;
-
-$finish_out = \&chm_finish_out;
-my $default_init_out = $init_out;
-
-$init_out = \&chm_init_out;
-
-my %chm_languages = (
- 'en' => '0x409 English (United States)',
- 'sq' => '0x041c Albanian',
-# 'ar' => '0x1401 Arabic (ALGERIA)',
-# 'es' => '0x2c0a Spanish (ARGENTINA)',
-# 'en' => '0x0c09 English (AUSTRALIA)',
-# 'de' => '0x0c07 German (AUSTRIA)',
-# 'ar' => '0x3c01 Arabic (BAHRAIN)',
- 'be' => '0x0423 Byelorussian',
-# 'fr' => '0x080c French (BELGIUM)',
-# 'en' => '0x2809 English (BELIZE)',
-# 'es' => '0x400a Spanish (BOLIVIA)',
-# 'pt' => '0x0416 Portuguese (BRAZIL)',
-# 'ms' => '0x083e Malay (BRUNEI DARUSSALAM)',
- 'bg' => '0x0402 Bulgarian',
-# 'fr' => '0x0c0c French (CANADA)',
-# 'es' => '0x340a Spanish (CHILE)',
- 'zh' => '0x0804 Chinese (CHINA)',
-# 'es' => '0x240a Spanish (COLOMBIA)',
-# 'es' => '0x140a Spanish (COSTA RICA)',
- 'hr' => '0x041a Croatian',
- 'cs' => '0x0405 Czech',
- 'da' => '0x0406 Danish',
-# 'es' => '0x1c0a Spanish (DOMINICAN REPUBLIC)',
-# 'es' => '0x300a Spanish (ECUADOR)',
-# 'ar' => '0x0c01 Arabic (EGYPT)',
-# 'es' => '0x440a Spanish (EL SALVADOR)',
- 'et' => '0x0425 Estonian',
- 'fo' => '0x0438 Faeroese',
- 'fi' => '0x040b Finnish',
- 'fr' => '0x040c French (FRANCE)',
- 'de' => '0x0407 German (GERMANY)',
- 'el' => '0x0408 Greek',
-# 'es' => '0x100a Spanish (GUATEMALA)',
-# 'es' => '0x480a Spanish (HONDURAS)',
-# 'zh' => '0x0c04 Chinese (HONG KONG)',
- 'hu' => '0x040e Hungarian',
- 'is' => '0x040f Icelandic',
- 'hi' => '0x0439 Hindi',
- 'in' => '0x04',
- 'fa' => '0x0429 Farsi',
-# 'ar' => '0x0801 Arabic (IRAQ)',
-# 'en' => '0x1809 English (IRELAND)',
- 'iw' => '0x04',
- 'it' => '0x0410 Italian',
-# 'en' => '0x2009 English (JAMAICA)',
- 'ja' => '0x0411 Japanese',
-# 'ar' => '0x2c01 Arabic (JORDAN)',
- 'sw' => '0x0441 Swahili',
- 'ko' => '0x0412 Korean',
-# 'ar' => '0x3401 Arabic (KUWAIT)',
- 'al' => '0x0426 Latvian (Lettish)',
-# 'ar' => '0x3001 Arabic (LEBANON)',
-# 'ar' => '0x1001 Arabic (LIBYAN ARAB JAMAHIRIYA)',
-# 'de' => '0x1407 German (LIECHTENSTEIN)',
- 'lt' => '0x0427 Lithuanian',
-# 'de' => '0x1007 German (LUXEMBOURG)',
-# 'zh' => '0x1404 Chinese (MACAU)',
- 'mk' => '0x042f Macedonian',
-# 'ms' => '0x043e Malay (MALAYSIA)',
-# 'es' => '0x080a Spanish (MEXICO)',
-# 'fr' => '0x180c French (MONACO)',
-# 'ar' => '0x1801 Arabic (MOROCCO)',
- 'nl' => '0x0413 Dutch',
-# 'en' => '0x1409 English (NEW ZEALAND)',
-# 'es' => '0x4c0a Spanish (NICARAGUA)',
- 'no' => '0x0414 Norwegian',
-# 'ar' => '0x2001 Arabic (OMAN)',
- 'ur' => '0x0420 Urdu',
-# 'es' => '0x180a Spanish (PANAMA)',
-# 'es' => '0x3c0a Spanish (PARAGUAY)',
-# 'es' => '0x280a Spanish (PERU)',
-# 'en' => '0x3409 English (PHILIPPINES)',
- 'pl' => '0x0415 Polish',
- 'pt' => '0x0816 Portuguese (PORTUGAL)',
-# 'es' => '0x500a Spanish (PUERTO RICO)',
-# 'ar' => '0x4001 Arabic (QATAR)',
- 'ro' => '0x0418 Romanian',
- 'ru' => '0x0419 Russian',
- 'ar' => '0x0401 Arabic (SAUDI ARABIA)',
-# 'zh' => '0x1004 Chinese (SINGAPORE)',
- 'sk' => '0x041b Slovak',
- 'sl' => '0x0424 Slovenian',
- 'af' => '0x0436 Afrikaans',
- 'ca' => '0x0403 Catalan',
- 'sv' => '0x041d Swedish',
-# 'de' => '0x0807 German (SWITZERLAND)',
-# 'ar' => '0x2801 Arabic (SYRIAN ARAB REPUBLIC)',
-# 'zh' => '0x0404 Chinese (TAIWAN, PROVINCE OF CHINA)',
- 'th' => '0x041e Thai',
-# 'en' => '0x2c09 English (TRINIDAD AND TOBAGO)',
-# 'ar' => '0x1c01 Arabic (TUNISIA)',
- 'tr' => '0x041f Turkish',
- 'uk' => '0x0422 Ukrainian',
-# 'ar' => '0x3801 Arabic (UNITED ARAB EMIRATES)',
-# 'en' => '0x0809 English (UNITED KINGDOM)',
-# 'en' => '0x0409 English (UNITED STATES)',
-# 'es' => '0x380a Spanish (URUGUAY)',
-# 'es' => '0x200a Spanish (VENEZUELA)',
- 'vi' => '0x242a Vietnamese',
-# 'ar' => '0x2401 Arabic (YEMEN)',
-# 'en' => '0x3009 English (ZIMBABWE)',
- #'' => '',
-);
-
-my %hhk_global_property = (
- 'ImageType' => 'Folder',
-);
-
-my %hhc_global_property = (
- 'ImageType' => 'Folder',
-);
-
-
-######################################### not used
-#
-# if needed texi to unicode, maybe this could be in utf8.init, but currently
-# no unicode
-my %chm_texi_map = %texi_map;
-my %chm_simple_map_texi = %simple_map_texi;
-my %chm_style_map_texi = ();
-
-foreach my $command (keys(%style_map_texi))
-{
- $chm_style_map_texi{$command} = {};
- foreach my $key (keys (%{$style_map_texi{$command}}))
- {
-#print STDERR "$command, $key, $style_map_texi{$command}->{$key}\n";
- $chm_style_map_texi{$command}->{$key} =
- $style_map_texi{$command}->{$key};
- }
-}
-
-foreach my $key (keys(%unicode_accents))
-{
-# $chm_style_map{$key}->{'function'} = \&t2h_utf8_accent;
- $chm_style_map_texi{$key}->{'function'} = \&t2h_utf8_accent;
-}
-
-foreach my $key (%things_map)
-{
- if (exists($unicode_map{$key}) and ($unicode_map{$key} ne ''))
- {
-# $chm_things_map{$key} = chr(hex($unicode_map{$key}));
- $chm_texi_map{$key} = chr(hex($unicode_map{$key}));
- }
-}
-
-$chm_simple_map_texi{"\n"} = ' ';
-######################################### end not used
-
-# at least kchmviewer has trouble with the corresponding textual entities
-foreach my $thing ('OE', 'oe', 'euro')
-{
- $things_map{$thing} = $numeric_entity_map{$thing};
- $pre_map{$thing} = $numeric_entity_map{$thing};
- $simple_format_texi_map{$thing} = $numeric_entity_map{$thing};
-}
-
-my $hhp_lines;
-# this cannot be in chm_init_out, because it should be before toc_body
-# call.
-sub chm_initialize_variables()
-{
- $hhp_lines = '';
-}
-
-sub chm_init_out()
-{
- &$default_init_out();
- return if ($null_device_file{$Texi2HTML::THISDOC{'filename'}->{'top'}});
- my $hhk_file =
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}"
. ".hhk";
- open (IDXFILE, ">$hhk_file") or
- die "Can't open $hhk_file for writing: $!\n";
- if (get_conf('USE_UNICODE') and get_conf('OUT_ENCODING'))
- {
- binmode(IDXFILE, ":encoding(".get_conf('OUT_ENCODING').")");
- }
-
- print "# writing HTML Help index in $hhk_file...\n" if
(get_conf('VERBOSE'));
- print IDXFILE "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n<HTML>\n";
- print IDXFILE "<HEAD>\n<meta name=\"GENERATOR\"
content=\"$Texi2HTML::THISDOC{'program'}\">\n";
- print IDXFILE "<!-- Sitemap 1.0 -->\n</HEAD>\n<BODY>\n";
- print IDXFILE "<OBJECT type=\"text/site properties\">\n";
- foreach my $property (sort(keys(%hhk_global_property)))
- {
- print IDXFILE "<param name=\"$property\"
value=\"$hhk_global_property{$property}\">\n";
-
- }
- print IDXFILE "</OBJECT>\n";
-
- my $hhp_file =
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}.hhp";
- print "# writing HTML Help project in $hhp_file...\n" if
(get_conf('VERBOSE'));
- open (HHPFILE, ">$hhp_file") or
- die "Can't open $hhp_file for writing: $!\n";
- if (get_conf('USE_UNICODE') and get_conf('OUT_ENCODING'))
- {
- binmode(HHPFILE, ":encoding(".get_conf('OUT_ENCODING').")");
- }
- my $language = $chm_languages{'en'};
- my $documentlanguage = get_conf('documentlanguage');
- $documentlanguage =~ s/_.*//;
- if (exists ($chm_languages{$documentlanguage}))
- {
- $language = $chm_languages{$documentlanguage};
- }
- my $title = main::remove_texi($Texi2HTML::THISDOC{'title_texi'});
- my $top_file = $Texi2HTML::THISDOC{'filename'}->{'top'};
- print HHPFILE <<EOT;
-[OPTIONS]
-Compatibility=1.1 or later
-Compiled file=$Texi2HTML::THISDOC{'file_base_name'}.chm
-Contents file=$Texi2HTML::THISDOC{'file_base_name'}.hhc
-Default Window=Default
-Default topic=$top_file
-Display compile progress=No
-Full-text search=Yes
-Index file=$Texi2HTML::THISDOC{'file_base_name'}.hhk
-Language=$language
-Title=$title
-
-[WINDOWS]
-Default=,"$Texi2HTML::THISDOC{'file_base_name'}.hhc","$Texi2HTML::THISDOC{'file_base_name'}.hhk","$top_file","$top_file",,,,,0x22520,,0x384e,,,,,,,,0
-
-[FILES]
-EOT
-}
-
-sub chm_print_page_foot($)
-{
- my $fh = shift;
- print $fh <<EOT;
-<p>
-$PRE_BODY_CLOSE
-</p>
-</body>
-</html>
-EOT
-}
-
-sub chm_noop($$)
-{
- return '';
-}
-
-# Convert texi to string
-sub chm_text($)
-{
- my $text = shift;
- my $result = main::simple_format(undef,undef,'chm_text',$text);
- return $result;
-}
-
-my @hhc_elements;
-
-# For hhc, collect elements here, do the formatting later
-sub chm_toc_body($)
-{
- my $elements_ref = shift;
- &$default_toc_body($elements_ref);
- my %chm_files;
- @hhc_elements = @$elements_ref;
-
- foreach my $element (@$elements_ref)
- {
- if (!$chm_files{$element->{'file'}})
- {
- $hhp_lines .= "$element->{'file'}\n";
- $chm_files{$element->{'file'}} = 1;
- }
- }
-}
-
-# key:
-# origin_href:
-# entry:
-# texi entry:
-# element_href:
-# element_text:
-sub chm_index_summary_file_entry ($$$$$$$$)
-{
- my $name = shift;
- my $key = shift;
- my $origin_href = shift;
- my $entry = shift;
- my $text = '';
- #$entry = &$protect_text($key);
- my $texi_entry = shift;
- my $element_href = shift;
- my $element_text = shift;
- my $is_printed = shift;
- $entry = chm_text($texi_entry);
- print IDXFILE "<LI> <OBJECT type=\"text/sitemap\">\n<param name=\"Name\"
value=\"$entry\">\n<param name=\"Local\" value=\"$origin_href\">\n</OBJECT>
</LI>\n" if ($key =~ /\S/);
-}
-
-sub chm_index_summary_file_begin($$)
-{
- my $name = shift;
- my $is_printed = shift;
- # avoid entities in hh* files.
- # set this unconditionally, as if it was set from the command-line.
- t2h_default_set_iso_symbols(0,0,1);
-}
-
-# file is not closed here but in finish_out.
-sub chm_index_summary_file_end($$)
-{
- my $name = shift;
- my $is_printed = shift;
-}
-
-sub chm_finish_out()
-{
- return if ($null_device_file{$Texi2HTML::THISDOC{'filename'}->{'top'}});
- print IDXFILE "</BODY>\n</HTML>\n";
- close (IDXFILE);
- my $hhc_file =
"$Texi2HTML::THISDOC{'destination_directory'}$Texi2HTML::THISDOC{'file_base_name'}.hhc";
- open (HHCFILE, ">$hhc_file") or
- die "Can't open $hhc_file for writing: $!\n";
- if (get_conf('USE_UNICODE') and get_conf('OUT_ENCODING'))
- {
- binmode(HHCFILE, ":encoding(".get_conf('OUT_ENCODING').")");
- }
-
- print HHCFILE "<!DOCTYPE HTML PUBLIC \"-//IETF//DTD HTML//EN\">\n<HTML>\n";
- print HHCFILE "<HEAD>\n<meta name=\"GENERATOR\"
content=\"$Texi2HTML::THISDOC{'program'}\">\n";
- print HHCFILE "<!-- Sitemap 1.0 -->\n</HEAD>\n<BODY>\n";
- print HHCFILE "<OBJECT type=\"text/site properties\">\n";
- foreach my $property (sort(keys(%hhc_global_property)))
- {
- print HHCFILE "<param name=\"$property\"
value=\"$hhc_global_property{$property}\">\n";
-
- }
- print HHCFILE "</OBJECT>\n";
- my @hhc_lines = ();
- my $level = 0;
- foreach my $element (@hhc_elements)
- {
- while ($level != $element->{'toc_level'})
- {
- if ($level < $element->{'toc_level'})
- {
- push (@hhc_lines, "<UL>\n");
- $level++;
- }
- elsif ($level > $element->{'toc_level'})
- {
- push (@hhc_lines, "</UL>\n");
- $level--;
- }
- }
- my $text = '';
- if (get_conf('NUMBER_SECTIONS') and defined($element->{'number'}) and
$element->{'number'} ne '')
- {
- $text .= $element->{'number'} . " ";
-
- }
- $text .= chm_text($element->{'texi'});
- push (@hhc_lines, "<LI> <OBJECT type=\"text/sitemap\">\n<param
name=\"Name\" value=\"$text\">\n<param name=\"Local\"
value=\"$element->{'file'}#$element->{'target'}\">\n</OBJECT> </LI>\n");
- }
- while ($level > 0)
- {
- push (@hhc_lines, "</UL>\n");
- $level--;
- }
- main::print_lines(\*HHCFILE, address@hidden);
- print HHCFILE "</HTML>\n</BODY>\n";
- print HHPFILE $hhp_lines;
- close (HHPFILE);
-}
-
-1;
Index: texi2html/maintained_extra/html32.init
===================================================================
RCS file: texi2html/maintained_extra/html32.init
diff -N texi2html/maintained_extra/html32.init
--- texi2html/maintained_extra/html32.init 15 Jul 2010 12:27:00 -0000
1.10
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,203 +0,0 @@
-# -*-perl-*-
-#+##############################################################################
-#
-# html32.init: output HTML 3.2
-#
-# Copyright (C) 2003, 2004, 2007, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-
-use strict;
-
-set_default('COMPLEX_FORMAT_IN_TABLE', 1);
-
-#html_default_load();
-t2h_default_load_format('html');
-
-set_default('DOCTYPE', '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN"
"http://www.w3.org/TR/html32/loose.dtd";>');
-
-set_default('FRAMESET_DOCTYPE', get_conf('DOCTYPE'));
-
-set_from_init_file('BODYTEXT', 'bgcolor="#FFFFFF" text="#000000"
link="#0000FF" vlink="#800080" alink="#FF0000"');
-# this controls the pre style for menus
-$MENU_PRE_STYLE = '';
-
-$NO_BULLET_LIST_STYLE ='';
-
-$MENU_SYMBOL = '*';
-
-# This lines are inserted before and after the shortcontents
-$BEFORE_OVERVIEW = "";
-$AFTER_OVERVIEW = '';
-
-# This lines are inserted before and after the contents
-$BEFORE_TOC_LINES = "";
-$AFTER_TOC_LINES = '';
-
-# html version for latex2html
-set_default('L2H_HTML_VERSION', '3.2');
-
-# no css. NO_CSS also triggers no class if html_default_attribute_class
-# is used, which is the case for all the dynamically output elements.
-set_default('NO_CSS', 1);
-
-# no accesskey in html 3.2
-set_default('USE_ACCESSKEY', 0);
-
-# Similar with what t2h_default_set_iso_symbols(0) does but without changing
-# all the things command, only a selected list.
-# USE_ISO is not needed since normal_text is redefined.
-set_default('OPEN_QUOTE_SYMBOL', '`');
-set_default('CLOSE_QUOTE_SYMBOL', "'");
-t2h_remove_text_substitutions("'", 1, 0, 0, 1);
-t2h_remove_text_substitutions('`', 1, 0, 0, 1);
-
-foreach my $command ('euro', 'geq', 'leq',
- 'bullet', 'equiv', 'expansion', 'point', 'result', 'arrow',
- 'quotedblleft', 'quotedblright',
- 'quoteleft', 'quoteright',
- 'quotedblbase', 'quotesinglbase', 'guillemetleft', 'guillemetright',
- 'guillemotleft', 'guillemotright', 'guilsinglleft', 'guilsinglright')
-{
- $things_map{$command} = &$protect_text($default_things_map{$command});
- $pre_map{$command} = $things_map{$command};
-}
-
-$things_map{'oe'} = 'œ';
-$things_map{'OE'} = 'Œ';
-$things_map{'dots'} = '<small>...</small>';
-$things_map{'enddots'} = '<small>...</small>';
-
-$pre_map{'dots'} = '...';
-$pre_map{'oe'} = $things_map{'oe'};
-$pre_map{'OE'} = $things_map{'OE'};
-
-
-$style_map{'sansserif'} = {};
-$style_map{'r'} = {};
-$style_map_pre{'r'} = {};
-$style_map_pre{'sansserif'} = {};
-
-$format_map{'multitable'} = 'table';
-
-# formatting functions
-
-$protect_text = \&t2h_html32_protect_text;
-$normal_text = \&t2h_html32_normal_text;
-#$acronym_like = \&t2h_html32_acronym_like;
-$acronym_like = \&t2h_default_acronym_like;
-$row = \&t2h_html32_row;
-$cell = \&t2h_html32_cell;
-
-
-# " is not in html 3.2
-sub t2h_html32_protect_text($)
-{
- my $text = shift;
- $text =~ s/&/&/g;
- $text =~ s/</</g;
- $text =~ s/>/>/g;
- $text =~ s/\"/"/g;
- return $text;
-}
-
-sub t2h_html32_normal_text($$$$$$$;$)
-{
- my $text = shift;
- my $in_raw_text = shift;
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- $text = uc($text) if (in_cmd($style_stack, 'sc'));
- $text = &$protect_text($text) unless($in_raw_text);
- if (! $in_code and !$in_preformatted)
- {
- if ($in_raw_text) #FIXME really do that ? It is done by makeinfo
- {
- $text =~ s/``/"/g;
- $text =~ s/''/"/g;
- }
- else
- {
- $text =~ s/``/"/g;
- $text =~ s/''/"/g;
- }
- # FIXME really do that in raw text?
- $text =~ s/---/\x{1F}/g;
- $text =~ s/--/-/g;
- $text =~ s/\x{1F}/--/g;
- }
- return $text;
-}
-
-# no acronym, and no abbr in html 3.2
-sub t2h_html32_acronym_like($$$$$$)
-{
- my $command = shift;
- my $acronym_texi = shift;
- my $acronym_text = shift;
- my $with_explanation = shift;
- my $explanation_lines = shift;
- my $explanation_text = shift;
- my $explanation_simply_formatted = shift;
-
- if ($with_explanation)
- {
- return gdt('{acronym_like} ({explanation})', {'acronym_like' =>
$acronym_text, 'explanation' => $explanation_text},{'duplicate'=>1})
- }
- else
- {
- return $acronym_text;
- }
-}
-
-# row in multitable. no thead in html 3.2
-sub t2h_html32_row($$)
-{
- my $text = shift;
- my $macro = shift;
-
- if ($text =~ /\S/)
- {
- return '<tr>' . $text . '</tr>' . "\n";
- }
- return '';
-}
-
-# cell in multitable. in html 3.2 width is in pixel and not in percent in
-# th or td.
-sub t2h_html32_cell($$)
-{
- my $text = shift;
- my $row_macro = shift;
- my $columnfractions = shift;
- my $prototype_row = shift;
-
- $text =~ s/^\s*//;
- $text =~ s/\s*$//;
-
- if ($row_macro eq 'headitem')
- {
- return "<th>" . $text . '</th>';
- }
- return "<td>" . $text . '</td>';
-}
Index: texi2html/maintained_extra/mediawiki.init
===================================================================
RCS file: texi2html/maintained_extra/mediawiki.init
diff -N texi2html/maintained_extra/mediawiki.init
--- texi2html/maintained_extra/mediawiki.init 15 Jul 2010 12:27:00 -0000
1.9
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,1187 +0,0 @@
-# -*-perl-*-
-######################################################################
-# File: mediawiki.init
-#
-# Override values for various customizable procedures are set in this file
-# in such a way as to create text suitable for pasting into a MediaWiki.
-#
-# Load the file with command-line option: --init-file mediawiki.init
-#
-# This file is in the public domain. Thus it may easily be used as an
-# example for further customizations.
-#
-# Originally written by Derek Price in 2005.
-# Modified in 2008 and 2009.
-#
-# $Id: mediawiki.init,v 1.9 2010/07/15 12:27:00 pertusus Exp $
-
-use strict;
-
-#html_default_load();
-t2h_default_load_format('html');
-
-# remark: in my tests, there was no support for mathtt in texvc
-# https://bugzilla.wikimedia.org/show_bug.cgi?id=21475
-default_load_tex_math();
-
-# inline css style
-set_default('INLINE_CSS_STYLE', 1);
-
-set_default('USE_SECTIONS', 1);
-set_default('USE_NODES', undef);
-
-# numbers are added automatically based on mediawiki markup
-set_default('NUMBER_SECTIONS', 0);
-
-# if this is set footnotes are on a separated page. Otherwise they are at
-# the end of each file (if the document is split).
-# At the end is better for the mediawiki output which is more per page
-# oriented.
-set_default('footnotestyle', 'end');
-
-# extension
-set_default('EXTENSION', undef);
-
-# extension for nodes files when NODE_FILES is true
-set_default('NODE_FILE_EXTENSION', '');
-
-# no title page at the beginning
-set_default('USE_TITLEPAGE_FOR_TITLE', 0);
-
-# if set and SPLIT is set, then split index pages at the next letter
-# after they have more than that many entries
-set_default('SPLIT_INDEX', undef);
-
-# Use preformatted menus.
-set_default('SIMPLE_MENU', 1);
-
-# no NODE_FILES. In fact the whole ref to external manual is broken.
-# This may be revisited later.
-set_default('NODE_FILES', 0);
-
-$DEFAULT_RULE = "\n----\n";
-
-my %mediawiki_table_commands;
-
-# FIXME b, i could be ''' ''
-# FIXME ''' and '' are stopped by end of lines!
-my %style_map_mediawiki = (
- 'emph', {'inline_begin' => "''"},
- 'email', {'function' => \&mediawiki_default_email},
- 'math', {'function' => \&mediawiki_default_math},
- 'url', {'function' => \&mediawiki_default_uref},
- 'uref', {'function' => \&mediawiki_default_uref},
- 'strong', {'inline_begin' => "'''"}
-);
-
-foreach my $style_command (keys(%style_map_mediawiki))
-{
- if ($style_map_mediawiki{$style_command}->{'inline_begin'})
- {
- foreach my $key ('inline_attribute', 'attribute')
- {
- delete $style_map_pre{$style_command}->{$key};
- delete $style_map{$style_command}->{$key};
- }
- $style_map_pre{$style_command}->{'inline_end'} =
$style_map_mediawiki{$style_command}->{'inline_begin'};
- $style_map{$style_command}->{'inline_end'} =
$style_map_mediawiki{$style_command}->{'inline_begin'};
- }
- foreach my $key (keys(%{$style_map_mediawiki{$style_command}}))
- {
- $style_map_pre{$style_command}->{$key} =
$style_map_mediawiki{$style_command}->{$key};
- $style_map{$style_command}->{$key} =
$style_map_mediawiki{$style_command}->{$key};
- }
-}
-
-# no samp/kbd in allowed html elements in the default case.
-foreach my $style_command (keys(%style_map))
-{
- if ($style_map{$style_command}->{'inline_attribute'})
- {
- $style_map{$style_command}->{'inline_attribute'} =~
s/^(samp|kbd)/code/;
- }
-}
-
-foreach my $style_command (keys(%style_map_pre))
-{
- if ($style_map_pre{$style_command}->{'inline_attribute'})
- {
- $style_map_pre{$style_command}->{'inline_attribute'} =~
s/^(samp|kbd)/code/;
- }
-}
-
-$style_map{'indicateurl'} = {'begin' => '<<code><nowiki>', 'end' =>
'</nowiki></code>>'};
-$style_map_pre{'indicateurl'} = {'begin' => '<<code><nowiki>', 'end' =>
'</nowiki></code>>'};
-
-
-
-sub mediawiki_default_email($$)
-{
- my $command = shift;
- my $args = shift;
- my $mail = shift @$args;
- my $text = shift @$args;
- $text = '' if (!defined($text));
- $mail = main::normalise_space($mail);
- $text = main::normalise_space($text);
- return $text if ($mail eq '');
- $text = ' ' . $text if ($text ne '');
- return "[mailto:$mail$text]";;
-}
-
-sub mediawiki_default_uref($$)
-{
- shift;
- my $args = shift;
- my $url = shift @$args;
- my $text = shift @$args;
- my $replacement = shift @$args;
- $url = main::normalise_space($url);
- $replacement = '' if (!defined($replacement));
- $replacement = main::normalise_space($replacement);
- $text = '' if (!defined($text));
- $text = main::normalise_space($text);
- $text = $replacement if ($replacement ne '');
- return $text if ($url eq '');
- return &$anchor('', $url, $text);
-}
-
-sub mediawiki_default_math($$)
-{
- shift;
- my $args = shift;
- my $text = shift @$args;
- return "<math>$text</math>";
-}
-
-foreach my $format ('enumerate', 'table', 'vtable', 'ftable')
-{
- $format_map{$format} = '';
-}
-
-my %processed_formats = ();
-# there are no pre used in mediawiki, to have links working in
-# complex formats, therefore the styles are copied in div that
-# are used instead. This doesn't really improve the situation,
-# though, since the div outside of a <pre> is not taken into account.
-foreach my $complex_format (keys(%complex_format_map))
-{
- my $class = $complex_format_map{$complex_format}->{'class'};
- $class = $complex_format if (!defined($class));
-
- # Avoid doing things twice if the class is associated with more than one
- # complex format
- next if($processed_formats{$class});
-
- if (defined($css_map{"pre.$class"}))
- {
- if (defined($css_map{"div.$class"}))
- {
- $css_map{"div.$class"} .= "; ";
- }
- else
- {
- $css_map{"div.$class"} = '';
- }
- $css_map{"div.$class"} .= $css_map{"pre.$class"};
- }
- $processed_formats{$class} = 1;
-}
-
-foreach my $format ('example', 'display', 'lisp', 'format')
-{
- $complex_format_map{$format}->{'begin'} =
html_default_attribute_class('div', $format).">\n";
- $complex_format_map{"small$format"}->{'begin'} =
html_default_attribute_class('div', "small$format").">\n";
- $complex_format_map{$format}->{'end'} = '</div>'."\n";
- $complex_format_map{"small$format"}->{'end'} = '</div>'."\n";
-}
-foreach my $format ('menu', 'detailmenu', 'menu_comment')
-{
- my $class = $complex_format_map{$format}->{'class'};
- $class = $format if (!defined($class));
- $complex_format_map{$format}->{'begin'} =
html_default_attribute_class('div', $class).">\n";
- $complex_format_map{$format}->{'end'} = '</div>'."\n";
-}
-
-$texi_formats_map{'direntry'} = 0;
-
-# no acronym nor abbr allowed in wikitext.
-$acronym_like = \&t2h_default_acronym_like;
-
-push @command_handler_setup, \&mediawiki_default_initialize_variables;
-
-my %mediawiki_doc_nr_to_file; # File name cache based on file index.
-my %mediawiki_target_to_name;
-my %mediawiki_special_file_name;
-sub mediawiki_default_initialize_variables()
-{
- %mediawiki_doc_nr_to_file = (); # File name cache based on file index.
- %mediawiki_target_to_name = ();
- %mediawiki_special_file_name = ();
-}
-
-my @html_files_from_tex;
-my $mediawiki_out_dir;
-my $tex_extension;
-
-push @command_handler_init, \&mediawiki_default_init_html_to_wiki;
-
-sub mediawiki_default_init_html_to_wiki
-{
- # This must be done here, because the latex2html handler is added
- # after command line scanning, so after the mediawiki.init parsing
- push @command_handler_process, \&mediawiki_default_html_to_wiki;
-
- $command_handler{'math'}->{'init'} = undef;
- $command_handler{'math'}->{'expand'} = undef;
- $command_handler{'math'} = undef;
- $mediawiki_out_dir = "$Texi2HTML::THISDOC{'destination_directory'}";
- $mediawiki_out_dir = './' if (!defined($mediawiki_out_dir) or
$mediawiki_out_dir =~ /^\s*$/);
- @html_files_from_tex = ();
- $tex_extension = undef;
- if ($Texi2HTML::THISDOC{'extensions'}->{'tex4ht'})
- {
- push @html_files_from_tex,
"$Texi2HTML::THISDOC{'file_base_name'}_tex4ht_tex.html";
- $tex_extension = 'tex4ht';
- }
- elsif (get_conf('L2H'))
- {
- push @html_files_from_tex,
"$Texi2HTML::THISDOC{'file_base_name'}_l2h.html";
- $tex_extension = 'l2h';
- # avoid use of the cache
- set_default('L2H_SKIP', 0);
- }
-}
-
-# could be in texi2html.init...
-sub mediawiki_default_readd_end_of_lines($$$$;$)
-{
- my $from_file = shift;
- my $to_file = shift;
- my $tex_extension = shift;
- my $basename = shift;
- my $before_wiki = shift;
- # html2wiki removes end of lines, they are readded here
- unless (open (ORIG, $from_file))
- {
- print STDERR "open $from_file error: $!\n";
- return 0;
- }
- unless (open (FINAL, ">$to_file"))
- {
- print STDERR "open $to_file error: $!\n";
- return 0;
- }
- my $line;
- while ($line = <ORIG>)
- {
- if ($before_wiki)
- {
- $line =~ s/(<!-- ${tex_extension}_end $basename ((\w+ |)(\d+)) -->)
*$/$1\n\n<p>intersticiae<\/p>\n/;
- $line = Texi2HTML::LaTeX2HTML::change_image_file_names($line) if
($tex_extension eq 'l2h');
- }
- else
- {
- $line =~ s/^(<!-- ${tex_extension}_begin $basename ((\w+ |)(\d+))
-->)(.+)/$1\n$5/;
- $line =~ s/(.+)(<!-- ${tex_extension}_end $basename ((\w+ |)(\d+))
-->) *$/$1\n$2/;
- }
- print FINAL "$line";
- }
- close ORIG;
- close FINAL;
- return 1;
-}
-
-sub mediawiki_default_html_to_wiki
-{
- foreach my $file (@html_files_from_tex)
- {
- if (-f $mediawiki_out_dir.$file)
- {
- my $html_file = $mediawiki_out_dir.$file;
- my $tmp_file = $mediawiki_out_dir.$file.".tmp";
- my $tmp_file2 = $mediawiki_out_dir.$file.".tmp2";
- my $tmp_file3 = $mediawiki_out_dir.$file.".tmp3";
- my $basename = $file;
- $basename =~ s/\.html$//;
- if (!rename ($html_file, $tmp_file))
- {
- print STDERR "rename $html_file $tmp_file error: $!\n";
- return;
- }
- #system ("cp $tmp_file $tmp_file.save");
- # Add a paragraph between the end and begin comments to force
- # html2wiki to leave them appart.
- return unless (mediawiki_default_readd_end_of_lines($tmp_file,
$tmp_file3, $tex_extension, $basename, 1));
- if (!rename ($tmp_file3, $tmp_file))
- {
- print STDERR "rename $tmp_file3 $tmp_file error: $!\n";
- return;
- }
- #system ("cp $tmp_file $tmp_file3.save");
- my $cmd = "html2wiki --dialect MediaWiki --strip-tags '' $tmp_file >
$tmp_file2";
- print STDERR "Launching(". Cwd::cwd() ."): $cmd\n" if
(get_conf('VERBOSE'));
- if (system ($cmd))
- {
- main::document_warn ("mediawiki_tex command failed: $cmd");
- return;
- }
- # this ensures that there is one end of line before the
- # html comment, and after, even though html2wiki removed them
- return unless (mediawiki_default_readd_end_of_lines($tmp_file2,
$html_file, $tex_extension, $basename));
- #system ("cp $html_file $html_file.save");
- }
- else
- { # FIXME error message?
- }
- }
-}
-
-$heading_text = \&mediawiki_heading_text;
-
-sub mediawiki_heading_text($$$)
-{
- my $command = shift;
- my $text = shift;
- my $level = shift;
-
- return '' if ($text !~ /\S/);
- $level = 1 if ($level == 0);
- return (("=" x $level) . "= $text =" . ("=" x $level) . "\n");
-}
-
-###################################################################
-# Layout of standard header and footer
-#
-
-$print_page_head = \&mediawiki_default_print_page_head;
-$print_page_foot = \&mediawiki_default_print_page_foot;
-
-sub mediawiki_default_print_page_head($)
-{
- my $fh = shift;
- print $fh "$AFTER_BODY_OPEN\n" if $AFTER_BODY_OPEN;
-}
-
-sub mediawiki_default_print_page_foot($)
-{
- my $fh = shift;
- my $program_string = &$program_string();
- print $fh $program_string, "\n";
- print $fh $PRE_BODY_CLOSE, "\n" if $PRE_BODY_CLOSE;
-}
-
-# This function produces an anchor
-#
-# arguments:
-# $name : anchor name
-# $href : anchor href
-# $text : text displayed
-# extra_attribs : added to anchor attributes list
-
-$anchor = \&mediawiki_anchor;
-
-sub mediawiki_anchor($;$$$)
-{
- my $name = shift;
- my $href = shift;
- my $text = shift;
- my $attributes = shift; # ignored
- $href = '' if !defined $href or $href !~ /\S/;
- $text = '' if !defined $text or $text !~ /\S/;
- return $text if $name eq '' and $href eq '';
- $name = "<div id=\"$name\"></div>" if $name ne '';
- if (defined($href) and $href ne '')
- {
- my $wiki_href;
- my ($file, $target);
-
- if ($href =~ /^([^#]*)\#(.+)$/)
- {
- $file = $1;
- $target = $2;
-
- if (defined($mediawiki_target_to_name{$target}))
- {
- if ($file eq '')
- {
- $target =
$mediawiki_target_to_name{$target}->[0]->[1]->{'simple_format'}
- if
($mediawiki_target_to_name{$target}->[0]->[1]->{'simple_format'} ne '');
- $wiki_href = '#' . $target;
- }
- else
- {
- foreach my $element (@{$mediawiki_target_to_name{$target}})
- {
- if ($file eq $element->[0])
- {
- $target = $element->[1]->{'simple_format'} if
($element->[1]->{'simple_format'} ne '');
- $wiki_href = $file . '#' . $target;
- }
- }
- }
- }
-
- # Element pages, or misc relative links.
- # mediawiki 1.15.1 doesn't like anchor only urls, they work as
wiki_ref.
- if (!defined($wiki_href) and ($mediawiki_special_file_name{$file}
or $file eq ''))
- {
- $wiki_href = $href;
- }
- }
- # Element page, no target
- elsif ($mediawiki_special_file_name{$href})
- {
- $file = $href;
- $wiki_href = $href;
- }
- if (defined($wiki_href))
- {
- $text = "|$text" if $text;
- # FIXME trouble with
http://meta.wikimedia.org/wiki/Help:Namespace#Generic_namespace_names
- # and with
http://en.wikipedia.org/wiki/Wikipedia:Naming_conventions_(technical_restrictions)#Forbidden_characters
-
- $href = "[[$wiki_href$text]]";
- }
- else
- {
- $text = " $text" if $text;
- $href = "[$href$text]";
- }
- }
- else
- {
- $href = $text;
- }
-#print STDERR "!!!$name!$href!$text!$attributes!\n";
- return "$name$href";
-}
-
-# it is not possible (at least not easy) to protect only 2 consecutive
-# {, although it would be better.
-foreach my $brace ('{', '}')
-{
- $simple_map{$brace} = "<nowiki>$simple_map{$brace}</nowiki>";
- $simple_map_pre{$brace} = "<nowiki>$simple_map_pre{$brace}</nowiki>";
-}
-
-# remark: this nullifies the change of default_load_tex_math for normal_text.
-# We assume that in @math the TeX characters have already been
-# rightly protected and so don't protect once more. This is important
-# for <, not to lead to <.
-# remark: texvc doesn't accept " \&
-$normal_text = \&mediawiki_default_normal_text;
-sub mediawiki_default_normal_text($$$$$$$;$)
-{
- my @initial_args = @_;
- my $text = shift;
- my $in_raw_text = shift; # remove_texi
- my $in_preformatted = shift;
- my $in_code = shift;
- my $in_math = shift;
- my $in_simple = shift;
- my $style_stack = shift;
- my $state = shift;
-
- if ($in_math)
- {
- $text = uc($text) if (in_cmd($style_stack, 'sc'));
- return $text;
- }
- $text = &html_default_normal_text (@initial_args);
- my $colon = '';
- foreach my $command (@$style_stack)
- {
- if ($mediawiki_table_commands{$command} or $def_map{$command})
- {
- $colon = '|( :)' ;
- last;
- }
- #print STDERR "$command\n";
- }
- # '' is changed to &ldsquo; so it doesn't needs to be protected in
- # normal text...
- if (!$in_raw_text and !$in_simple)
- {
- $text =~
s/(([\[\]]|[']{2,}|(\{\{)|(\}\})$colon)+)/<nowiki>$1<\/nowiki>/g;
- }
- return $text;
-}
-
-#$heading = \&mediawiki_default_heading;
-sub mediawiki_default_heading($$$$$;$$)
-{
- my $element = shift;
- my $command = shift;
- my $texi_line = shift;
- my $line = shift;
- my $in_preformatted = shift;
- my $one_section = shift;
- my $element_heading = shift;
-
- my $result = t2h_default_heading($element, $command, $texi_line, $line,
- $in_preformatted, $one_section, $element_heading);
- if ($result ne '')
- {
- if ($element->{'no_texi'} =~ /[\#<>\[\]|{}]/)
- {
- main::msg_warn("# < > [ ] | { } not allowed in title
`$element->{'texi'}'",$element->{'line_nr'});
- }
- }
- return $result;
-}
-# This function formats a footnote reference and the footnote text associated
-# with a given footnote.
-# The footnote reference is the text appearing in the main document pointing
-# to the footnote text.
-#
-# arguments:
-# absolute number of the footnote (in the document)
-# relative number of the footnote (in the page)
-# identifier for the footnote
-# identifier for the footnote reference in the main document
-# main document file
-# footnote text file
-# array with the footnote text lines
-# the state. See menu entry.
-#
-# returns:
-# reference on an array containing the footnote text lines which should
-# have been updated
-# the text for the reference pointing on the footnote text
-
-# FIXME the <ref>... stuff is only available with the Cite extension.
-
-$foot_line_and_ref = \&mediawiki_default_foot_line_and_ref;
-$foot_section = \&mediawiki_default_foot_section;
-
-sub mediawiki_default_foot_line_and_ref($$$$$$$)
-{
- my $number_in_doc = shift;
- my $number_in_page = shift;
- my $footnote_id = shift;
- my $place_id = shift;
- my $document_file = shift;
- my $footnote_file = shift;
- my $lines = shift;
- my $state = shift;
-
- my $result = '<ref>';
- foreach my $line (@$lines)
- {
- $result .= $line;
- }
- # The result shouldn't be empty, such that the call to print_Footnotes
- # and foot_section are not skipped
- return ([' '], $result . '</ref>');
-}
-
-# formats a group of footnotes.
-#
-# argument:
-# array reference on the footnotes texts lines
-#
-# returns an array reference on the group of footnotes lines
-# FIXME maybe do a header?
-sub mediawiki_default_foot_section($)
-{
- my $lines = shift;
- #unshift @$lines, "$DEFAULT_RULE\n" if $DEFAULT_RULE;
- #unshift @$lines, "==== " . gdt('Footnotes') . " ====\n";
- @$lines = ("<references/>\n\n");
- return $lines;
-}
-
-# FIXME maybe also a header here?
-$print_Footnotes = \&mediawiki_default_print_Footnotes;
-sub mediawiki_default_print_Footnotes
-{
- my $fh = shift;
- my $new_file = shift;
- my $misc_page = shift;
- my $buttons = address@hidden;
-
- &$print_misc_header($fh, $buttons, $new_file, $misc_page) if ($new_file);
- print $fh "<references/>\n\n";
- &$print_misc_footer($fh, $buttons, $new_file) if ($new_file);
-}
-
-$button_formatting = \&mediawiki_button_formatting;
-
-sub mediawiki_button_formatting
-{
- my $button = shift;
- my $vertical = shift;
- my ($active, $passive) = HTML_DEFAULT_button_formatting($button, $vertical);
- if (defined($active) and !ref($button))
- {
- $active =~ s/^\[/\|/;
- $active =~ s/\]$/\|/;
- }
- return ($active, $passive);
-}
-
-$element_file_name = \&mediawiki_element_file_name;
-
-sub mediawiki_element_file_name
-{
- my $element = shift;
- my $type = shift;
- my $docu_name = shift;
- my $file;
-#print STDERR "!$element!$type!$docu_name!\n";
-
- if (!$element)
- {
- if ($type =~ /^toc$/)
- {
- $file = $docu_name . ": Table of Contents";
- }
- elsif ($type =~ /^stoc$/)
- {
- $file = $docu_name . ": Short Table of Contents";
- }
- elsif ($type =~ /^foot$/)
- {
- $file = $docu_name . ": Footnotes";
- }
- elsif ($type =~ /^about$/)
- {
- $file = $docu_name . ": About this Manual";
- }
- elsif ($type =~ /^doc$/)
- {
- $file = $docu_name;
- }
- }
- else
- {
- my $name = main::substitute_line($element->{'texi'}, 'file name',
{'remove_texi' => 1}, $element->{'line_nr'});
- if (exists $mediawiki_doc_nr_to_file{$element->{'doc_nr'}})
- {
- $file = $mediawiki_doc_nr_to_file{$element->{'doc_nr'}};
- $mediawiki_doc_nr_to_file{$element->{'doc_nr'}} = $file;
- }
- else
- {
- $name =~ s,/,%47,g;
- $name =~ s,\\,%92,g;
- $file = "$docu_name" . (($type eq 'top') ? "" : ": " . $name);
- $mediawiki_doc_nr_to_file{$element->{'doc_nr'}} = $file;
- }
- push @{$mediawiki_target_to_name{$element->{'target'}}}, [ $file,
$element ];
- if ($name =~ /[\#<>\[\]|{}]/)
- {
- main::msg_warn("# < > [ ] | { } not allowed in title
`$element->{'texi'}'",$element->{'line_nr'});
- }
- }
- $mediawiki_special_file_name{$file} = 1;
- return $file;
-}
-
-$node_file_name = \&mediawiki_default_node_file_name;
-sub mediawiki_default_node_file_name($$)
-{
- my $node = shift;
- my $type = shift;
- my $filename = T2H_DEFAULT_node_file_name($node, $type);
- my $command = 'node';
- $command = $node->{'tag'};
- my $name = main::substitute_line($node->{'texi'}, 'node name',
{'remove_texi' => 1}, $node->{'line_nr'});
- if ($name =~ /[\#<>\[\]|{}]/)
- {
- main::msg_warn("# < > [ ] | { } not allowed in references, in
address@hidden `$node->{'texi'}'",$node->{'line_nr'});
- }
-
- return $filename;
-}
-
-# a preformatted region
-# arguments:
-# $text of the preformatted region
-# $pre_style css style
-# $class identifier for the preformatted region (example, menu-comment)
-# The following is usefull if the preformatted is in an itemize.
-# $leading_command is the leading formatting command (like @minus)
-# $leading_command_formatted is the leading formatting command formatted
-# $preformatted_number is a reference on the number of preformatteds appearing
-# in the format. The value should be increased if a preformatted is done
-$preformatted = \&mediawiki_default_preformatted;
-sub mediawiki_default_preformatted($$$$$$$$$$)
-{
- my $text = shift;
- my $pre_style = shift;
- my $class = shift;
- my $leading_command = shift;
- my $leading_command_formatted = shift;
- my $preformatted_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-
- return '' if ($text eq '');
- $leading_command_formatted = '' if (!defined($leading_command_formatted)
or
- exists($special_list_commands{$format}->{$leading_command}));
- if (defined($preformatted_number) and defined($$preformatted_number))
- {
- $$preformatted_number++;
- }
-
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- if ($top_stack eq 'multitable')
- {
- $text =~ s/^\s*//;
- $text =~ s/\s*$//;
- }
-
- $text =~ s/^/ /mg;
- # return html_default_attribute_class('div', $class).">\n$text</div>\n";
- return "$text";
- #return "<pre class=\"$class\"><nowiki>$text</nowiki></pre>";
-}
-
-sub mediawiki_default_remove_eol($)
-{
- my $text = shift;
- chomp($text);
- my $res = '';
- foreach my $line (split /\n/, $text)
- {
- $res .= $line . " ";
- }
- $res =~ s/ $//;
- $res .= "\n";
- return $res;
-}
-
-my %mediawiki_default_indent_symbol = (
- 'itemize' => '*',
- 'enumerate' => '#'
-);
-foreach my $table ('table', 'ftable', 'vtable')
-{
- $mediawiki_default_indent_symbol{$table} = ':';
- $mediawiki_table_commands{$table} = 1;
-}
-foreach my $definition_command (keys(%def_map))
-{
- $mediawiki_default_indent_symbol{$definition_command} = ':';
-}
-
-sub mediawiki_default_indent_string($;$)
-{
- my $commands = shift;
- my $remove_last = shift;
-
- $commands = $Texi2HTML::THISDOC{'command_stack'} if (!defined($commands));
- my $indent_string = '';
- foreach my $format (@$commands)
- {
- $indent_string .= $mediawiki_default_indent_symbol{$format}
- if defined($mediawiki_default_indent_symbol{$format});
- }
- $indent_string =~ s/.$// if ($remove_last);
- return $indent_string;
-}
-
-$paragraph = \&mediawiki_default_paragraph;
-sub mediawiki_default_paragraph($$$$$$$$$$$$)
-{
- my $text = shift;
- my $align = shift;
- my $indent = shift;
- my $paragraph_command = shift;
- my $paragraph_command_formatted = shift;
- my $paragraph_number = shift;
- my $format = shift;
- my $item_nr = shift;
- my $enumerate_style = shift;
- my $number = shift;
- my $command_stack_at_end = shift;
- my $command_stack_at_begin = shift;
-#print STDERR "format: $format\n" if (defined($format));
-#print STDERR "paragraph @$command_stack_at_end; @$command_stack_at_begin\n";
-# $paragraph_command_formatted = '' if
(!defined($paragraph_command_formatted) or
-# exists($special_list_commands{$format}->{$paragraph_command}));
- return '' if ($text =~ /^\s*$/);
-
- if (defined($paragraph_number) and defined($$paragraph_number))
- {
- $$paragraph_number++;
- }
-
- # remove leading spaces, they trigger a preformatted environment in
wikitext
- $text =~ s/^\s*//mg;
- my $top_stack = '';
- $top_stack = $command_stack_at_begin->[-1] if (scalar
(@$command_stack_at_begin));
- if ($top_stack eq 'multitable')
- {
- $html_default_multitable_stack[-1]->[1]++;
- return mediawiki_default_remove_eol($text);
- }
-
- if ($align)
- {
- $text = "<p align=\"$paragraph_style{$align}\">".$text.'</p>';
- }
-
- my $indent_string =
mediawiki_default_indent_string($command_stack_at_begin);
- if ($indent_string)
- {
- $text = $indent_string . ' ' .mediawiki_default_remove_eol($text);
- }
-
- return $text;
-}
-
-$list_item = \&mediawiki_default_list_item;
-sub mediawiki_default_list_item
-{
- my $text = shift;
- return $text;
-}
-
-$def_item = \&mediawiki_default_def_item;
-sub mediawiki_default_def_item($$$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $command = shift;
- if ($text =~ /\S/)
- {
- if (! get_conf('DEF_TABLE'))
- {
- return $text;# unless $only_inter_item_commands;
- #return $text; # invalid without dd in ul
- }
- else
- {
- return '<tr><td colspan="2">' . $text . '</td></tr>';
- }
- }
- return '';
-}
-
-$table_item = \&mediawiki_default_table_item;
-sub mediawiki_default_table_item($$$$$$$)
-{
- my $text = shift;
- my $index_label = shift;
- my $format = shift;
- my $command = shift;
-# my $formatted_command = shift;
- my $style_stack = shift;
-# my $text_formatted = shift;
-# my $text_formatted_leading_spaces = shift;
-# my $text_formatted_trailing_spaces = shift;
- my $item_cmd = shift;
- my $formatted_index_entry = shift;
-
-# if (defined($text_formatted) and !exists
$special_list_commands{$format}->{$command})
-# {
-# $text = $text_formatted_leading_spaces . $text_formatted
.$text_formatted_trailing_spaces;
-# }
-# $formatted_command = '' if (!defined($formatted_command) or
-# exists($special_list_commands{$format}->{$command}));
- if (html_teletyped_in_stack($style_stack))
- {
-# $text .= '</tt>';
-# $formatted_command = '<tt>' . $formatted_command;
- $text = '<tt>' . $text . '</tt>';
- }
- $text .= "\n" . $index_label if (defined($index_label));
-# return '<dt>' . $formatted_command . $text . '</dt>' . "\n";
- return mediawiki_default_indent_string(undef,1) .";$text\n";
-}
-
-$table_line = \&mediawiki_default_table_line;
-sub mediawiki_default_table_line($$$)
-{
- my $text = shift;
- my $only_inter_item_commands = shift;
- my $before_items = shift;
-
- $only_inter_item_commands = '' if (!defined($only_inter_item_commands));
-
- if ($text =~ /\S/)
- {
- #return ";$text\n";# unless ($only_inter_item_commands);
- return $text;
- #return $text; # invalid without dd in ul
- }
- return '';
-}
-
-
-$def_line = \&mediawiki_default_def_line;
-sub mediawiki_default_def_line($$$$$$$$$$$$$$$$)
-{
- my $category_prepared = shift;
- my $name = shift;
- my $type = shift;
- my $arguments = shift;
- my $index_label = shift;
- my $arguments_array = shift;
- my $arguments_type_array = shift;
- my $unformatted_arguments_array = shift;
- my $command = shift;
- my $class_name = shift;
- my $category = shift;
- my $class = shift;
- my $style = shift;
- my $original_command = shift;
-
- $index_label = '' if (!defined($index_label));
- chomp($index_label);
- $category_prepared = '' if (!defined($category_prepared) or
($category_prepared =~ /^\s*$/));
- $name = '' if (!defined($name) or ($name =~ /^\s*$/));
- $type = '' if (!defined($type) or $type =~ /^\s*$/);
- if (!defined($arguments) or $arguments =~ /^\s*$/)
- {
- $arguments = '';
- }
- else
- {
- chomp ($arguments);
- $arguments = '<em>' . $arguments . '</em>';
- }
- my $type_name = '';
- $type_name = " <em>$type</em>" if ($type ne '');
- $type_name .= ' <strong>' . $name . '</strong>' if ($name ne '');
- $type_name .= $arguments;
- if (! get_conf('DEF_TABLE'))
- {
- return mediawiki_default_indent_string(undef,1) .';'. $index_label.
$category_prepared . '<nowiki>:</nowiki>' . $type_name . "\n";
- }
- else
- {
- return "<tr><td align=\"left\">" . $type_name .
- "</td><td align=\"right\">" . $category_prepared . $index_label .
"</td></tr>\n";
- }
-}
-
-
-$def = \&mediawiki_default_def;
-sub mediawiki_default_def($$)
-{
- my $text = shift;
- my $command = shift;
- if ($text =~ /\S/)
- {
- if (! get_conf('DEF_TABLE'))
- {
- return $text;
- }
- else
- {
- return "<table width=\"100%\">\n" . $text . "</table>\n";
- }
- }
- return '';
-
-}
-
-
-
-$table_list = \&mediawiki_default_table_list;
-
-sub mediawiki_default_table_list($$$$$$$$$)
-{
- my $format_command = shift;
- my $text = shift;
- my $command = shift;
- my $formatted_command = shift;
-# enumerate
- my $item_nr = shift;
- my $enumerate_style = shift;
-# itemize
- my $prepended = shift;
- my $prepended_formatted = shift;
-# multitable
- my $columnfractions = shift;
- my $prototype_row = shift;
- my $prototype_lengths = shift;
- my $column_number = shift;
-
- if ($format_command eq 'multitable')
- {
- pop @html_default_multitable_stack;
- return &$format('multitable', 'table', $text);
- }
- return $text;
-}
-
-# format an index summary. This is a list of letters linking to the letter
-# entries.
-#
-# arguments:
-# array reference containing the formatted alphabetical letters
-# array reference containing the formatted non lphabetical letters
-$index_summary = \&mediawiki_index_summary;
-sub mediawiki_index_summary($$)
-{
- my $alpha = shift;
- my $nonalpha = shift;
- my $join = '';
- my $nonalpha_text = '';
- my $alpha_text = '';
- return "" if address@hidden and address@hidden;
- $nonalpha_text = join ("", map {"<td>$_</td>"} @$nonalpha) . "\n"
- if @$nonalpha;
- $alpha_text = join ("", @$alpha) . "\n \n"
- if @$alpha;
- return '<table cellpadding="1" cellspacing="1" border="0">'
- . "<tr><th valign=\"top\">" . gdt('Jump to') .":</th>\n"
- . join ("", map {"<td>$_</td>\n"} @$nonalpha, @$alpha)
- . "</tr></table>\n";
-}
-
-$line_command = \&mediawiki_line_command;
-
-sub mediawiki_line_command($$$$)
-{
- my $command = shift;
- my $arg_text = shift;
- my $arg_texi = shift;
- my $state = shift;
-
- return '' if ($arg_text eq '' or ($command eq 'author' and
(!$state->{'region'} or $state->{'region'} ne 'titlepage')));
- if ($command eq 'title')
- {
- $arg_text = '== ' .$arg_text. " ==\n";
- }
- elsif ($command eq 'subtitle')
- {
- $arg_text = '=== ' .$arg_text. " ===\n";
- }
- elsif ($command eq 'author')
- {
- $arg_text = '<strong> ' .$arg_text. " </strong><br>\n";
- }
- return $arg_text;
-}
-
-$image = \&mediawiki_default_image;
-
-sub mediawiki_default_image($$$$$$$$$$$$$$$$$)
-{
- my $file = shift;
- my $base = shift;
- my $preformatted = shift;
- my $file_name = shift;
- my $alt = shift;
- my $width = shift;
- my $height = shift;
- my $raw_alt = shift;
- my $extension = shift;
- my $working_dir = shift;
- my $file_path = shift;
- my $in_paragraph = shift;
- my $file_locations = shift;
- my $base_simple_format = shift;
- my $extension_simple_format = shift;
- my $file_name_simple_format = shift;
- my $line_nr = shift;
-
- if (!defined($file_path) or $file_path eq '')
- {
- if (defined($extension) and $extension ne '')
- {
- $file = "$base.$extension";
- }
- else
- {
- $file = "$base.jpg";
- }
- main::line_warn (sprintf(__("address@hidden file `%s' not found, using
`%s'"), $base, $file), $line_nr);
- }
- elsif (! get_conf('COMPLETE_IMAGE_PATHS'))
- {
- $file = $file_name;
- }
- my $alt_text = '';
- $alt_text = "|alt=$alt" if (defined($alt) and $alt ne '');
- # it is possible that $file_name is more correct as it allows the user
- # to chose the relative path.
- $file = &$protect_text($file);
- return "[[Image:$file$alt_text]]";
-}
-
-# FIXME <math> in mediawiki is only valid for one formula, not for
-# random TeX.
-# One possibility could be to use TeX -> html -> html2wiki
-#$raw = \&mediawiki_default_raw;
-sub mediawiki_default_raw($$;$)
-{
- my $style = shift;
- my $text = shift;
- my $line_nr = shift;
- my $expanded = 1 if (grep {$style eq $_} @EXPAND);
- if ($style eq 'verbatim' or $style eq 'verbatiminclude')
- {
- $style = 'verbatim' if ($style eq 'verbatiminclude');
- return html_default_attribute_class('pre', $style).">" .
&$protect_text($text) . '</pre>';
- }
- elsif ($style eq 'html' and $expanded)
- {
- chomp ($text);
- return $text;
- }
- elsif ($style eq 'tex' and $expanded)
- {
- chomp ($text);
- return "<math>$text</math>\n";
- }
- elsif ($expanded)
- {
- main::line_warn (sprintf(__("Raw format %s is not converted"),
$style), $line_nr);
- return &$protect_text($text);
- }
- else
- {
- return '';
- }
-}
-
-
-## a simple menu entry ref in case we aren't in a standard menu context
-#$simple_menu_link = \&mediawiki_simple_menu_link;
-
-# a menu link. We are always in preformatted because of SIMPLE_MENU.
-# currently not used.
-#$menu_link = \&mediawiki_simple_menu_link;
-
-sub mediawiki_simple_menu_link($$$$$$$)
-{
- my $entry = shift;
-# my $preformatted = shift; # We assume this is true.
- my $state = shift;
- my $href = shift;
- my $node = shift;
- my $title = shift;
- my $ending = shift;
- my $has_title = shift;
- my $command_stack = shift;
- my $preformatted = shift;
-
- $title = '' unless ($has_title);
- $ending = '' unless defined $ending;
- $entry = "</nowiki>";
- $entry .= "$MENU_SYMBOL";
- if ($href)
- {
- $entry .= &$anchor ('', $href, $node);
- }
- else
- {
- $title .= ":" if ($title ne '');
- $entry .= "$title$node";
- }
- $entry .= $ending;
- $entry .= "<nowiki>";
- return $entry;
-}
Index: texi2html/maintained_extra/tex4ht.init
===================================================================
RCS file: texi2html/maintained_extra/tex4ht.init
diff -N texi2html/maintained_extra/tex4ht.init
--- texi2html/maintained_extra/tex4ht.init 15 Jul 2010 12:27:00 -0000
1.8
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,389 +0,0 @@
-# -*-perl-*-
-
-#+##############################################################################
-#
-# tex4ht.init: use tex4ht to convert tex to html
-#
-# Copyright (C) 2005, 2007, 2009 Free Software Foundation, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License,
-# or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-#
-# Originally written by Patrice Dumas.
-#
-#-##############################################################################
-# To customize the command and the options, you could set
-# $Texi2HTML::TeX4HT::STYLE_MATH to latex/tex
-# $Texi2HTML::TeX4HT::STYLE_TEX to latex/texi
-# and/or change
-# $Texi2HTML::TeX4HT::tex4ht_command_math
-# and $Texi2HTML::TeX4HT::tex4ht_options_math
-# $Texi2HTML::TeX4HT::tex4ht_command_tex
-# and $Texi2HTML::TeX4HT::tex4ht_options_tex
-
-use strict;
-
-if (defined($OUTPUT_FORMAT) and $OUTPUT_FORMAT eq 'html')
-{
-push @command_handler_init, \&Texi2HTML::TeX4HT::tex4ht_init;
-push @command_handler_process, \&Texi2HTML::TeX4HT::tex4ht_process;
-# do it once here to have something ready for special regions formatting
-push @command_handler_process, \&Texi2HTML::TeX4HT::tex4ht_output;
-# do it once more if the file was modified (for example see mediawiki.init)
-push @command_handler_output, \&Texi2HTML::TeX4HT::tex4ht_output;
-push @command_handler_finish, \&Texi2HTML::TeX4HT::tex4ht_finish;
-
-$command_handler{'math'} =
- { 'init' => \&Texi2HTML::TeX4HT::tex4ht_to_latex,
- 'expand' => \&Texi2HTML::TeX4HT::tex4ht_do_tex
- };
-$command_handler{'tex'} =
- { 'init' => \&Texi2HTML::TeX4HT::tex4ht_to_latex,
- 'expand' => \&Texi2HTML::TeX4HT::tex4ht_do_tex
- };
-}
-
-
-{
-use Cwd;
-
-package Texi2HTML::TeX4HT;
-
-use vars qw(
-$STYLE_MATH
-$STYLE_TEX
-$tex4ht_command_math
-$tex4ht_command_tex
-$tex4ht_options_math
-$tex4ht_options_tex
-);
-
-$STYLE_MATH = 'texi' if (!defined($STYLE_MATH));
-$STYLE_TEX = 'tex' if (!defined($STYLE_TEX));
-
-if (!defined($tex4ht_command_math))
-{
- $tex4ht_command_math = 'httexi';
- $tex4ht_command_math = 'htlatex' if ($STYLE_MATH eq 'latex');
- $tex4ht_command_math = 'httex' if ($STYLE_MATH eq 'tex');
-}
-if (!defined($tex4ht_command_tex))
-{
- $tex4ht_command_tex = 'httex';
- $tex4ht_command_tex = 'htlatex' if ($STYLE_TEX eq 'latex');
- $tex4ht_command_tex = 'httexi' if ($STYLE_TEX eq 'texi');
-}
-
-my %commands = ();
-
-my $tex4ht_initial_dir;
-my $tex4ht_out_dir;
-my $tex4ht_latex_failed = 0;
-my %tex4ht_results;
-
-sub tex4ht_init
-{
- # set file names
- $tex4ht_initial_dir = Cwd::abs_path;
- if
($Texi2HTML::Config::null_device_file{$Texi2HTML::THISDOC{'filename'}->{'top'}})
- {
- # when output is a null device we skip entirely the tex4ht stuff.
- $tex4ht_latex_failed = 1;
- return;
- }
- $tex4ht_out_dir = "$Texi2HTML::THISDOC{'destination_directory'}";
- $tex4ht_out_dir = './' if (!defined($tex4ht_out_dir) or $tex4ht_out_dir =~
/^\s*$/);
- my $tex4ht_basename = "$Texi2HTML::THISDOC{'file_base_name'}_tex4ht";
- %tex4ht_results = ();
- $tex4ht_latex_failed = 0;
- # this initialization doesn't seems to be needed, but it is cleaner anyway
- %commands = ();
- $commands{'math'}->{'style'} = $STYLE_MATH;
- $commands{'tex'}->{'style'} = $STYLE_TEX;
- $commands{'math'}->{'exec'} = $tex4ht_command_math;
- $commands{'tex'}->{'exec'} = $tex4ht_command_tex;
- foreach my $command ('math', 'tex')
- {
- my $style = $commands{$command}->{'style'};
- $commands{$command}->{'basename'} = $tex4ht_basename . "_$command";
- my $suffix = '.tex';
- $suffix = '.texi' if ($style eq 'texi');
- $commands{$command}->{'basefile'} = $commands{$command}->{'basename'} .
$suffix;
- $commands{$command}->{'html_file'} = $commands{$command}->{'basename'} .
'.html';
- $commands{$command}->{'rfile'} = $tex4ht_out_dir .
$commands{$command}->{'basefile'};
- my $rfile = $commands{$command}->{'rfile'};
- local *TEX4HT_TEXFILE;
- unless (open (*TEX4HT_TEXFILE, ">$rfile"))
- {
- main::document_warn ("t2h_tex4ht error opening $rfile: $!");
- $tex4ht_latex_failed = 1;
- return;
- }
- $commands{$command}->{'handle'} = *TEX4HT_TEXFILE;
- }
- foreach my $command ('math', 'tex')
- {
- $commands{$command}->{'counter'} = 0;
- my $style = $commands{$command}->{'style'};
- my $fh = $commands{$command}->{'handle'};
- my $comment = '@c';
- $comment = '%' if ($style ne 'texi');
- $comment .= " Automatically generated\n";
- if ($style eq 'texi')
- {
- print $fh "\\input texinfo
address@hidden $commands{$command}->{'basename'}.info\n";
- print $fh "$comment";
- }
- else
- {
- print $fh "$comment";
- if ($style eq 'latex')
- {
- print $fh "\\documentstyle{article}\n\\begin{document}\n";
- }
- elsif ($style eq 'tex')
- {
- print $fh "\\csname tex4ht\\endcsname\n";
- }
- }
- }
- $Texi2HTML::THISDOC{'extensions'}->{'tex4ht'} = 1;
-}
-
-sub tex4ht_to_latex
-{
- my $command = shift;
- my $text = shift;
- my $counter = shift;
- my $style = $commands{$command}->{'style'};
- my $fh = $commands{$command}->{'handle'};
-
- # write to tex file
- my $before_comment_open = "address@hidden";
- my $after_comment_open = "address@hidden verbatim\n";
- my $before_comment_close = "address@hidden";
- my $after_comment_close = "address@hidden verbatim\n";
-
- if ($style ne 'texi')
- {
- $before_comment_open = "\\HCode{\\Hnewline \\Hnewline ";
- $after_comment_open = "\\Hnewline}\n";
- $before_comment_close = "\\HCode{\\Hnewline ";
- $after_comment_close = "\\Hnewline \\Hnewline}\n";
- }
-
- my $begin_comment = "<!-- tex4ht_begin $commands{$command}->{'basename'}
$command $counter -->";
- print $fh "$before_comment_open$begin_comment$after_comment_open";
- if ($command eq 'tex')
- {
- print $fh $text;
- }
- elsif ($command eq 'math')
- {
- if ($style eq 'texi')
- {
- print $fh '@math{' . $text . "}\n";
- }
- else
- {
- print $fh "\\IgnorePar \$" . $text . "\$";
- }
- }
- my $end_comment = "<!-- tex4ht_end $commands{$command}->{'basename'}
$command $counter -->";
- print $fh "$before_comment_close$end_comment$after_comment_close";
- $commands{$command}->{'counter'}++;
- return 1;
-}
-
-sub tex4ht_process
-{
- foreach my $command ('math', 'tex')
- {
- tex4ht_finish_latex($command);
- }
- unless (chdir $tex4ht_out_dir)
- {
- main::document_warn ("t2h_tex4ht chdir to $tex4ht_out_dir failed");
- $tex4ht_latex_failed = 1;
- return;
- }
- print STDERR "cwd($tex4ht_out_dir):" . Cwd::cwd() ."\n" if
(Texi2HTML::Config::get_conf('VERBOSE'));
-
- foreach my $command ('math', 'tex')
- {
- tex4ht_process_command($command);
- }
- tex4ht_return_to_dir();
-}
-
-my $tex4ht_output_counter;
-
-sub tex4ht_output
-{
- $tex4ht_output_counter = 0;
- unless (chdir $tex4ht_out_dir)
- {
- main::document_warn ("t2h_tex4ht chdir to $tex4ht_out_dir failed");
- $tex4ht_latex_failed = 1;
- return;
- }
- foreach my $command ('math', 'tex')
- {
- tex4ht_output_command($command);
- }
- tex4ht_return_to_dir();
-}
-
-sub tex4ht_finish_latex
-{
-#print STDERR "$style $tex4ht_latex_failed $tex4ht_counter\n";
- my $command = shift;
- return if ($tex4ht_latex_failed);
-
- my $style = $commands{$command}->{'style'};
- my $fh = $commands{$command}->{'handle'};
- # finish the tex file
- if ($style eq 'latex')
- {
- print $fh "\\end{document}\n";
- }
- elsif ($style eq 'tex')
- {
- print $fh "\n\\bye\n";
- }
- else
- {
- print $fh "address@hidden";
- }
- close ($fh);
-}
-
-sub tex4ht_process_command($)
-{
- my $command = shift;
- return unless ($commands{$command}->{'counter'});
- main::document_warn ("t2h_tex4ht $commands{$command}->{'basefile'} missing")
unless (-f $commands{$command}->{'basefile'});
- my $style = $commands{$command}->{'style'};
- # now run tex4ht
- my $options = '';
- $options = $tex4ht_options_math if (($style eq 'math') and
defined($tex4ht_options_math));
- $options = $tex4ht_options_tex if (($style eq 'tex') and
defined($tex4ht_options_tex));
- my $cmd = "$commands{$command}->{'exec'} $commands{$command}->{'basefile'}
$options";
- print STDERR "tex4ht command: $cmd\n" if
(Texi2HTML::Config::get_conf('VERBOSE'));
- if (system($cmd))
- {
- main::document_warn ("t2h_tex4ht command: $cmd failed");
- tex4ht_return_to_dir();
- $tex4ht_latex_failed = 1;
- return;
- }
- # this have to be done during the 'process' phase, in 'output' it is
- # too late.
- push @{$Texi2HTML::THISDOC{'css_import_lines'}}, "address@hidden
\"$commands{$command}->{'basename'}.css\";\n";
-}
-
-sub tex4ht_output_command($)
-{
- my $command = shift;
- return unless ($commands{$command}->{'counter'});
- # extract the html from the file created by tex4ht
- my $html_basefile = $commands{$command}->{'html_file'};
- unless (open (TEX4HT_HTMLFILE, $html_basefile))
- {
- main::document_warn ("t2h_tex4ht error opening $html_basefile: $!");
- tex4ht_return_to_dir();
- $tex4ht_latex_failed = 1;
- return;
- }
- my $got_count = 0;
- my $line;
- while ($line = <TEX4HT_HTMLFILE>)
- {
- #print STDERR "$html_basefile: while $line";
- if ($line =~ /!-- tex4ht_begin $commands{$command}->{'basename'} (\w+)
(\d+) --/)
- {
- my $command = $1;
- my $count = $2;
- my $text = '';
- my $end_found = 0;
- while ($line = <TEX4HT_HTMLFILE>)
- {
- #print STDERR "while search $command $count $line";
- if ($line =~ /!-- tex4ht_end $commands{$command}->{'basename'}
$command $count --/)
- {
- $got_count++;
- chomp($text);
- $tex4ht_results{"${command}_$count"} = $text;
- $end_found = 1;
- last;
- }
- else
- {
- $text .= $line;
- }
- }
- unless ($end_found)
- {
- main::document_warn ("t2h_tex4ht: end of $command $count not
found");
- }
- }
- }
- if ($got_count != $commands{$command}->{'counter'} and
(Texi2HTML::Config::get_conf('VERBOSE')))
- {
- main::document_warn ("t2h_tex4ht: got $got_count for
$commands{$command}->{'counter'} items entered");
- }
- close (TEX4HT_HTMLFILE);
-
-}
-
-sub tex4ht_return_to_dir
-{
- unless (chdir $tex4ht_initial_dir)
- {
- die "* t2h_tex4ht unable to return to the initial dir\n";
- }
-}
-
-sub tex4ht_do_tex
-{
- my $command = shift;
- my $counter = shift;
- # return the resulting html
- if (exists ($tex4ht_results{"${command}_$counter"}) and
defined($tex4ht_results{"${command}_$counter"}))
- {
- $tex4ht_output_counter++;
- return $tex4ht_results{"${command}_$counter"};
- }
- else
- {
- main::document_warn ("t2h_tex4ht: cannot find text to output for $command
number $counter");
- return '';
- }
-}
-
-sub tex4ht_finish
-{
- my $tex4ht_in_counter = 0;
- foreach my $command (keys(%commands))
- {
- $tex4ht_in_counter += $commands{$command}->{'counter'};
- }
- if (($tex4ht_output_counter != $tex4ht_in_counter) and
(Texi2HTML::Config::get_conf('VERBOSE')))
- {
- main::document_warn ("t2h_tex4ht: output $tex4ht_output_counter for
$tex4ht_in_counter items entered");
- }
-}
-
-}
-1;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo ChangeLog doc/texi2oldapi.texi doc/texi...,
Patrice Dumas <=